256 files changed, 1351 insertions, 1073 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 41605ee33034..8fbb6504b0bf 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	37.0.2062.124
-PORTREVISION=	1
+PORTVERSION=	38.0.2125.101
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	chromium@FreeBSD.org
-COMMENT=	Mostly BSD-licensed web browser based on WebKit and Gtk+
+COMMENT=	Google web browser based on WebKit
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL
 LICENSE_COMB=	multi
@@ -41,7 +40,6 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libicuuc.so:${PORTSDIR}/devel/icu \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
-		libminizip.so:${PORTSDIR}/archivers/minizip \
 		libnspr4.so:${PORTSDIR}/devel/nspr \
 		libprotobuf.so:${PORTSDIR}/devel/protobuf \
 		libpng.so:${PORTSDIR}/graphics/png \
@@ -64,7 +62,6 @@ CPE_PRODUCT=	chrome
 USE_PERL5=	build
 USE_XORG=	scrnsaverproto x11 xproto xscrnsaver xtst
 USE_GNOME=	glib20 gtk20 dconf libxslt
-USE_OPENSSL=	yes # must be from base to prevent a link failure against cups
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
@@ -77,6 +74,7 @@ GYP_DEFINES+=	\
 		linux_strip_binary=1 \
 		test_isolation_mode=noop \
 		disable_nacl=1 \
+		enable_extensions=1 \
 		enable_one_click_signin=1 \
 		enable_openmax=1 \
 		enable_webrtc=1 \
@@ -106,16 +104,13 @@ GYP_DEFINES+=	\
 		use_system_libwebp=1 \
 		use_system_libxml=1 \
 		use_system_libxslt=1 \
-		use_system_minizip=1 \
 		use_system_nspr=1 \
-		use_system_openssl=1 \
 		use_system_protobuf=1 \
 		use_system_re2=1 \
 		use_system_snappy=1 \
 		use_system_speex=1 \
 		use_system_xdg_utils=1 \
-		use_system_yasm=1 \
-		use_system_zlib=1
+		use_system_yasm=1
 # allow removal of third_party/adobe
 GYP_DEFINES+=	flapper_version_h_file='${WRKSRC}/flapper_version.h'
 
@@ -169,9 +164,6 @@ GYP_DEFINES+=	disable_sse2=1
 .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libusb-pc
 .endif
-.if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-fixup-execinfo
-.endif
 
 .if ${PORT_OPTIONS:MTEST}
 .include "Makefile.tests"
@@ -191,13 +183,10 @@ CONFIGURE_ENV+=	CC="${CC}" \
 		GYP_DEFINES="${GYP_DEFINES}"
 MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
 		GPERF="${LOCALBASE}/bin/gperf"
+MAKE_ARGS=	-C out/${BUILDTYPE}
 
 .include <bsd.port.pre.mk>
 
-#XXX redefine MAKE_ARGS after bsd.port.pre.mk to avoid OPENSSL flags
-# leaking in which confuses ninja
-MAKE_ARGS=	-C out/${BUILDTYPE}
-
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
@@ -235,11 +224,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/chrome/common/chrome_paths.cc \
 		${WRKSRC}/base/base.gyp
-	@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
-		${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \
-		${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi
-	@${REINPLACE_CMD} -e "s|g++|${CXX}|" \
-		${WRKSRC}/tools/compile_test/compile_test.py
 
 pre-configure:
 	# phajdan-jr: list of things *not* to remove, so maybe the script
@@ -256,6 +240,7 @@ pre-configure:
 		'base/third_party/xdg_mime' \
 		'base/third_party/xdg_user_dirs' \
 		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mock4js' \
 		'chrome/third_party/mozilla_security_manager' \
 		'courgette/third_party' \
 		'crypto/third_party/nss' \
@@ -263,11 +248,15 @@ pre-configure:
 		'net/third_party/nss' \
 		'third_party/WebKit' \
 		'third_party/angle' \
+		'third_party/angle/src/third_party' \
+		'third_party/blanketjs' \
 		'third_party/brotli' \
+		'third_party/boringssl' \
 		'third_party/cacheinvalidation' \
 		'third_party/cld' \
 		'third_party/cros_system_api' \
 		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
 		'third_party/ffmpeg' \
 		'third_party/fips181' \
 		'third_party/flot' \
@@ -283,6 +272,7 @@ pre-configure:
 		'third_party/libphonenumber' \
 		'third_party/libsrtp' \
 		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
 		'third_party/libwebm' \
 		'third_party/libxml/chromium' \
 		'third_party/libXNVCtrl' \
@@ -297,27 +287,34 @@ pre-configure:
 		'third_party/opus' \
 		'third_party/ots' \
 		'third_party/pdfium' \
+		'third_party/pdfium/third_party' \
 		'third_party/ply' \
 		'third_party/polymer' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
+		'third_party/qunit' \
 		'third_party/readability' \
 		'third_party/sfntly' \
+		'third_party/sinonjs' \
 		'third_party/skia' \
 		'third_party/smhasher' \
 		'third_party/sqlite' \
 		'third_party/tcmalloc' \
 		'third_party/tlslite' \
 		'third_party/trace-viewer' \
+		'third_party/trace-viewer/third_party' \
+		'third_party/trace-viewer/third_party/tvcm/third_party' \
 		'third_party/undoview' \
 		'third_party/usrsctp' \
 		'third_party/webdriver' \
 		'third_party/webrtc' \
 		'third_party/widevine' \
 		'third_party/x86inc' \
-		'third_party/zlib/google' \
+		'third_party/yasm' \
+		'third_party/zlib' \
 		'url/third_party/mozilla' \
 		'v8/src/third_party/valgrind' \
+		'v8/third_party/fdlibm' \
 		--do-remove || ${FALSE}
 	cd ${WRKSRC} && ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gyp_files.py \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 11328ace4c53..013407100183 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-37.0.2062.124.tar.xz) = 5a7ca0b1e9b4c51555cf82d8bebf5a8cc5b5810ccacd1087ba82a17b8ac830d8
-SIZE (chromium-37.0.2062.124.tar.xz) = 223325856
-SHA256 (chromium-37.0.2062.124-testdata.tar.xz) = 08a9febabe4995b88ccb99203057fac2056615e35fe5e8907604a1e07e1a9794
-SIZE (chromium-37.0.2062.124-testdata.tar.xz) = 114485636
+SHA256 (chromium-38.0.2125.101.tar.xz) = d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a
+SIZE (chromium-38.0.2125.101.tar.xz) = 248192100
+SHA256 (chromium-38.0.2125.101-testdata.tar.xz) = aca97e1f3d1e4018ef24d7f53c9273b5efde4496f73dc82622184409e9b3076e
+SIZE (chromium-38.0.2125.101-testdata.tar.xz) = 115331828
diff --git a/www/chromium/files/chromium-browser.desktop.in b/www/chromium/files/chromium-browser.desktop.in
index 7654b75848d3..784d0cf26be6 100644
--- a/www/chromium/files/chromium-browser.desktop.in
+++ b/www/chromium/files/chromium-browser.desktop.in
@@ -4,7 +4,7 @@ Version=1.0
 Encoding=UTF-8
 Name=Chromium
 Comment=%%COMMENT%%
-Icon=chrome
+Icon=%%DATADIR%%/product_logo_48.png
 Exec=chrome %U
 Categories=Application;Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index fe598858ae0a..465cde2e599d 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -89,17 +89,6 @@
 
    const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1);
    const TrackedTime kStartOfRun = TrackedTime() +
---- chrome/browser/metrics/thread_watcher.cc	2013-07-03 23:45:55.000000000 -0400
-+++ chrome/browser/metrics/thread_watcher.cc	2013-07-19 01:38:45.000000000 -0400
-@@ -41,7 +41,7 @@
- MSVC_PUSH_DISABLE_WARNING(4748)
- 
- int* NullPointer() {
--  return reinterpret_cast<int*>(NULL);
-+  return static_cast<int*>(NULL);
- }
- 
- void NullPointerCrash(int line_number) {
 --- chrome/browser/sync/glue/synced_session_tracker.cc	2013-07-03 23:46:07.000000000 -0400
 +++ chrome/browser/sync/glue/synced_session_tracker.cc	2013-07-19 01:50:13.000000000 -0400
 @@ -260,7 +260,7 @@
@@ -122,17 +111,17 @@
 
      EXPECT_CALL(callback_, OnError(_))
          .Times(2);
---- media/filters/decrypting_video_decoder_unittest.cc.orig	2013-08-30 23:27:39.000000000 +0300
-+++ media/filters/decrypting_video_decoder_unittest.cc	2013-08-30 23:28:27.000000000 +0300
-@@ -417,7 +417,7 @@
-   // callback to cancel the |decryptor_ready_cb|.
-   EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback()))
-       .WillOnce(ResetAndRunCallback(&decryptor_ready_cb,
--                                    reinterpret_cast<Decryptor*>(NULL)));
-+                                    static_cast<Decryptor*>(NULL)));
-   Stop();
- }
-
+--- media/filters/decrypting_video_decoder_unittest.cc.orig	2014-09-04 02:04:17.000000000 +0200
++++ media/filters/decrypting_video_decoder_unittest.cc	2014-09-08 20:51:21.000000000 +0200
+@@ -420,7 +420,7 @@
+   // NULL callback to cancel the |decryptor_ready_cb|.
+   EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce(
+       ResetAndRunCallback(&decryptor_ready_cb,
+-                          reinterpret_cast<Decryptor*>(NULL),
++                          static_cast<Decryptor*>(NULL),
+                           base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
+                                      base::Unretained(this))));
+   EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
 --- third_party/hunspell/src/hunspell/affentry.hxx	2013-07-03 23:52:32.000000000 -0400
 +++ third_party/hunspell/src/hunspell/affentry.hxx	2013-07-19 01:31:57.000000000 -0400
 @@ -27,7 +27,7 @@
@@ -153,17 +142,6 @@
  
    char *      check_twosfx_morph(const char * word, int len, int optflags,
                   PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
---- third_party/libjingle/source/talk/base/taskrunner.cc	2013-07-03 23:54:05.000000000 -0400
-+++ third_party/libjingle/source/talk/base/taskrunner.cc	2013-07-19 00:46:25.000000000 -0400
-@@ -119,7 +119,7 @@
-   std::vector<Task *>::iterator it;
-   it = std::remove(tasks_.begin(),
-                    tasks_.end(),
--                   reinterpret_cast<Task *>(NULL));
-+                   static_cast<Task *>(NULL));
- 
-   tasks_.erase(it, tasks_.end());
- 
 --- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc	2013-07-03 23:54:15.000000000 -0400
 +++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc	2013-07-19 00:44:09.000000000 -0400
 @@ -439,7 +439,7 @@
@@ -278,3 +256,14 @@
  
    tasks_.erase(it, tasks_.end());
  
+--- v8/src/unique.h.orig	2014-09-04 02:30:24.000000000 +0200
++++ v8/src/unique.h	2014-09-10 16:19:37.000000000 +0200
+@@ -167,7 +167,7 @@
+ 
+   // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
+   static PrintableUnique<T> CreateUninitialized(Zone* zone, Handle<T> handle) {
+-    return PrintableUnique<T>(zone, reinterpret_cast<Address>(NULL), handle);
++    return PrintableUnique<T>(zone, static_cast<Address>(NULL), handle);
+   }
+ 
+   static PrintableUnique<T> CreateImmovable(Zone* zone, Handle<T> handle) {
diff --git a/www/chromium/files/extra-patch-fixup-execinfo b/www/chromium/files/extra-patch-fixup-execinfo
deleted file mode 100644
index b008d7190fa7..000000000000
--- a/www/chromium/files/extra-patch-fixup-execinfo
+++ /dev/null
@@ -1,11 +0,0 @@
---- v8/src/checks.cc.orig	2014-03-07 23:57:27.000000000 +0100
-+++ v8/src/checks.cc	2014-03-08 00:04:14.000000000 +0100
-@@ -44,7 +44,7 @@
- static V8_INLINE void DumpBacktrace() {
- #if V8_LIBC_GLIBC || V8_OS_BSD
-   void* trace[100];
--  int size = backtrace(trace, ARRAY_SIZE(trace));
-+  size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace));
-   char** symbols = backtrace_symbols(trace, size);
-   i::OS::PrintError("\n==== C stack trace ===============================\n\n");
-   if (size == 0) {
diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc
index 31afb2813f9d..a37a0399d81e 100644
--- a/www/chromium/files/extra-patch-gcc
+++ b/www/chromium/files/extra-patch-gcc
@@ -1,23 +1,3 @@
---- base/memory/shared_memory.h.orig	2011-04-01 21:54:26.066717848 +0300
-+++ base/memory/shared_memory.h	2011-04-01 21:55:14.292717813 +0300
-@@ -12,6 +12,7 @@
- 
- #if defined(OS_POSIX)
- #include <sys/types.h>
-+#include <stdio.h>
- #include <semaphore.h>
- #include "base/file_descriptor_posix.h"
- #endif
---- third_party/libjingle/source/talk/base/stream.h.orig	2011-04-01 22:16:30.129717654 +0300
-+++ third_party/libjingle/source/talk/base/stream.h	2011-04-01 22:16:48.245715495 +0300
-@@ -30,6 +30,7 @@
- #ifndef TALK_BASE_STREAM_H__
- #define TALK_BASE_STREAM_H__
- 
-+#include <stdio.h>
- #include "talk/base/basictypes.h"
- #include "talk/base/criticalsection.h"
- #include "talk/base/logging.h"
 --- media/filters/file_data_source.h.orig	2011-09-14 10:01:06.000000000 +0200
 +++ media/filters/file_data_source.h	2011-09-26 19:08:17.000000000 +0200
 @@ -5,6 +5,7 @@
@@ -27,7 +7,7 @@
 +#include <cstdio>
  #include <string>
  
- #include "base/gtest_prod_util.h"
+ #include "base/files/file.h"
 --- content/public/common/child_process_sandbox_support_linux.h.orig	2013-10-11 19:30:28.000000000 +0200
 +++ content/public/common/child_process_sandbox_support_linux.h	2013-10-16 15:29:00.000000000 +0200
 @@ -7,6 +7,7 @@
@@ -76,18 +56,8 @@
  #include "base/logging.h"
  #include "base/strings/string_number_conversions.h"
  #include "base/strings/stringprintf.h"
---- ui/gfx/codec/jpeg_codec.cc.orig	2014-02-20 15:27:56.000000000 -0500
-+++ ui/gfx/codec/jpeg_codec.cc	2014-03-03 14:33:42.000000000 -0500
-@@ -15,6 +15,7 @@
- #if defined(USE_SYSTEM_LIBJPEG)
- #include <jpeglib.h>
- #elif defined(USE_LIBJPEG_TURBO)
-+#include <stdio.h>
- #include "third_party/libjpeg_turbo/jpeglib.h"
- #else
- #include "third_party/libjpeg/jpeglib.h"
---- ui/gfx/codec/jpeg_codec.cc.orig	2014-08-12 21:02:29.000000000 +0200
-+++ ui/gfx/codec/jpeg_codec.cc	2014-08-17 19:32:18.000000000 +0200
+--- ui/gfx/codec/jpeg_codec.cc.orig	2014-10-02 19:19:03.000000000 +0200
++++ ui/gfx/codec/jpeg_codec.cc	2014-10-05 22:38:28.000000000 +0200
 @@ -13,6 +13,7 @@
  
  extern "C" {
@@ -106,4 +76,3 @@
  #include <cstring>
  #include <utility>
  
-
diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp
index 3f1135058dfa..433903908a20 100644
--- a/www/chromium/files/patch-base__base.gyp
+++ b/www/chromium/files/patch-base__base.gyp
@@ -1,5 +1,5 @@
---- ./base/base.gyp.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/base.gyp	2014-08-22 15:06:27.000000000 +0200
+--- base/base.gyp.orig	2014-10-02 21:05:31 UTC
++++ base/base.gyp
 @@ -129,7 +129,7 @@
            ],
            'link_settings': {
@@ -9,3 +9,15 @@
              ],
            },
          }],
+@@ -784,6 +784,11 @@
+             ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
+           ],
+         }],
++        ['OS == "freebsd"', {
++          'sources!': [
++            'debug/proc_maps_linux_unittest.cc',
++          ],
++        }],
+       ],  # target_conditions
+     },
+     {
diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi
index 0216b20af4b6..3a8e4b0dfa6d 100644
--- a/www/chromium/files/patch-base__base.gypi
+++ b/www/chromium/files/patch-base__base.gypi
@@ -1,13 +1,13 @@
---- ./base/base.gypi.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/base.gypi	2014-08-22 18:33:25.000000000 +0200
-@@ -942,11 +942,16 @@
+--- base/base.gypi.orig	2014-10-02 17:39:45 UTC
++++ base/base.gypi
+@@ -945,11 +945,16 @@
                'process/memory_stubs.cc',
              ],
              'sources/': [
 +              ['exclude', '^debug/proc_maps_linux\\.cc$'],
                ['exclude', '^files/file_path_watcher_linux\\.cc$'],
 -              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
-               ['exclude', '^file_util_linux\\.cc$'],
+               ['exclude', '^files/file_util_linux\\.cc$'],
 +              ['exclude', '^process/memory_linux\\.cc$'],
                ['exclude', '^process/process_linux\\.cc$'],
                ['exclude', '^sys_info_linux\\.cc$'],
diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
index f6b155907113..2607e1e24925 100644
--- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc
+++ b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
@@ -1,6 +1,6 @@
---- ./base/debug/stack_trace_posix.cc.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/debug/stack_trace_posix.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -590,6 +590,10 @@
+--- base/debug/stack_trace_posix.cc.orig	2014-10-02 17:18:52 UTC
++++ base/debug/stack_trace_posix.cc
+@@ -588,6 +588,10 @@
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -11,7 +11,7 @@
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -605,6 +609,7 @@
+@@ -603,6 +607,7 @@
  
      is_initialized_ = true;
      return true;
diff --git a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
index 59476112ba11..0cf07946bcd5 100644
--- a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
+++ b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
@@ -1,5 +1,5 @@
---- ./base/files/file_path_watcher_kqueue.h.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/files/file_path_watcher_kqueue.h	2014-08-23 19:32:36.000000000 +0200
+--- base/files/file_path_watcher_kqueue.h.orig	2014-10-02 17:18:52 UTC
++++ base/files/file_path_watcher_kqueue.h
 @@ -5,6 +5,10 @@
  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
  #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
index 8415f3539199..46d0b47dfdc1 100644
--- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
+++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
@@ -1,5 +1,5 @@
---- ./base/posix/unix_domain_socket_linux.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/posix/unix_domain_socket_linux.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/posix/unix_domain_socket_linux.cc.orig	2014-10-02 17:18:52 UTC
++++ base/posix/unix_domain_socket_linux.cc
 @@ -18,6 +18,15 @@
  #include "base/posix/eintr_wrapper.h"
  #include "base/stl_util.h"
diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
index bfacd385c999..817c46b354f0 100644
--- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
+++ b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
@@ -1,5 +1,5 @@
---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/posix/unix_domain_socket_linux_unittest.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/posix/unix_domain_socket_linux_unittest.cc.orig	2014-10-02 17:18:52 UTC
++++ base/posix/unix_domain_socket_linux_unittest.cc
 @@ -2,8 +2,13 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h
index 89a7b7c8ea87..62c556fb9065 100644
--- a/www/chromium/files/patch-base__process__internal_linux.h
+++ b/www/chromium/files/patch-base__process__internal_linux.h
@@ -1,5 +1,5 @@
---- ./base/process/internal_linux.h.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/internal_linux.h	2014-08-22 15:06:24.000000000 +0200
+--- base/process/internal_linux.h.orig	2014-10-02 17:18:52 UTC
++++ base/process/internal_linux.h
 @@ -12,6 +12,8 @@
  
  #include "base/files/file_path.h"
diff --git a/www/chromium/files/patch-base__process__launch.cc b/www/chromium/files/patch-base__process__launch.cc
index ca562b45303e..b748528b157b 100644
--- a/www/chromium/files/patch-base__process__launch.cc
+++ b/www/chromium/files/patch-base__process__launch.cc
@@ -1,5 +1,5 @@
---- ./base/process/launch.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/launch.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/process/launch.cc.orig	2014-10-02 17:18:52 UTC
++++ base/process/launch.cc
 @@ -24,10 +24,10 @@
        fds_to_remap(NULL),
        maximize_rlimits(NULL),
diff --git a/www/chromium/files/patch-base__process__launch.h b/www/chromium/files/patch-base__process__launch.h
index 55b6ced74bf9..1cb26ebfcaca 100644
--- a/www/chromium/files/patch-base__process__launch.h
+++ b/www/chromium/files/patch-base__process__launch.h
@@ -1,5 +1,5 @@
---- ./base/process/launch.h.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/launch.h	2014-08-22 15:06:24.000000000 +0200
+--- base/process/launch.h.orig	2014-10-02 17:18:52 UTC
++++ base/process/launch.h
 @@ -113,14 +113,14 @@
    // will be the same as its pid.
    bool new_process_group;
diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc
index be5b4236ca45..8bdea94b1df5 100644
--- a/www/chromium/files/patch-base__process__memory_unittest.cc
+++ b/www/chromium/files/patch-base__process__memory_unittest.cc
@@ -1,6 +1,6 @@
---- ./base/process/memory_unittest.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/memory_unittest.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -151,9 +151,9 @@
+--- base/process/memory_unittest.cc.orig	2014-10-02 17:18:52 UTC
++++ base/process/memory_unittest.cc
+@@ -160,9 +160,9 @@
  
  // Android doesn't implement set_new_handler, so we can't use the
  // OutOfMemoryTest cases.
@@ -12,7 +12,7 @@
      !defined(OS_WIN)
  
  #if defined(USE_TCMALLOC)
-@@ -425,4 +425,4 @@
+@@ -448,4 +448,4 @@
    EXPECT_TRUE(value_ == NULL);
  }
  #endif  // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
index d09bdacdadbc..341826f2d45b 100644
--- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
+++ b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
@@ -1,5 +1,5 @@
---- ./base/process/process_iterator_freebsd.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/process_iterator_freebsd.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/process/process_iterator_freebsd.cc.orig	2014-10-02 17:18:52 UTC
++++ base/process/process_iterator_freebsd.cc
 @@ -8,6 +8,10 @@
  #include <sys/sysctl.h>
  #include <unistd.h>
diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h
index 58a4f5457994..e21e455a34e4 100644
--- a/www/chromium/files/patch-base__process__process_metrics.h
+++ b/www/chromium/files/patch-base__process__process_metrics.h
@@ -1,5 +1,5 @@
---- ./base/process/process_metrics.h.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/process_metrics.h	2014-08-22 15:06:24.000000000 +0200
+--- base/process/process_metrics.h.orig	2014-10-02 17:39:45 UTC
++++ base/process/process_metrics.h
 @@ -17,6 +17,13 @@
  #include "base/time/time.h"
  #include "base/values.h"
@@ -14,7 +14,7 @@
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
  #endif
-@@ -246,13 +253,17 @@
+@@ -240,13 +247,17 @@
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
  BASE_EXPORT int ParseProcStatCPU(const std::string& input);
diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
index 27a904bc5110..928c2a3a8431 100644
--- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
+++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
@@ -1,5 +1,5 @@
---- ./base/process/process_metrics_freebsd.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/process/process_metrics_freebsd.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/process/process_metrics_freebsd.cc.orig	2014-10-02 17:18:52 UTC
++++ base/process/process_metrics_freebsd.cc
 @@ -10,6 +10,9 @@
  
  #include "base/sys_info.h"
diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc
index 5e6d38cd6fbd..560ca94c8cde 100644
--- a/www/chromium/files/patch-base__security_unittest.cc
+++ b/www/chromium/files/patch-base__security_unittest.cc
@@ -1,5 +1,5 @@
---- ./base/security_unittest.cc.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/security_unittest.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/security_unittest.cc.orig	2014-10-02 17:18:52 UTC
++++ base/security_unittest.cc
 @@ -160,7 +160,7 @@
  // FAILS_ is too clunky.
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc
index f1f5f83cc1fb..4966c99e5a20 100644
--- a/www/chromium/files/patch-base__strings__safe_sprintf.cc
+++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc
@@ -1,19 +1,26 @@
---- ./base/strings/safe_sprintf.cc.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/strings/safe_sprintf.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -107,11 +107,11 @@
+--- base/strings/safe_sprintf.cc.orig	2014-10-02 17:18:52 UTC
++++ base/strings/safe_sprintf.cc
+@@ -107,15 +107,16 @@
        : buffer_(buffer),
          size_(size - 1),  // Account for trailing NUL byte
          count_(0) {
 -// The following assertion does not build on Mac and Android. This is because
 -// static_assert only works with compile-time constants, but mac uses
 -// libstdc++4.2 and android uses stlport, which both don't mark
--// numeric_limits::max() as constexp.
--#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
+-// numeric_limits::max() as constexp.  Likewise, MSVS2013's standard library
+-// also doesn't mark max() as constexpr yet. cl.exe supports static_cast but
+-// doesn't really implement constexpr yet so it doesn't complain, but clang
 +// The following assertion does not build on Mac and Android and older FreeBSD.
 +// This is because static_assert only works with compile-time constants, but
 +// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both
-+// don't mark numeric_limits::max() as constexp.
-+#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054)
++// don't mark numeric_limits::max() as constexp.  Likewise, MSVS2013's standard
++// library also doesn't mark max() as constexpr yet. cl.exe supports static_cast
++// but doesn't really implement constexpr yet so it doesn't complain, but clang
+ // does.
+ #if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \
+-    !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN))
++    !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) \
++    && !(defined(__clang__) && defined(OS_WIN))
      COMPILE_ASSERT(kSSizeMaxConst == \
                     static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
                     kSSizeMax_is_the_max_value_of_an_ssize_t);
diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc
index 1c2eaff505b7..2d580a10ede5 100644
--- a/www/chromium/files/patch-base__sys_info_freebsd.cc
+++ b/www/chromium/files/patch-base__sys_info_freebsd.cc
@@ -1,5 +1,5 @@
---- ./base/sys_info_freebsd.cc.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/sys_info_freebsd.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/sys_info_freebsd.cc.orig	2014-10-02 17:18:52 UTC
++++ base/sys_info_freebsd.cc
 @@ -4,6 +4,7 @@
  
  #include "base/sys_info.h"
diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc
index 7aa60420f8bf..4d629ace7bb5 100644
--- a/www/chromium/files/patch-base__sys_info_posix.cc
+++ b/www/chromium/files/patch-base__sys_info_posix.cc
@@ -1,5 +1,5 @@
---- ./base/sys_info_posix.cc.orig	2014-08-20 21:02:42.000000000 +0200
-+++ ./base/sys_info_posix.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/sys_info_posix.cc.orig	2014-10-02 17:39:45 UTC
++++ base/sys_info_posix.cc
 @@ -64,7 +64,7 @@
  
  namespace base {
diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc
index 4784145e9109..95d5c1147375 100644
--- a/www/chromium/files/patch-base__test__expectations__expectation.cc
+++ b/www/chromium/files/patch-base__test__expectations__expectation.cc
@@ -1,5 +1,5 @@
---- ./base/test/expectations/expectation.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/test/expectations/expectation.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/test/expectations/expectation.cc.orig	2014-10-02 17:18:52 UTC
++++ base/test/expectations/expectation.cc
 @@ -60,6 +60,7 @@
          variant != "64") {
        return false;
diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc
index a187f386bb18..7386e6cbb534 100644
--- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc
+++ b/www/chromium/files/patch-base__test__launcher__test_launcher.cc
@@ -1,7 +1,7 @@
---- ./base/test/launcher/test_launcher.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/test/launcher/test_launcher.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -41,6 +41,10 @@
- #include "base/mac/scoped_nsautorelease_pool.h"
+--- base/test/launcher/test_launcher.cc.orig	2014-10-02 17:39:45 UTC
++++ base/test/launcher/test_launcher.cc
+@@ -45,6 +45,10 @@
+ #include "base/win/windows_version.h"
  #endif
  
 +#if defined(OS_FREEBSD)
diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc
index 0f317abe4f44..450e2dc96aa9 100644
--- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc
+++ b/www/chromium/files/patch-base__threading__platform_thread_linux.cc
@@ -1,5 +1,5 @@
---- ./base/threading/platform_thread_linux.cc.orig	2014-08-20 21:02:41.000000000 +0200
-+++ ./base/threading/platform_thread_linux.cc	2014-08-22 15:06:24.000000000 +0200
+--- base/threading/platform_thread_linux.cc.orig	2014-10-02 17:39:45 UTC
++++ base/threading/platform_thread_linux.cc
 @@ -16,7 +16,9 @@
  #include "base/tracked_objects.h"
  
diff --git a/www/chromium/files/patch-breakpad__breakpad.gyp b/www/chromium/files/patch-breakpad__breakpad.gyp
index 0dc7ed16fae5..241020f2b452 100644
--- a/www/chromium/files/patch-breakpad__breakpad.gyp
+++ b/www/chromium/files/patch-breakpad__breakpad.gyp
@@ -1,6 +1,6 @@
---- ./breakpad/breakpad.gyp.orig	2014-08-20 21:02:30.000000000 +0200
-+++ ./breakpad/breakpad.gyp	2014-08-22 15:06:24.000000000 +0200
-@@ -340,7 +340,7 @@
+--- breakpad/breakpad.gyp.orig	2014-10-02 17:39:45 UTC
++++ breakpad/breakpad.gyp
+@@ -349,7 +349,7 @@
          },
        ],
      }],
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index ba2473963b2e..3aed2daaa073 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/www/chromium/files/patch-build__common.gypi
@@ -1,6 +1,6 @@
---- ./build/common.gypi.orig	2014-08-20 21:02:29.000000000 +0200
-+++ ./build/common.gypi	2014-08-22 15:06:24.000000000 +0200
-@@ -87,7 +87,7 @@
+--- build/common.gypi.orig	2014-10-02 17:39:45 UTC
++++ build/common.gypi
+@@ -91,7 +91,7 @@
  
            'conditions': [
              # ChromeOS and Windows use Aura and Ash.
@@ -9,7 +9,7 @@
                'use_ash%': 1,
                'use_aura%': 1,
              }],
-@@ -645,7 +645,7 @@
+@@ -676,7 +676,7 @@
          }],
  
          # DBus usage.
@@ -18,27 +18,36 @@
            'use_dbus%': 1,
          }, {
            'use_dbus%': 0,
-@@ -926,7 +926,7 @@
-         # except when building Android WebView.
+@@ -931,7 +931,7 @@
+         }, {
+           'use_openmax_dl_fft%': 0,
+         }],
+-        ['OS=="win" or OS=="linux"', {
++        ['OS=="win" or OS=="linux" or OS=="freebsd"', {
+             'enable_mdns%' : 1,
+         }],
+ 
+@@ -954,7 +954,7 @@
+         # except when building Android WebView or Chromecast.
          # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
          # Set the data reduction proxy origin for Android Webview.
--        ['android_webview_build==0', {
-+        ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', {
+-        ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', {
++        ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', {
            'icu_use_data_file_flag%' : 1,
            'spdy_proxy_auth_origin%': '',
            'data_reduction_proxy_probe_url%': '',
-@@ -1153,6 +1153,10 @@
+@@ -1193,6 +1193,10 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
 +    # XXX(rene) More options, keep them?
 +    'os_ver%': 0,
-+    'use_system_libjpeg%': 0,
++    'use_system_libjpeg%': 0,    
 +
      # The release channel that this build targets. This is used to restrict
      # channel-specific build options, like which installer packages to create.
      # The default is 'all', which does no channel-specific filtering.
-@@ -4150,6 +4154,13 @@
+@@ -4280,6 +4284,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],
diff --git a/www/chromium/files/patch-build__filename_rules.gypi b/www/chromium/files/patch-build__filename_rules.gypi
index 1b28c26d8624..39c267457689 100644
--- a/www/chromium/files/patch-build__filename_rules.gypi
+++ b/www/chromium/files/patch-build__filename_rules.gypi
@@ -1,5 +1,5 @@
---- ./build/filename_rules.gypi.orig	2014-08-20 21:02:29.000000000 +0200
-+++ ./build/filename_rules.gypi	2014-08-22 15:06:24.000000000 +0200
+--- build/filename_rules.gypi.orig	2014-10-02 17:18:52 UTC
++++ build/filename_rules.gypi
 @@ -85,7 +85,7 @@
      ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', {
        'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ]
diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp
index 4e872b96b436..65b62e8428c5 100644
--- a/www/chromium/files/patch-build__linux__system.gyp
+++ b/www/chromium/files/patch-build__linux__system.gyp
@@ -1,6 +1,6 @@
---- ./build/linux/system.gyp.orig	2014-08-20 21:02:29.000000000 +0200
-+++ ./build/linux/system.gyp	2014-08-22 15:06:24.000000000 +0200
-@@ -881,6 +881,13 @@
+--- build/linux/system.gyp.orig	2014-10-02 17:39:45 UTC
++++ build/linux/system.gyp
+@@ -890,6 +890,13 @@
        'include_dirs': [
          '../..',
        ],
diff --git a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
index 630a4cfe2f0e..ed8a89e51546 100644
--- a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
+++ b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
@@ -1,5 +1,5 @@
---- ./build/linux/unbundle/libwebp.gyp.orig	2014-08-20 21:02:29.000000000 +0200
-+++ ./build/linux/unbundle/libwebp.gyp	2014-08-22 15:06:24.000000000 +0200
+--- build/linux/unbundle/libwebp.gyp.orig	2014-10-02 17:18:52 UTC
++++ build/linux/unbundle/libwebp.gyp
 @@ -14,13 +14,7 @@
        },
        'link_settings': {
diff --git a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
index 25643a23a58f..b049c8746df6 100644
--- a/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
+++ b/www/chromium/files/patch-build__linux__unbundle__openssl.gyp
@@ -1,5 +1,5 @@
---- ./build/linux/unbundle/openssl.gyp.orig	2014-08-20 21:02:29.000000000 +0200
-+++ ./build/linux/unbundle/openssl.gyp	2014-08-22 15:06:24.000000000 +0200
+--- build/linux/unbundle/openssl.gyp.orig	2014-10-02 17:18:52 UTC
++++ build/linux/unbundle/openssl.gyp
 @@ -9,15 +9,15 @@
        'type': 'none',
        'direct_dependent_settings': {
diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc
index 85afd46665a4..bb120b34a1dd 100644
--- a/www/chromium/files/patch-cc__layers__layer_impl.cc
+++ b/www/chromium/files/patch-cc__layers__layer_impl.cc
@@ -1,6 +1,6 @@
---- ./cc/layers/layer_impl.cc.orig	2014-08-20 21:02:36.000000000 +0200
-+++ ./cc/layers/layer_impl.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -1190,21 +1190,23 @@
+--- cc/layers/layer_impl.cc.orig	2014-10-02 17:39:45 UTC
++++ cc/layers/layer_impl.cc
+@@ -1201,21 +1201,23 @@
                                 scale_factor * scaled_scroll_bounds.height());
    scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds);
  
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
index 9284576fdbe7..3d2bbaf96774 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
+++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
@@ -1,6 +1,6 @@
---- ./chrome/app/chrome_main_delegate.cc.orig	2014-08-20 21:01:26.000000000 +0200
-+++ ./chrome/app/chrome_main_delegate.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -96,7 +96,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/app/chrome_main_delegate.cc
+@@ -94,7 +94,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/breakpad/app/breakpad_linux.h"
  #endif
  
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
      g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -18,16 +18,16 @@
  base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
      g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -226,7 +226,7 @@
-       // Needed for scrollbar related images.
-       process_type == switches::kWorkerProcess ||
+@@ -225,7 +225,7 @@
+       // Mac needs them for the plugin process name.
+       process_type == switches::kPluginProcess ||
  #endif
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -440,7 +440,7 @@
+@@ -441,7 +441,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -36,7 +36,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -491,7 +491,7 @@
+@@ -492,7 +492,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -621,7 +621,7 @@
+@@ -632,7 +632,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,7 +54,7 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -743,7 +743,7 @@
+@@ -759,7 +759,7 @@
  #endif
    }
  
@@ -63,7 +63,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -755,7 +755,7 @@
+@@ -771,7 +771,7 @@
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -72,9 +72,9 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -840,7 +840,7 @@
-   return process_type == switches::kNaClLoaderProcess ||
-       process_type == switches::kRelauncherProcess;
+@@ -863,7 +863,7 @@
+ #endif
+   return process_type == switches::kRelauncherProcess;
  }
 -#elif defined(OS_POSIX) && !defined(OS_ANDROID)
 +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
index c0fc34899a90..ec577255b7a9 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
+++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
@@ -1,5 +1,5 @@
---- ./chrome/app/chrome_main_delegate.h.orig	2014-08-20 21:01:26.000000000 +0200
-+++ ./chrome/app/chrome_main_delegate.h	2014-08-22 15:06:24.000000000 +0200
+--- chrome/app/chrome_main_delegate.h.orig	2014-10-02 17:18:53 UTC
++++ chrome/app/chrome_main_delegate.h
 @@ -38,7 +38,7 @@
    virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
    virtual bool DelaySandboxInitialization(
diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd
index 559b6d3a6e5d..3a38ae18c75a 100644
--- a/www/chromium/files/patch-chrome__app__chromium_strings.grd
+++ b/www/chromium/files/patch-chrome__app__chromium_strings.grd
@@ -1,6 +1,6 @@
---- ./chrome/app/chromium_strings.grd.orig	2014-08-20 21:01:26.000000000 +0200
-+++ ./chrome/app/chromium_strings.grd	2014-08-22 15:06:24.000000000 +0200
-@@ -1102,7 +1102,7 @@
+--- chrome/app/chromium_strings.grd.orig	2014-10-02 17:39:45 UTC
++++ chrome/app/chromium_strings.grd
+@@ -1115,7 +1115,7 @@
        </message>
  
        <!-- ProcessSingleton -->
diff --git a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd
index acb543118ccd..98372707b718 100644
--- a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd
+++ b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd
@@ -1,5 +1,5 @@
---- ./chrome/app/resources/locale_settings.grd.orig	2014-08-20 21:01:26.000000000 +0200
-+++ ./chrome/app/resources/locale_settings.grd	2014-08-23 15:49:37.000000000 +0200
+--- chrome/app/resources/locale_settings.grd.orig	2014-10-02 17:39:45 UTC
++++ chrome/app/resources/locale_settings.grd
 @@ -264,7 +264,7 @@
          55
        </message>
diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc
index 6867ad730dca..75793da6bb12 100644
--- a/www/chromium/files/patch-chrome__browser__about_flags.cc
+++ b/www/chromium/files/patch-chrome__browser__about_flags.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/about_flags.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/about_flags.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -2263,7 +2263,7 @@
+--- chrome/browser/about_flags.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/about_flags.cc
+@@ -2278,7 +2278,7 @@
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;
diff --git a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
deleted file mode 100644
index 30279a6c96e3..000000000000
--- a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chrome/browser/browser_process_impl.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/browser_process_impl.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -248,7 +248,7 @@
- 
-   ExtensionRendererState::GetInstance()->Shutdown();
- 
--#if !defined(OS_ANDROID) && !defined(OS_IOS)
-+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
-   media_file_system_registry_.reset();
-   // Remove the global instance of the Storage Monitor now. Otherwise the
-   // FILE thread would be gone when we try to release it in the dtor and
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
index f2225ad5a254..17146e7f9e41 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/chrome_browser_main.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/chrome_browser_main.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -925,7 +925,7 @@
+--- chrome/browser/chrome_browser_main.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/chrome_browser_main.cc
+@@ -947,7 +947,7 @@
    }
  #endif
  
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
index 7550e7c0e504..fb084f98ee87 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/chrome_browser_main_posix.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/chrome_browser_main_posix.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/chrome_browser_main_posix.cc
 @@ -270,6 +270,11 @@
      g_pipe_pid = getpid();
      g_shutdown_pipe_read_fd = pipefd[0];
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
index 1f0f05746186..f4ef03b16a41 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
@@ -1,34 +1,43 @@
---- ./chrome/browser/chrome_content_browser_client.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/chrome_content_browser_client.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -509,7 +509,7 @@
-   }
+--- chrome/browser/chrome_content_browser_client.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -430,7 +430,7 @@
+   return false;
  }
  
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -566,7 +566,7 @@
+@@ -487,7 +487,7 @@
  
    return -1;
  }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #endif  // !defined(OS_ANDROID)
+-#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
  
  #if !defined(OS_CHROMEOS)
-@@ -1533,7 +1533,7 @@
+ GURL GetEffectiveURLForSignin(const GURL& url) {
+@@ -1196,7 +1196,7 @@
  
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      CommandLine* command_line, int child_process_id) {
 -#if defined(OS_POSIX)
 +#if defined(OS_POSIX) && !defined(OS_BSD)
    if (breakpad::IsCrashReporterEnabled()) {
-     std::string enable_crash_reporter;
-     GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
-@@ -2683,7 +2683,7 @@
- #endif
+     scoped_ptr<metrics::ClientInfo> client_info =
+         GoogleUpdateSettings::LoadMetricsClientInfo();
+@@ -1204,7 +1204,7 @@
+                                     client_info ? client_info->client_id
+                                                 : std::string());
+   }
+-#endif  // defined(OS_POSIX)
++#endif  // defined(OS_POSIX) && !defined(OS_BSD)
+ 
+   if (logging::DialogsAreSuppressed())
+     command_line->AppendSwitch(switches::kNoErrorDialogs);
+@@ -2447,7 +2447,7 @@
+   }
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +45,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const CommandLine& command_line,
      int child_process_id,
-@@ -2749,7 +2749,7 @@
+@@ -2513,7 +2513,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
index 9aef82e08f9b..707ca816f426 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
+++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
@@ -1,6 +1,6 @@
---- ./chrome/browser/chrome_content_browser_client.h.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/chrome_content_browser_client.h	2014-08-22 15:06:24.000000000 +0200
-@@ -288,7 +288,7 @@
+--- chrome/browser/chrome_content_browser_client.h.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/chrome_content_browser_client.h
+@@ -287,7 +287,7 @@
    virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
        int render_process_id) OVERRIDE;
  
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
index c401b7c8fd1e..d967c2256814 100644
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
+++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-08-20 21:02:00.000000000 +0200
-+++ ./chrome/browser/diagnostics/diagnostics_writer.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -268,7 +268,7 @@
+--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/diagnostics/diagnostics_writer.cc
+@@ -266,7 +266,7 @@
        console_->SetColor(color);
        console_->Write(base::ASCIIToUTF16(result));
      }
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
index b65f51cb371c..33abf2f2d9ae 100644
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
+++ b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
@@ -1,5 +1,5 @@
---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-08-20 21:02:00.000000000 +0200
-+++ ./chrome/browser/diagnostics/diagnostics_writer.h	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/diagnostics/diagnostics_writer.h
 @@ -18,7 +18,7 @@
   public:
    // The type of formatting done by this writer.
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
index 6cc4c7db5aae..2eff1850e033 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
+++ b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-08-20 21:01:58.000000000 +0200
-+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
 @@ -167,10 +167,12 @@
  }
  
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
index 8e0c3a7577eb..9fee3e87d702 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
+++ b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2014-08-20 21:01:57.000000000 +0200
-+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
 @@ -4,6 +4,10 @@
  
  #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
index f94b12b6de6a..ab3a4bd02beb 100644
--- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
+++ b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/gpu/gl_string_manager.cc.orig	2014-08-20 21:02:06.000000000 +0200
-+++ ./chrome/browser/gpu/gl_string_manager.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/gpu/gl_string_manager.cc.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/gpu/gl_string_manager.cc
 @@ -25,7 +25,7 @@
  
  void GLStringManager::Initialize() {
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
index 1fffd9567753..a8ff601c2255 100644
--- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
+++ b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-08-20 21:02:06.000000000 +0200
-+++ ./chrome/browser/gpu/gpu_feature_checker.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-10-02 17:39:45 UTC
++++ chrome/browser/gpu/gpu_feature_checker.cc
 @@ -33,7 +33,7 @@
    CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
  
diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
index 555c764d71be..3146cd2e5bf4 100644
--- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
+++ b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/media/webrtc_log_uploader.cc.orig	2014-08-20 21:02:12.000000000 +0200
-+++ ./chrome/browser/media/webrtc_log_uploader.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/media/webrtc_log_uploader.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/media/webrtc_log_uploader.cc
 @@ -233,6 +233,8 @@
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
index 8f7191df4d8e..eb4e326593ea 100644
--- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
+++ b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-08-20 21:01:59.000000000 +0200
-+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
 @@ -33,9 +33,11 @@
      // Note that this initializes the delegate asynchronously, but since
      // the delegate will only be used from the IO thread, it is guaranteed
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
index 53e0c76e5340..69f0306fd001 100644
--- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
+++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-08-20 21:01:59.000000000 +0200
-+++ ./chrome/browser/media_galleries/media_file_system_registry.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -724,7 +724,10 @@
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/media_galleries/media_file_system_registry.cc
+@@ -734,7 +734,10 @@
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
index b131389b3de4..7024fd024300 100644
--- a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
+++ b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/media_galleries/media_folder_finder.cc.orig	2014-08-20 21:01:59.000000000 +0200
-+++ ./chrome/browser/media_galleries/media_folder_finder.cc	2014-08-22 15:06:24.000000000 +0200
+--- chrome/browser/media_galleries/media_folder_finder.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/media_galleries/media_folder_finder.cc
 @@ -50,10 +50,10 @@
    chrome::DIR_USER_APPLICATIONS,
    chrome::DIR_USER_LIBRARY,
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc
index bc2e112b791b..60a9c0d76b14 100644
--- a/www/chromium/files/patch-chrome__browser__memory_details.cc
+++ b/www/chromium/files/patch-chrome__browser__memory_details.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/memory_details.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/memory_details.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -32,7 +32,7 @@
+--- chrome/browser/memory_details.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/memory_details.cc
+@@ -27,7 +27,7 @@
  #include "grit/generated_resources.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -9,7 +9,7 @@
  #include "content/public/browser/zygote_host_linux.h"
  #endif
  
-@@ -202,7 +202,7 @@
+@@ -248,7 +248,7 @@
  void MemoryDetails::CollectChildInfoOnUIThread() {
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
  
@@ -18,7 +18,7 @@
    const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
  #endif
  
-@@ -334,7 +334,7 @@
+@@ -390,7 +390,7 @@
        }
      }
  
diff --git a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
index 687bd50fac17..28a10e804d83 100644
--- a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
+++ b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/net/connection_tester.cc.orig	2014-08-20 21:02:09.000000000 +0200
-+++ ./chrome/browser/net/connection_tester.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -217,7 +217,7 @@
+--- chrome/browser/net/connection_tester.cc.orig	2014-10-02 17:18:53 UTC
++++ chrome/browser/net/connection_tester.cc
+@@ -219,7 +219,7 @@
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {
diff --git a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc b/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
deleted file mode 100644
index bbbca04ce6d5..000000000000
--- a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/notifications/message_center_notification_manager.cc.orig	2014-09-10 01:47:12.000000000 +0200
-+++ chrome/browser/notifications/message_center_notification_manager.cc	2014-09-18 14:21:16.000000000 +0200
-@@ -78,7 +78,7 @@
-   blockers_.push_back(new FullscreenNotificationBlocker(message_center));
- 
- #if defined(OS_WIN) || defined(OS_MACOSX) \
--  || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+  || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // On Windows, Linux and Mac, the notification manager owns the tray icon and
-   // views.Other platforms have global ownership and Create will return NULL.
-   tray_.reset(message_center::CreateMessageCenterTray());
diff --git a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
deleted file mode 100644
index b68d974e4b3e..000000000000
--- a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig	2014-08-20 21:02:00.000000000 +0200
-+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -29,6 +29,8 @@
-     "linux";
- #elif defined(OS_OPENBSD)
-     "openbsd";
-+#elif defined(OS_FREEBSD)
-+    "freebsd";
- #else
- #error "unknown os"
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
index f89454f4d74e..b680e11ad385 100644
--- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
+++ b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/plugins/plugins_resource_service.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/plugins/plugins_resource_service.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/browser/plugins/plugins_resource_service.cc.orig	2014-10-02 17:18:54 UTC
++++ chrome/browser/plugins/plugins_resource_service.cc
 @@ -33,7 +33,7 @@
    std::string filename;
  #if defined(OS_WIN)
diff --git a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
index 0b862ebbf4ce..7c46401e3dd7 100644
--- a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
+++ b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig	2014-08-20 21:02:01.000000000 +0200
-+++ ./chrome/browser/policy/policy_prefs_browsertest.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/policy/policy_prefs_browsertest.cc
 @@ -169,6 +169,8 @@
      const std::string os("chromeos");
  #elif defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc b/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
new file mode 100644
index 000000000000..1bedd54843d2
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2014-10-02 17:18:54 UTC
++++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
+@@ -8,7 +8,12 @@
+ 
+ #include "base/hash.h"
+ #include "base/logging.h"
++//XXX(rene) needs shim headers?
++#if defined(USE_SYSTEM_PROTOBUF)
++#include <google/protobuf/message_lite.h>
++#else
+ #include "third_party/protobuf/src/google/protobuf/message_lite.h"
++#endif
+ 
+ namespace safe_browsing {
+ 
diff --git a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
new file mode 100644
index 000000000000..431e93c24a82
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ssl/ssl_blocking_page.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ssl/ssl_blocking_page.cc
+@@ -260,7 +260,7 @@
+   // settings. Weird. TODO(palmer): Do something more graceful than ignoring
+   // the user's click! crbug.com/394993
+   return;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   struct ClockCommand {
+     const char* pathname;
+     const char* argument;
+@@ -310,7 +310,7 @@
+ #if !defined(OS_CHROMEOS)
+   base::LaunchOptions options;
+   options.wait = false;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   options.allow_new_privs = true;
+ #endif
+   base::LaunchProcess(command, options, NULL);
diff --git a/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc b/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
new file mode 100644
index 000000000000..64a6eda7e6ad
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2014-10-06 09:19:40.000000000 +0200
++++ chrome/browser/ui/browser_view_prefs.cc	2014-10-06 09:24:45.000000000 +0200
+@@ -9,7 +9,7 @@
+ #include "chrome/common/pref_names.h"
+ #include "components/pref_registry/pref_registry_syncable.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+ #include "ui/base/x/x11_util.h"
+ #endif
+ 
+@@ -42,7 +42,7 @@
+ void RegisterBrowserViewProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   bool custom_frame_default = false;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   custom_frame_default = ui::GetCustomFramePrefDefault();
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
index 7cbfe8b71476..99b45abde311 100644
--- a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
@@ -1,7 +1,7 @@
---- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig	2014-08-20 21:02:04.000000000 +0200
-+++ ./chrome/browser/ui/startup/startup_browser_creator.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -81,7 +81,7 @@
- #include "chromeos/chromeos_switches.h"
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/startup/startup_browser_creator.cc
+@@ -79,7 +79,7 @@
+ #include "components/user_manager/user_manager.h"
  #endif
  
 -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc b/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc
new file mode 100644
index 000000000000..e813b88194e3
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig	2014-10-06 09:32:59.000000000 +0200
++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc	2014-10-06 09:40:11.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include "ui/wm/core/easy_resize_window_targeter.h"
+ #include "ui/wm/core/shadow_types.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX)  || defined(OS_BSD) || defined(OS_BSD)
+ #include "chrome/browser/shell_integration_linux.h"
+ #endif
+ 
+@@ -217,7 +217,7 @@
+     init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
+   init_params.keep_on_top = create_params.always_on_top;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   // Set up a custom WM_CLASS for app windows. This allows task switchers in
+   // X11 environments to distinguish them from main browser windows.
+   init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
new file mode 100644
index 000000000000..71a23bfc8c29
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2014-10-06 09:19:23.000000000 +0200
++++ chrome/browser/ui/views/chrome_views_delegate.cc	2014-10-06 09:22:54.000000000 +0200
+@@ -44,7 +44,7 @@
+ #include "ui/views/widget/native_widget_aura.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
+@@ -234,7 +234,7 @@
+   return chrome::IsNativeViewInAsh(window);
+ }
+ 
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+ gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
+   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+   return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
+@@ -373,7 +373,7 @@
+ #endif
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+ bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
+   // On Ubuntu Unity, the system always provides a title bar for maximized
+   // windows.
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
new file mode 100644
index 000000000000..26e706d76f33
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2014-10-06 09:19:31.000000000 +0200
++++ chrome/browser/ui/views/chrome_views_delegate.h	2014-10-06 09:23:19.000000000 +0200
+@@ -36,7 +36,7 @@
+ #if defined(OS_WIN)
+   virtual HICON GetDefaultWindowIcon() const OVERRIDE;
+   virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE;
+ #endif
+ 
+@@ -49,7 +49,7 @@
+   virtual void OnBeforeWidgetInit(
+       views::Widget::InitParams* params,
+       views::internal::NativeWidgetDelegate* delegate) OVERRIDE;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE;
+ #endif
+ #if defined(USE_AURA)
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
index 6bc9c2e3fb70..4345c44363e5 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/ui/views/first_run_dialog.cc.orig	2014-08-20 21:02:04.000000000 +0200
-+++ ./chrome/browser/ui/views/first_run_dialog.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/browser/ui/views/first_run_dialog.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/views/first_run_dialog.cc
 @@ -124,12 +124,16 @@
  bool FirstRunDialog::Accept() {
    GetWidget()->Hide();
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
index 25d6f0e9afbb..2a389901d048 100644
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2014-09-10 01:47:12.000000000 +0200
-+++ chrome/browser/ui/views/frame/browser_frame.cc	2014-09-17 13:49:30.000000000 +0200
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2014-10-06 09:37:47.000000000 +0200
++++ chrome/browser/ui/views/frame/browser_frame.cc	2014-10-06 09:37:33.000000000 +0200
 @@ -36,7 +36,7 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #include "ui/views/widget/native_widget.h"
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
@@ -14,7 +14,7 @@
    }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
    // Set up a custom WM_CLASS for some sorts of window types. This allows
    // task switchers in X11 environments to distinguish between main browser
    // windows and e.g app windows.
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
new file mode 100644
index 000000000000..e76dd8b9e0f7
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
@@ -0,0 +1,47 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2014-10-06 09:39:10.000000000 +0200
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	2014-10-06 09:39:57.000000000 +0200
+@@ -53,7 +53,7 @@
+ #include "ui/views/window/frame_background.h"
+ #include "ui/views/window/window_shape.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/views/controls/menu/menu_runner.h"
+ #endif
+ 
+@@ -78,7 +78,7 @@
+ // The icon never shrinks below 16 px on a side.
+ const int kIconMinimumSize = 16;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ // The number of pixels to move the frame background image upwards when using
+ // the GTK+ theme and the titlebar is condensed.
+ const int kGTKThemeCondensedFrameTopInset = 15;
+@@ -316,7 +316,7 @@
+ 
+ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
+                                                  const gfx::Point& point) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX)  || defined(OS_BSD)
+   views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
+                                 views::MenuRunner::HAS_MNEMONICS);
+   ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
+@@ -569,7 +569,7 @@
+ }
+ 
+ bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   // Do not show the custom title bar if the system title bar option is enabled.
+   if (!frame()->UseCustomFrame())
+     return false;
+@@ -614,7 +614,7 @@
+   frame_background_->set_theme_image(GetFrameImage());
+   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
+   frame_background_->set_top_area_height(GetTopAreaHeight());
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   // The window manager typically shows a gradient in the native title bar (when
+   // the system title bar pref is set, or when maximized on Ubuntu). Hide the
+   // gradient in the tab strip (by shifting it up vertically) to avoid a
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
new file mode 100644
index 000000000000..d39edcc8f6cc
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2014-10-06 09:41:06.000000000 +0200
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc	2014-10-06 09:40:51.000000000 +0200
+@@ -81,7 +81,7 @@
+ // is no avatar icon.
+ const int kTabStripIndent = -6;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Default extra space between the top of the frame and the top of the window
+ // caption buttons.
+ const int kExtraCaption = 2;
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc b/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
new file mode 100644
index 000000000000..1350ebf4a5c9
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2014-10-06 09:33:35.000000000 +0200
++++ chrome/browser/ui/views/tabs/tab_strip.cc	2014-10-06 09:31:58.000000000 +0200
+@@ -281,7 +281,7 @@
+     : views::ImageButton(listener),
+       tab_strip_(tab_strip),
+       destroyed_(NULL) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   set_triggerable_event_flags(triggerable_event_flags() |
+                               ui::EF_MIDDLE_MOUSE_BUTTON);
+ #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
index e9ccde8c14fa..65fb74bceb43 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/ui/webui/about_ui.cc.orig	2014-08-20 21:02:03.000000000 +0200
-+++ ./chrome/browser/ui/webui/about_ui.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/browser/ui/webui/about_ui.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/webui/about_ui.cc
 @@ -761,7 +761,7 @@
    return data;
  }
@@ -25,7 +25,7 @@
  
  // AboutMemoryHandler ----------------------------------------------------------
  
-@@ -1017,7 +1019,7 @@
+@@ -1019,7 +1021,7 @@
    } else if (source_name_ == chrome::kChromeUIDNSHost) {
      AboutDnsHandler::Start(profile(), callback);
      return;
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
index 6b681e50e053..a12231fd0bc2 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-08-20 21:02:03.000000000 +0200
-+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -493,7 +493,7 @@
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+@@ -512,7 +512,7 @@
        url.host() == chrome::kChromeUIMemoryRedirectHost ||
        url.host() == chrome::kChromeUIStatsHost ||
        url.host() == chrome::kChromeUITermsHost
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
index 8dc1de76113c..44c4d8b96d65 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-08-20 21:02:02.000000000 +0200
-+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -332,7 +332,8 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/webui/options/browser_options_handler.cc
+@@ -356,7 +356,8 @@
      { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
      { "translateEnableTranslate",
        IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
@@ -10,7 +10,7 @@
      { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
      { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
      { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-@@ -647,7 +648,8 @@
+@@ -685,7 +686,8 @@
        "requestProfilesInfo",
        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                   base::Unretained(this)));
@@ -20,7 +20,7 @@
    web_ui()->RegisterMessageCallback(
        "themesSetNative",
        base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1272,7 +1274,8 @@
+@@ -1316,7 +1318,8 @@
    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
    bool is_system_theme = false;
  
@@ -30,7 +30,7 @@
    bool profile_is_supervised = profile->IsSupervised();
    is_system_theme = theme_service->UsingSystemTheme();
    base::FundamentalValue native_theme_enabled(!is_system_theme &&
-@@ -1294,7 +1297,8 @@
+@@ -1338,7 +1341,8 @@
    ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
  }
  
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
index 8cdbfd218155..1f214f3f27cd 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
@@ -1,5 +1,5 @@
---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-08-20 21:02:02.000000000 +0200
-+++ ./chrome/browser/ui/webui/options/browser_options_handler.h	2014-08-22 15:06:25.000000000 +0200
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/ui/webui/options/browser_options_handler.h
 @@ -197,7 +197,8 @@
  
    void ObserveThemeChanged();
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
index 171cea600d4f..beae46131645 100644
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
+++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
@@ -1,11 +1,11 @@
---- ./chrome/browser/web_applications/web_app.cc.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/web_applications/web_app.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -441,7 +441,7 @@
+--- chrome/browser/web_applications/web_app.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/browser/web_applications/web_app.cc
+@@ -424,7 +424,7 @@
  }
  #endif
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
  std::string GetWMClassFromAppName(std::string app_name) {
-   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
+   base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
    base::TrimString(app_name, "_", &app_name);
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
index 66de6ad23546..d210d1bad876 100644
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
+++ b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
@@ -1,6 +1,6 @@
---- ./chrome/browser/web_applications/web_app.h.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/browser/web_applications/web_app.h	2014-08-22 15:06:25.000000000 +0200
-@@ -193,7 +193,7 @@
+--- chrome/browser/web_applications/web_app.h.orig	2014-10-02 17:18:54 UTC
++++ chrome/browser/web_applications/web_app.h
+@@ -208,7 +208,7 @@
  void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
  #endif
  
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index c0e6c83a5fe1..be68c9c83fa2 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser.gypi
@@ -1,6 +1,6 @@
---- ./chrome/chrome_browser.gypi.orig	2014-08-20 21:02:14.000000000 +0200
-+++ ./chrome/chrome_browser.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -2979,7 +2979,7 @@
+--- chrome/chrome_browser.gypi.orig	2014-10-02 17:39:46 UTC
++++ chrome/chrome_browser.gypi
+@@ -3173,7 +3173,7 @@
              '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
            ],
          }],
@@ -9,8 +9,8 @@
            'dependencies': [
              '../build/linux/system.gyp:libspeechd',
            ],
-@@ -3106,7 +3106,7 @@
-             '../build/linux/system.gyp:xscrnsaver',
+@@ -3230,7 +3230,7 @@
+             }],
            ],
          }],
 -        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
@@ -18,9 +18,9 @@
            'sources': [
              'app/chrome_breakpad_client.cc',
              'app/chrome_breakpad_client.h',
-@@ -3365,6 +3365,13 @@
-             ['exclude', '^third_party/mozilla_security_manager/'],
-           ],
+@@ -3313,6 +3313,13 @@
+         }, {  # Non-Android.
+           'sources': [ '<@(chrome_browser_non_android_sources)' ],
          }],
 +        ['os_bsd==1', {
 +          'sources/': [
@@ -28,16 +28,16 @@
 +            ['exclude', '^browser/chrome_browser_main_linux.h'],
 +            ['exclude', '^browser/media_galleries/linux/'],
 +          ],
-+        }],
++        }],  
          ['OS=="mac"', {
            'dependencies': [
              '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
-@@ -3465,7 +3472,7 @@
+@@ -3389,7 +3396,7 @@
              }],
            ],
          }],
 -        ['OS=="linux"', {
 +        ['OS=="linux" or os_bsd==1', {
+           'sources': [ '<@(chrome_browser_linux_sources)' ],
            'conditions': [
              ['use_aura==1', {
-               'dependencies': [
diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
index ae9bfa32fcf8..4648e6b069d4 100644
--- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
@@ -1,7 +1,7 @@
---- ./chrome/chrome_browser_extensions.gypi.orig	2014-08-20 21:02:14.000000000 +0200
-+++ ./chrome/chrome_browser_extensions.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -958,6 +958,11 @@
-         'browser/extensions/window_controller_list_observer.h',
+--- chrome/chrome_browser_extensions.gypi.orig	2014-10-02 17:39:46 UTC
++++ chrome/chrome_browser_extensions.gypi
+@@ -1023,6 +1023,11 @@
+         '<@(chrome_browser_extensions_enabled_sources)',
        ],
        'conditions': [
 +        ['os_bsd==1', {
diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
index b24cb7627a6d..3ffd62526da4 100644
--- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
@@ -1,7 +1,7 @@
---- ./chrome/chrome_browser_ui.gypi.orig	2014-08-20 21:02:14.000000000 +0200
-+++ ./chrome/chrome_browser_ui.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -2673,7 +2673,7 @@
-             'browser/ui/views/message_center/web_notification_tray.cc',
+--- chrome/chrome_browser_ui.gypi.orig	2014-10-02 17:39:46 UTC
++++ chrome/chrome_browser_ui.gypi
+@@ -2729,7 +2729,7 @@
+             }],
            ],
          }],
 -        ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
@@ -9,30 +9,30 @@
            'dependencies': [
              # gtk2 is the only component that can interact with gtk2 in our new
              # world.
-@@ -2681,7 +2681,7 @@
+@@ -2737,7 +2737,7 @@
              '../build/linux/system.gyp:gio',
            ],
          }],
--        ['use_aura==0 or chromeos==1 or OS!="linux"', {
-+        ['use_aura==0 or chromeos==1 or (OS!="linux" and os_bsd!=1)', {
-           'sources!': [
-             'browser/ui/views/first_run_dialog.cc',
-             'browser/ui/views/first_run_dialog.h',
-@@ -3047,7 +3047,7 @@
-             }],
-           ],
+-        ['OS=="win" or OS=="mac" or desktop_linux==1', {
++        ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', {
+           'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
          }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or os_bsd==1', {
-           'conditions': [
-             ['use_aura==1', {
-               'dependencies': [
-@@ -3140,7 +3140,7 @@
-             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
-           ],
+         ['use_aura==1', {
+@@ -2772,7 +2772,7 @@
+         ['enable_printing==1', {
+           'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
          }],
--        ['OS!="linux" and OS!="win"', {
-+        ['OS!="linux" and OS!="win" and os_bsd!=1', {
-           'sources': [
-             'browser/ui/startup/session_crashed_bubble.cc'
-           ],
+-        ['OS=="linux" or OS=="android"', {
++        ['OS=="linux" or OS=="android" or OS=="freebsd"', {
+           'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
+         }],
+         ['OS=="android"', {
+@@ -2891,7 +2891,7 @@
+         ['desktop_linux==1', {
+           'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
+         }],
+-        ['OS=="linux"', {  # Both desktop Linux and ChromeOS.
++        ['OS=="linux" or OS=="freebsd"', {  # Both desktop Linux and ChromeOS.
+           'sources': [ '<@(chrome_browser_ui_linux_sources)' ],
+           'dependencies': [
+             '../build/linux/system.gyp:udev',
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc
index 5bafb63e3637..0bee339291ac 100644
--- a/www/chromium/files/patch-chrome__common__chrome_paths.cc
+++ b/www/chromium/files/patch-chrome__common__chrome_paths.cc
@@ -1,6 +1,6 @@
---- ./chrome/common/chrome_paths.cc.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/chrome_paths.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -469,10 +469,12 @@
+--- chrome/common/chrome_paths.cc.orig	2014-10-02 21:05:31 UTC
++++ chrome/common/chrome_paths.cc
+@@ -461,10 +461,12 @@
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
@@ -14,7 +14,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
-@@ -550,7 +552,7 @@
+@@ -542,7 +544,7 @@
  #endif
        break;
  
@@ -23,7 +23,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if defined(OS_MACOSX)
  #if defined(GOOGLE_CHROME_BUILD)
-@@ -564,6 +566,9 @@
+@@ -556,6 +558,9 @@
  #if defined(GOOGLE_CHROME_BUILD)
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/opt/chrome/native-messaging-hosts"));
@@ -33,7 +33,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/chromium/native-messaging-hosts"));
-@@ -576,7 +581,7 @@
+@@ -568,7 +573,7 @@
          return false;
        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
        break;
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h
index dc664418824a..ad0a91583cb2 100644
--- a/www/chromium/files/patch-chrome__common__chrome_paths.h
+++ b/www/chromium/files/patch-chrome__common__chrome_paths.h
@@ -1,6 +1,6 @@
---- ./chrome/common/chrome_paths.h.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/chrome_paths.h	2014-08-22 15:06:25.000000000 +0200
-@@ -115,7 +115,7 @@
+--- chrome/common/chrome_paths.h.orig	2014-10-02 17:18:54 UTC
++++ chrome/common/chrome_paths.h
+@@ -112,7 +112,7 @@
    DIR_SUPERVISED_USERS_DEFAULT_APPS,  // Directory where installer places .crx
                                        // files to be installed when managed user
                                        // session starts.
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc
index e4ea5685fb70..9bda80df8130 100644
--- a/www/chromium/files/patch-chrome__common__chrome_switches.cc
+++ b/www/chromium/files/patch-chrome__common__chrome_switches.cc
@@ -1,6 +1,6 @@
---- ./chrome/common/chrome_switches.cc.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/chrome_switches.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -1319,7 +1319,7 @@
+--- chrome/common/chrome_switches.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/common/chrome_switches.cc
+@@ -1277,13 +1277,13 @@
  const char kPasswordStore[]                 = "password-store";
  #endif
  
@@ -9,10 +9,8 @@
  // Triggers migration of user data directory to another directory
  // specified as a parameter. The migration is done under singleton lock,
  // and sanity checks are made to avoid corrupting the profile.
-@@ -1330,7 +1330,7 @@
- // Linux speech service. Because it's buggy, the user must explicitly
- // enable it so that visiting a random webpage can't cause instability.
- const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher";
+ // The browser exits after migration is complete.
+ const char kMigrateDataDirForSxS[]          = "migrate-data-dir-for-sxs";
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h
index 2c155ea0da03..e68096d1da1a 100644
--- a/www/chromium/files/patch-chrome__common__chrome_switches.h
+++ b/www/chromium/files/patch-chrome__common__chrome_switches.h
@@ -1,11 +1,11 @@
---- ./chrome/common/chrome_switches.h.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/chrome_switches.h	2014-08-22 15:06:25.000000000 +0200
-@@ -378,7 +378,7 @@
+--- chrome/common/chrome_switches.h.orig	2014-10-02 17:39:46 UTC
++++ chrome/common/chrome_switches.h
+@@ -362,7 +362,7 @@
  extern const char kPasswordStore[];
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- extern const char kEnableSpeechDispatcher[];
  extern const char kMigrateDataDirForSxS[];
  #endif
+ 
diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc
index 43300cd093aa..6d6b8b9223f9 100644
--- a/www/chromium/files/patch-chrome__common__pref_names.cc
+++ b/www/chromium/files/patch-chrome__common__pref_names.cc
@@ -1,6 +1,6 @@
---- ./chrome/common/pref_names.cc.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/pref_names.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -957,7 +957,7 @@
+--- chrome/common/pref_names.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/common/pref_names.cc
+@@ -898,7 +898,7 @@
  // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
  const char kForceSafeSearch[] = "settings.force_safesearch";
  
diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h
index c65965ca6db2..51d6c485dc82 100644
--- a/www/chromium/files/patch-chrome__common__pref_names.h
+++ b/www/chromium/files/patch-chrome__common__pref_names.h
@@ -1,6 +1,6 @@
---- ./chrome/common/pref_names.h.orig	2014-08-20 21:01:56.000000000 +0200
-+++ ./chrome/common/pref_names.h	2014-08-22 15:06:25.000000000 +0200
-@@ -304,7 +304,7 @@
+--- chrome/common/pref_names.h.orig	2014-10-02 17:39:46 UTC
++++ chrome/common/pref_names.h
+@@ -291,7 +291,7 @@
  extern const char kForceSafeSearch[];
  extern const char kDeleteTimePeriod[];
  extern const char kLastClearBrowsingDataTime[];
diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
index d3a711242be8..f7c535818519 100644
--- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
+++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
@@ -1,5 +1,5 @@
---- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2014-08-20 21:02:14.000000000 +0200
-+++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2014-10-02 17:18:55 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
 @@ -13,7 +13,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
  #include "ppapi/proxy/serialized_structs.h"
@@ -9,32 +9,32 @@
  #include "content/public/common/child_process_sandbox_support_linux.h"
  #endif
  
-@@ -26,14 +26,14 @@
+@@ -25,14 +25,14 @@
+     PP_PrivateFontCharset charset)
      : ResourceHost(host->GetPpapiHost(), instance, resource),
-       renderer_ppapi_host_(host),
-       fd_(-1) {
+       renderer_ppapi_host_(host) {
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-   fd_ = content::MatchFontWithFallback(
+   fd_.reset(content::MatchFontWithFallback(
        description.face.c_str(),
        description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
        description.italic,
        charset,
-       PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT);
+       PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT));
 -#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  }
  
  PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
      uint32_t table) {
    std::string contents;
    int32_t result = PP_ERROR_FAILED;
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-   if (fd_ != -1) {
+   int fd = fd_.get();
+   if (fd != -1) {
      size_t length = 0;
-     if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) {
 @@ -68,7 +68,7 @@
        }
      }
diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
new file mode 100644
index 000000000000..24713b52e929
--- /dev/null
+++ b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
@@ -0,0 +1,20 @@
+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2014-10-02 17:18:55 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.h
+@@ -10,7 +10,7 @@
+ #include "ppapi/c/private/pp_private_font_charset.h"
+ #include "ppapi/host/resource_host.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/files/scoped_file.h"
+ #endif
+ 
+@@ -45,7 +45,7 @@
+   // Non-owning pointer.
+   content::RendererPpapiHost* renderer_ppapi_host_;
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::ScopedFD fd_;
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
index 4cdfe5afb830..51b2ed3e6b6d 100644
--- a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
+++ b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
@@ -1,6 +1,6 @@
---- ./chrome/renderer/printing/print_web_view_helper.h.orig	2014-08-20 21:02:13.000000000 +0200
-+++ ./chrome/renderer/printing/print_web_view_helper.h	2014-08-22 15:06:25.000000000 +0200
-@@ -201,7 +201,7 @@
+--- chrome/renderer/printing/print_web_view_helper.h.orig	2014-10-02 17:39:46 UTC
++++ chrome/renderer/printing/print_web_view_helper.h
+@@ -207,7 +207,7 @@
    void FinishFramePrinting();
  
    // Prints the page listed in |params|.
diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
index 1984b0e07445..4da37543501f 100644
--- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
+++ b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
@@ -1,6 +1,6 @@
---- ./chrome/test/base/in_process_browser_test.cc.orig	2014-08-20 21:01:48.000000000 +0200
-+++ ./chrome/test/base/in_process_browser_test.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -72,6 +72,10 @@
+--- chrome/test/base/in_process_browser_test.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/test/base/in_process_browser_test.cc
+@@ -76,6 +76,10 @@
  
  namespace {
  
diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
index 93a06024307b..20cddfa9da39 100644
--- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
+++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
@@ -1,5 +1,5 @@
---- ./chrome/test/base/testing_browser_process.h.orig	2014-08-20 21:01:48.000000000 +0200
-+++ ./chrome/test/base/testing_browser_process.h	2014-08-22 15:06:25.000000000 +0200
+--- chrome/test/base/testing_browser_process.h.orig	2014-10-02 17:39:46 UTC
++++ chrome/test/base/testing_browser_process.h
 @@ -105,8 +105,8 @@
    virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
    virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
diff --git a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
index 934932905836..01d7eba12a1e 100644
--- a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
+++ b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
@@ -1,5 +1,5 @@
---- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2014-08-20 21:01:27.000000000 +0200
-+++ ./chrome/test/chromedriver/chrome/chrome_finder.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2014-10-02 17:39:46 UTC
++++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -42,7 +42,7 @@
          installation_locations[i].Append(L"Chromium\\Application"));
    }
diff --git a/www/chromium/files/patch-chrome__test__perf__perf_test.cc b/www/chromium/files/patch-chrome__test__perf__perf_test.cc
index 09520940a6f8..f8a229564a07 100644
--- a/www/chromium/files/patch-chrome__test__perf__perf_test.cc
+++ b/www/chromium/files/patch-chrome__test__perf__perf_test.cc
@@ -1,5 +1,5 @@
---- ./chrome/test/perf/perf_test.cc.orig	2014-08-20 21:01:27.000000000 +0200
-+++ ./chrome/test/perf/perf_test.cc	2014-08-22 15:06:25.000000000 +0200
+--- chrome/test/perf/perf_test.cc.orig	2014-10-02 17:18:56 UTC
++++ chrome/test/perf/perf_test.cc
 @@ -352,7 +352,7 @@
    AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
                 total_working_set_size, "bytes",
diff --git a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
index ae71b11fb555..b858f4518dea 100644
--- a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
+++ b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
@@ -1,5 +1,5 @@
---- ./chrome/tools/build/linux/sed.sh.orig	2014-08-20 21:01:27.000000000 +0200
-+++ ./chrome/tools/build/linux/sed.sh	2014-08-22 15:06:25.000000000 +0200
+--- chrome/tools/build/linux/sed.sh.orig	2014-10-02 17:18:56 UTC
++++ chrome/tools/build/linux/sed.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/usr/bin/env bash
diff --git a/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc
new file mode 100644
index 000000000000..561b83baf22c
--- /dev/null
+++ b/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc
@@ -0,0 +1,11 @@
+--- components/omaha_query_params/omaha_query_params.cc.orig	2014-10-02 17:18:56 UTC
++++ components/omaha_query_params/omaha_query_params.cc
+@@ -31,6 +31,8 @@
+     "linux";
+ #elif defined(OS_OPENBSD)
+     "openbsd";
++#elif defined(OS_FREEBSD)
++    "freebsd";
+ #else
+ #error "unknown os"
+ #endif
diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json
index aeece673918b..994827b5ed2f 100644
--- a/www/chromium/files/patch-components__policy__resources__policy_templates.json
+++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json
@@ -1,6 +1,6 @@
---- ./components/policy/resources/policy_templates.json.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/policy/resources/policy_templates.json	2014-08-22 15:06:25.000000000 +0200
-@@ -1513,7 +1513,7 @@
+--- components/policy/resources/policy_templates.json.orig	2014-10-02 17:39:46 UTC
++++ components/policy/resources/policy_templates.json
+@@ -1556,7 +1556,7 @@
            'name': 'GSSAPILibraryName',
            'type': 'string',
            'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
            'features': {
              'dynamic_refresh': False,
              'per_profile': False,
-@@ -3697,7 +3697,7 @@
+@@ -3741,7 +3741,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -4377,7 +4377,7 @@
+@@ -4420,7 +4420,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
index 7b79cca14567..64c05a8d4125 100644
--- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
+++ b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
@@ -1,6 +1,6 @@
---- ./components/policy/tools/generate_policy_source.py.orig	2014-08-20 21:02:53.000000000 +0200
-+++ ./components/policy/tools/generate_policy_source.py	2014-08-22 15:06:25.000000000 +0200
-@@ -66,7 +66,7 @@
+--- components/policy/tools/generate_policy_source.py.orig	2014-10-02 17:39:46 UTC
++++ components/policy/tools/generate_policy_source.py
+@@ -67,7 +67,7 @@
        if platform.startswith('chrome.'):
          platform_sub = platform[7:]
          if platform_sub == '*':
diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi
index 7f114a8f1439..ac1a8a172c82 100644
--- a/www/chromium/files/patch-components__storage_monitor.gypi
+++ b/www/chromium/files/patch-components__storage_monitor.gypi
@@ -1,6 +1,6 @@
---- ./components/storage_monitor.gypi.orig	2014-08-20 21:02:56.000000000 +0200
-+++ ./components/storage_monitor.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -49,6 +49,24 @@
+--- components/storage_monitor.gypi.orig	2014-10-02 17:18:56 UTC
++++ components/storage_monitor.gypi
+@@ -50,6 +50,26 @@
          'storage_monitor/volume_mount_watcher_win.h',
        ],
        'conditions': [
@@ -8,6 +8,8 @@
 +          'sources!': [
 +            'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
 +            'storage_monitor/media_transfer_protocol_device_observer_linux.h',
++            'storage_monitor/test_media_transfer_protocol_manager_linux.cc',
++            'storage_monitor/test_media_transfer_protocol_manager_linux.h',
 +            'storage_monitor/mtab_watcher_linux.cc',
 +            'storage_monitor/mtab_watcher_linux.h',
 +            'storage_monitor/storage_monitor_linux.cc',
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
index 1565b09496d4..44c2df7d9a0d 100644
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
+++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
@@ -1,5 +1,5 @@
---- ./components/storage_monitor/storage_monitor.cc.orig	2014-08-20 21:02:53.000000000 +0200
-+++ ./components/storage_monitor/storage_monitor.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/storage_monitor/storage_monitor.cc.orig	2014-10-02 17:18:56 UTC
++++ components/storage_monitor/storage_monitor.cc
 @@ -85,6 +85,7 @@
  
  void StorageMonitor::EnsureInitialized(base::Closure callback) {
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
index 20d037712d4a..b8dd670771cd 100644
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
+++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
@@ -1,5 +1,5 @@
---- ./components/storage_monitor/storage_monitor_freebsd.cc.orig	2014-08-22 15:06:25.000000000 +0200
-+++ ./components/storage_monitor/storage_monitor_freebsd.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig	2014-10-02 21:05:41 UTC
++++ components/storage_monitor/storage_monitor_freebsd.cc
 @@ -0,0 +1,102 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
index 0bc47aa3d87a..0aa340da58ff 100644
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
+++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
@@ -1,5 +1,5 @@
---- ./components/storage_monitor/storage_monitor_freebsd.h.orig	2014-08-22 15:06:25.000000000 +0200
-+++ ./components/storage_monitor/storage_monitor_freebsd.h	2014-08-22 15:06:25.000000000 +0200
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2014-10-02 21:05:41 UTC
++++ components/storage_monitor/storage_monitor_freebsd.h
 @@ -0,0 +1,47 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-components__usb_service.gypi b/www/chromium/files/patch-components__usb_service.gypi
index 00a9749a395a..f6a3e865f7fd 100644
--- a/www/chromium/files/patch-components__usb_service.gypi
+++ b/www/chromium/files/patch-components__usb_service.gypi
@@ -1,14 +1,14 @@
---- ./components/usb_service.gypi.orig	2014-08-20 21:02:56.000000000 +0200
-+++ ./components/usb_service.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -41,6 +41,11 @@
-         'dependencies': [
+--- components/usb_service.gypi.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service.gypi
+@@ -46,6 +46,11 @@
            '../build/linux/system.gyp:udev',
          ],
-+      }],
+       }],
 +      ['OS == "freebsd"', {
 +        'dependencies!': [
 +          '../third_party/libusb/libusb.gyp:libusb',
 +        ],
-       }]
-     ]
-   }],
++      }], 
+       ['chromeos==1', {
+         'dependencies': [
+           '../chromeos/chromeos.gyp:chromeos',
diff --git a/www/chromium/files/patch-components__usb_service__usb_context.cc b/www/chromium/files/patch-components__usb_service__usb_context.cc
index 2c31e3ddf03c..90880d0de839 100644
--- a/www/chromium/files/patch-components__usb_service__usb_context.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_context.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_context.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_context.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_context.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_context.cc
 @@ -8,8 +8,13 @@
  #include "base/synchronization/waitable_event.h"
  #include "base/threading/platform_thread.h"
diff --git a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
index f3efa5206c1a..397c5feb4eb7 100644
--- a/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_context_unittest.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_context_unittest.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_context_unittest.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_context_unittest.cc
 @@ -6,7 +6,11 @@
  #include "build/build_config.h"
  #include "components/usb_service/usb_context.h"
diff --git a/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc b/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc
index c80cf4c1ae3f..9627ab53a3c8 100644
--- a/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_device_handle_impl.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_device_handle_impl.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_device_handle_impl.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_device_handle_impl.cc
 @@ -17,8 +17,25 @@
  #include "components/usb_service/usb_interface.h"
  #include "components/usb_service/usb_service.h"
diff --git a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc
index 4c3f2e6ac883..126355ef8858 100644
--- a/www/chromium/files/patch-components__usb_service__usb_device_impl.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_device_impl.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_device_impl.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_device_impl.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_device_impl.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_device_impl.cc
 @@ -12,7 +12,11 @@
  #include "components/usb_service/usb_error.h"
  #include "components/usb_service/usb_interface_impl.h"
diff --git a/www/chromium/files/patch-components__usb_service__usb_error.cc b/www/chromium/files/patch-components__usb_service__usb_error.cc
index 28670f0d4cf0..945d581a4eba 100644
--- a/www/chromium/files/patch-components__usb_service__usb_error.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_error.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_error.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_error.cc	2014-08-23 00:55:43.000000000 +0200
+--- components/usb_service/usb_error.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_error.cc
 @@ -4,7 +4,11 @@
  
  #include "components/usb_service/usb_error.h"
diff --git a/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc b/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc
index cec15dd2fe84..338755b16921 100644
--- a/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_interface_impl.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_interface_impl.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_interface_impl.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_interface_impl.cc
 @@ -5,7 +5,11 @@
  #include "components/usb_service/usb_interface_impl.h"
  
diff --git a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc
index 1332e5f68045..308b46d43934 100644
--- a/www/chromium/files/patch-components__usb_service__usb_service_impl.cc
+++ b/www/chromium/files/patch-components__usb_service__usb_service_impl.cc
@@ -1,5 +1,5 @@
---- ./components/usb_service/usb_service_impl.cc.orig	2014-08-20 21:02:55.000000000 +0200
-+++ ./components/usb_service/usb_service_impl.cc	2014-08-22 15:06:25.000000000 +0200
+--- components/usb_service/usb_service_impl.cc.orig	2014-10-02 17:39:47 UTC
++++ components/usb_service/usb_service_impl.cc
 @@ -14,7 +14,11 @@
  #include "components/usb_service/usb_device_impl.h"
  #include "components/usb_service/usb_error.h"
diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc
index 8cd5755c6e85..45767cd79292 100644
--- a/www/chromium/files/patch-content__app__content_main_runner.cc
+++ b/www/chromium/files/patch-content__app__content_main_runner.cc
@@ -1,5 +1,5 @@
---- ./content/app/content_main_runner.cc.orig	2014-08-20 21:02:47.000000000 +0200
-+++ ./content/app/content_main_runner.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/app/content_main_runner.cc.orig	2014-10-02 17:39:47 UTC
++++ content/app/content_main_runner.cc
 @@ -95,10 +95,10 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
@@ -13,7 +13,7 @@
  #include "content/zygote/zygote_main.h"
  #endif
  
-@@ -287,7 +287,8 @@
+@@ -286,7 +286,8 @@
    int (*function)(const MainFunctionParams&);
  };
  
@@ -23,7 +23,7 @@
  // On platforms that use the zygote, we have a special subset of
  // subprocesses that are launched via the zygote.  This function
  // fills in some process-launching bits around ZygoteMain().
-@@ -417,7 +418,8 @@
+@@ -416,7 +417,8 @@
      }
    }
  
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc
index 05f0df49a9d6..28d7c7f4dad7 100644
--- a/www/chromium/files/patch-content__browser__browser_main_loop.cc
+++ b/www/chromium/files/patch-content__browser__browser_main_loop.cc
@@ -1,15 +1,15 @@
---- ./content/browser/browser_main_loop.cc.orig	2014-08-20 21:02:49.000000000 +0200
-+++ ./content/browser/browser_main_loop.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -133,7 +133,7 @@
+--- content/browser/browser_main_loop.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/browser_main_loop.cc
+@@ -134,7 +134,7 @@
  namespace content {
  namespace {
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void SetupSandbox(const CommandLine& parsed_command_line) {
+ void SetupSandbox(const base::CommandLine& parsed_command_line) {
    TRACE_EVENT0("startup", "SetupSandbox");
    base::FilePath sandbox_binary;
-@@ -334,7 +334,7 @@
+@@ -376,7 +376,7 @@
  void BrowserMainLoop::EarlyInitialization() {
    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
  
@@ -18,7 +18,7 @@
    // No thread should be created before this call, as SetupSandbox()
    // will end-up using fork().
    SetupSandbox(parsed_command_line_);
-@@ -764,9 +764,9 @@
+@@ -809,9 +809,9 @@
    }
  #endif
  
diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc
index 7ef6ef9b6499..ba777d813dc1 100644
--- a/www/chromium/files/patch-content__browser__child_process_launcher.cc
+++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc
@@ -1,5 +1,5 @@
---- ./content/browser/child_process_launcher.cc.orig	2014-08-20 21:02:49.000000000 +0200
-+++ ./content/browser/child_process_launcher.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/browser/child_process_launcher.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/child_process_launcher.cc
 @@ -68,7 +68,7 @@
  #else
          terminate_child_on_shutdown_(true)
diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc
index 6afbe29f93ec..88fa15f2ab1b 100644
--- a/www/chromium/files/patch-content__browser__download__base_file.cc
+++ b/www/chromium/files/patch-content__browser__download__base_file.cc
@@ -1,5 +1,5 @@
---- ./content/browser/download/base_file.cc.orig	2014-08-20 21:02:49.000000000 +0200
-+++ ./content/browser/download/base_file.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/browser/download/base_file.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/download/base_file.cc
 @@ -205,7 +205,8 @@
  }
  
diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc
index 88c47756d528..5254f3828aed 100644
--- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc
+++ b/www/chromium/files/patch-content__browser__download__base_file_linux.cc
@@ -1,5 +1,5 @@
---- ./content/browser/download/base_file_linux.cc.orig	2014-08-20 21:02:49.000000000 +0200
-+++ ./content/browser/download/base_file_linux.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/browser/download/base_file_linux.cc.orig	2014-10-02 17:18:57 UTC
++++ content/browser/download/base_file_linux.cc
 @@ -13,7 +13,9 @@
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
    DCHECK(!detached_);
diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
index bbfd69b929eb..079510d7c53f 100644
--- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
+++ b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
@@ -1,6 +1,6 @@
---- ./content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-08-20 21:02:48.000000000 +0200
-+++ ./content/browser/geolocation/location_arbitrator_impl.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -160,7 +160,7 @@
+--- content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-10-02 17:18:57 UTC
++++ content/browser/geolocation/location_arbitrator_impl.cc
+@@ -159,7 +159,7 @@
  }
  
  LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
index b6c97f8c9ca3..76193c247cf2 100644
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
+++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
@@ -1,5 +1,5 @@
---- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2014-08-22 15:06:25.000000000 +0200
-+++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2014-10-02 21:05:41 UTC
++++ content/browser/geolocation/wifi_data_provider_freebsd.cc
 @@ -0,0 +1,200 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
index eccea9507f4d..391b6301204b 100644
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
+++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
@@ -1,5 +1,5 @@
---- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2014-08-22 15:06:25.000000000 +0200
-+++ ./content/browser/geolocation/wifi_data_provider_freebsd.h	2014-08-22 15:06:25.000000000 +0200
+--- content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2014-10-02 21:05:41 UTC
++++ content/browser/geolocation/wifi_data_provider_freebsd.h
 @@ -0,0 +1,31 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc b/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
new file mode 100644
index 000000000000..b08a8e6dd3c9
--- /dev/null
+++ b/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
@@ -0,0 +1,38 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/gpu/gpu_data_manager_impl_private.cc
+@@ -454,7 +454,9 @@
+   gpu_info.gl_renderer = gl_renderer;
+   gpu_info.gl_version = gl_version;
+ 
++#if !defined(OS_FREEBSD) //XXX(rene) hack
+   gpu::CollectDriverInfoGL(&gpu_info);
++#endif
+ 
+   UpdateGpuInfo(gpu_info);
+   UpdateGpuSwitchingManager(gpu_info);
+@@ -497,10 +499,13 @@
+     // Also declare the driver_vendor to be osmesa to be able to specify
+     // exceptions based on driver_vendor==osmesa for some blacklist rules.
+     gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
++#ifndef __FreeBSD__
+   } else {
++    //XXX(rene) hack
+     TRACE_EVENT0("startup",
+       "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
+     gpu::CollectBasicGraphicsInfo(&gpu_info);
++#endif
+   }
+ #if defined(ARCH_CPU_X86_FAMILY)
+   if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id)
+@@ -547,8 +552,10 @@
+   // No further update of gpu_info if falling back to SwiftShader.
+   if (use_swiftshader_)
+     return;
+-
++#ifndef __FreeBSD__
++  // XXX(rene) hack
+   gpu::MergeGPUInfo(&gpu_info_, gpu_info);
++#endif
+   complete_gpu_info_already_requested_ =
+       complete_gpu_info_already_requested_ || gpu_info_.finalized;
+ 
diff --git a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
index 87e6c61ddaeb..d98eefd41bac 100644
--- a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
+++ b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
@@ -1,6 +1,6 @@
---- ./content/browser/indexed_db/indexed_db_backing_store.cc.orig	2014-08-20 21:02:48.000000000 +0200
-+++ ./content/browser/indexed_db/indexed_db_backing_store.cc	2014-08-24 10:58:24.000000000 +0200
-@@ -2329,7 +2329,7 @@
+--- content/browser/indexed_db/indexed_db_backing_store.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/indexed_db/indexed_db_backing_store.cc
+@@ -2375,7 +2375,7 @@
          // The round-trip can be lossy; round to nearest millisecond.
          int64 delta = (descriptor.last_modified() -
              info.last_modified).InMilliseconds();
diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
index 10f5178c4911..071d10a809ee 100644
--- a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
+++ b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
@@ -1,6 +1,6 @@
---- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2014-08-20 21:02:48.000000000 +0200
-+++ ./content/browser/renderer_host/render_widget_host_view_aura.cc	2014-08-22 15:06:25.000000000 +0200
-@@ -631,7 +631,7 @@
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/renderer_host/render_widget_host_view_aura.cc
+@@ -653,7 +653,7 @@
    if (host)
      return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
  #endif
diff --git a/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc b/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc
new file mode 100644
index 000000000000..6217b780ed50
--- /dev/null
+++ b/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc
@@ -0,0 +1,11 @@
+--- content/browser/tracing/tracing_ui.cc.orig	2014-10-02 17:39:47 UTC
++++ content/browser/tracing/tracing_ui.cc
+@@ -358,6 +358,8 @@
+   const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+   const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_BSD)
++  const char product[] = "Chrome_BSD";
+ #else
+ #error Platform not supported.
+ #endif
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc
index da98b7fb7d28..1bdea03206e8 100644
--- a/www/chromium/files/patch-content__common__set_process_title_linux.cc
+++ b/www/chromium/files/patch-content__common__set_process_title_linux.cc
@@ -1,5 +1,5 @@
---- ./content/common/set_process_title_linux.cc.orig	2014-08-20 21:02:50.000000000 +0200
-+++ ./content/common/set_process_title_linux.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/common/set_process_title_linux.cc.orig	2014-10-02 17:18:57 UTC
++++ content/common/set_process_title_linux.cc
 @@ -48,6 +48,8 @@
  extern char** environ;
  
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h
index a30137726c42..520f31e666f2 100644
--- a/www/chromium/files/patch-content__common__set_process_title_linux.h
+++ b/www/chromium/files/patch-content__common__set_process_title_linux.h
@@ -1,5 +1,5 @@
---- ./content/common/set_process_title_linux.h.orig	2014-08-20 21:02:50.000000000 +0200
-+++ ./content/common/set_process_title_linux.h	2014-08-22 15:06:25.000000000 +0200
+--- content/common/set_process_title_linux.h.orig	2014-10-02 17:18:57 UTC
++++ content/common/set_process_title_linux.h
 @@ -5,6 +5,9 @@
  #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
  #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi
index 544cffcb44db..10afa9e794b8 100644
--- a/www/chromium/files/patch-content__content_browser.gypi
+++ b/www/chromium/files/patch-content__content_browser.gypi
@@ -1,6 +1,6 @@
---- ./content/content_browser.gypi.orig	2014-08-20 21:02:50.000000000 +0200
-+++ ./content/content_browser.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -615,6 +615,8 @@
+--- content/content_browser.gypi.orig	2014-10-02 17:39:47 UTC
++++ content/content_browser.gypi
+@@ -679,6 +679,8 @@
        'browser/geolocation/wifi_data_provider_common_win.cc',
        'browser/geolocation/wifi_data_provider_common_win.h',
        'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
@@ -9,7 +9,7 @@
        'browser/geolocation/wifi_data_provider_linux.cc',
        'browser/geolocation/wifi_data_provider_linux.h',
        'browser/geolocation/wifi_data_provider_mac.cc',
-@@ -1709,8 +1711,18 @@
+@@ -1806,8 +1808,18 @@
        ],
      }],
      ['os_bsd==1', {
@@ -30,12 +30,12 @@
        ],
      }],
      ['use_aura==1', {
-@@ -1758,7 +1770,7 @@
+@@ -1855,7 +1867,7 @@
          'browser/geolocation/empty_wifi_data_provider.cc',
        ],
      }],
 -    ['OS == "linux" and use_dbus==1', {
 +    ['(OS == "linux" or os_bsd==1) and use_dbus==1', {
        'sources!': [
+         'browser/battery_status/battery_status_manager_default.cc',
          'browser/geolocation/empty_wifi_data_provider.cc',
-       ],
diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi
index a42ac93e2075..56ff958cb22f 100644
--- a/www/chromium/files/patch-content__content_common.gypi
+++ b/www/chromium/files/patch-content__content_common.gypi
@@ -1,6 +1,6 @@
---- ./content/content_common.gypi.orig	2014-08-20 21:02:50.000000000 +0200
-+++ ./content/content_common.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -598,6 +598,21 @@
+--- content/content_common.gypi.orig	2014-10-02 17:39:47 UTC
++++ content/content_common.gypi
+@@ -668,6 +668,21 @@
          'content.gyp:common_aidl',
        ],
      }],
diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi
index 083983701a5f..5c50ebd7f5f1 100644
--- a/www/chromium/files/patch-content__content_tests.gypi
+++ b/www/chromium/files/patch-content__content_tests.gypi
@@ -1,6 +1,6 @@
---- ./content/content_tests.gypi.orig	2014-08-20 21:02:50.000000000 +0200
-+++ ./content/content_tests.gypi	2014-08-22 15:06:25.000000000 +0200
-@@ -889,6 +889,15 @@
+--- content/content_tests.gypi.orig	2014-10-02 17:39:47 UTC
++++ content/content_tests.gypi
+@@ -916,6 +916,15 @@
              'browser/geolocation/wifi_data_provider_linux_unittest.cc',
            ],
          }],
diff --git a/www/chromium/files/patch-content__gpu__gpu_child_thread.cc b/www/chromium/files/patch-content__gpu__gpu_child_thread.cc
new file mode 100644
index 000000000000..8b5f838aca93
--- /dev/null
+++ b/www/chromium/files/patch-content__gpu__gpu_child_thread.cc
@@ -0,0 +1,18 @@
+--- content/gpu/gpu_child_thread.cc.orig	2014-10-02 17:39:47 UTC
++++ content/gpu/gpu_child_thread.cc
+@@ -179,6 +179,7 @@
+ }
+ 
+ void GpuChildThread::OnCollectGraphicsInfo() {
++#if !defined(OS_FREEBSD)
+ #if defined(OS_WIN)
+   // GPU full info collection should only happen on un-sandboxed GPU process
+   // or single process/in-process gpu mode on Windows.
+@@ -218,6 +219,7 @@
+     base::MessageLoop::current()->Quit();
+   }
+ #endif  // OS_WIN
++#endif  // XXX(rene) !FreeBSD
+ }
+ 
+ void GpuChildThread::OnGetVideoMemoryUsageStats() {
diff --git a/www/chromium/files/patch-content__gpu__gpu_main.cc b/www/chromium/files/patch-content__gpu__gpu_main.cc
new file mode 100644
index 000000000000..370a339bb9b4
--- /dev/null
+++ b/www/chromium/files/patch-content__gpu__gpu_main.cc
@@ -0,0 +1,29 @@
+--- content/gpu/gpu_main.cc.orig	2014-10-02 17:39:47 UTC
++++ content/gpu/gpu_main.cc
+@@ -71,7 +71,7 @@
+                                const CommandLine& command_line);
+ bool WarmUpSandbox(const CommandLine& command_line);
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
+ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
+ #endif
+ 
+@@ -265,7 +265,7 @@
+       // and we already registered them through SetGpuInfo() above.
+       base::TimeTicks before_collect_context_graphics_info =
+           base::TimeTicks::Now();
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
+       if (!CollectGraphicsInfo(gpu_info))
+         dead_on_arrival = true;
+ 
+@@ -393,7 +393,7 @@
+   return true;
+ }
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD
+ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
+   bool res = true;
+   gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
diff --git a/www/chromium/files/patch-content__public__common__content_switches.cc b/www/chromium/files/patch-content__public__common__content_switches.cc
new file mode 100644
index 000000000000..9e87ae0a4faa
--- /dev/null
+++ b/www/chromium/files/patch-content__public__common__content_switches.cc
@@ -0,0 +1,11 @@
+--- content/public/common/content_switches.cc.orig	2014-10-02 17:39:47 UTC
++++ content/public/common/content_switches.cc
+@@ -920,7 +920,7 @@
+     "disable-vaapi-accelerated-video-encode";
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ // Allows sending text-to-speech requests to speech-dispatcher, a common
+ // Linux speech service. Because it's buggy, the user must explicitly
+ // enable it so that visiting a random webpage can't cause instability.
diff --git a/www/chromium/files/patch-content__public__common__content_switches.h b/www/chromium/files/patch-content__public__common__content_switches.h
new file mode 100644
index 000000000000..3c950aa1a4e7
--- /dev/null
+++ b/www/chromium/files/patch-content__public__common__content_switches.h
@@ -0,0 +1,11 @@
+--- content/public/common/content_switches.h.orig	2014-10-02 17:39:47 UTC
++++ content/public/common/content_switches.h
+@@ -266,7 +266,7 @@
+ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc
index 99940ecb2f54..eb810d53542b 100644
--- a/www/chromium/files/patch-content__public__test__browser_test_base.cc
+++ b/www/chromium/files/patch-content__public__test__browser_test_base.cc
@@ -1,5 +1,5 @@
---- ./content/public/test/browser_test_base.cc.orig	2014-08-20 21:02:44.000000000 +0200
-+++ ./content/public/test/browser_test_base.cc	2014-08-22 15:06:25.000000000 +0200
+--- content/public/test/browser_test_base.cc.orig	2014-10-02 17:39:47 UTC
++++ content/public/test/browser_test_base.cc
 @@ -4,6 +4,10 @@
  
  #include "content/public/test/browser_test_base.h"
diff --git a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
index a8c4e5452c02..dc00b2382881 100644
--- a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
+++ b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
@@ -1,6 +1,6 @@
---- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/accessibility/blink_ax_tree_source.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -441,13 +441,15 @@
+--- content/renderer/accessibility/blink_ax_tree_source.cc.orig	2014-10-02 17:39:47 UTC
++++ content/renderer/accessibility/blink_ax_tree_source.cc
+@@ -443,13 +443,15 @@
      dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width());
      dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height());
  
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
index 3dc38f8e8291..b27f3aab288c 100644
--- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
+++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
@@ -1,17 +1,6 @@
---- ./content/renderer/media/webrtc_audio_capturer.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/media/webrtc_audio_capturer.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -31,9 +31,7 @@
- // will fail if the user selects any rate outside these ranges.
- const int kValidInputRates[] =
-     {192000, 96000, 48000, 44100, 32000, 16000, 8000};
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
--const int kValidInputRates[] = {48000, 44100};
--#elif defined(OS_ANDROID)
-+#elif defined(OS_POSIX)
- const int kValidInputRates[] = {48000, 44100};
- #else
- const int kValidInputRates[] = {44100};
-@@ -457,8 +455,8 @@
+--- content/renderer/media/webrtc_audio_capturer.cc.orig	2014-10-02 17:39:47 UTC
++++ content/renderer/media/webrtc_audio_capturer.cc
+@@ -430,8 +430,8 @@
  // CaptureCallback.
  #if defined(OS_WIN) || defined(OS_MACOSX)
    DCHECK_LE(volume, 1.0);
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
deleted file mode 100644
index 731179e921a4..000000000000
--- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./content/renderer/media/webrtc_audio_renderer.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/media/webrtc_audio_renderer.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -34,7 +34,7 @@
- // rates below adds restrictions and Initialize() will fail if the user selects
- // any rate outside these ranges.
- const int kValidOutputRates[] = {96000, 48000, 44100, 32000, 16000};
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- const int kValidOutputRates[] = {48000, 44100};
- #elif defined(OS_ANDROID)
- // TODO(leozwang): We want to use native sampling rate on Android to achieve
diff --git a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
index 70b7941e7450..c8e1d1dfa324 100644
--- a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
+++ b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
@@ -1,5 +1,5 @@
---- ./content/renderer/pepper/usb_key_code_conversion.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/pepper/usb_key_code_conversion.cc	2014-08-22 15:06:26.000000000 +0200
+--- content/renderer/pepper/usb_key_code_conversion.cc.orig	2014-10-02 17:18:57 UTC
++++ content/renderer/pepper/usb_key_code_conversion.cc
 @@ -10,7 +10,7 @@
  
  namespace content {
diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
index 77b812062a83..918f7732cf45 100644
--- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
@@ -1,5 +1,5 @@
---- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/renderer_main_platform_delegate_linux.cc	2014-08-22 15:06:26.000000000 +0200
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2014-10-02 17:39:47 UTC
++++ content/renderer/renderer_main_platform_delegate_linux.cc
 @@ -40,6 +40,7 @@
  }
  
diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
index b1cffbad9b89..d1dfdf74792d 100644
--- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
@@ -1,6 +1,6 @@
---- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig	2014-08-20 21:02:43.000000000 +0200
-+++ ./content/renderer/renderer_webkitplatformsupport_impl.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -92,7 +92,7 @@
+--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig	2014-10-02 17:39:47 UTC
++++ content/renderer/renderer_webkitplatformsupport_impl.cc
+@@ -93,7 +93,7 @@
  
  #if defined(OS_POSIX)
  #include "base/file_descriptor_posix.h"
@@ -9,7 +9,7 @@
  #include <map>
  #include <string>
  
-@@ -183,7 +183,7 @@
+@@ -187,7 +187,7 @@
    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
  };
  
@@ -18,7 +18,7 @@
  // WebKit doesn't use WebSandboxSupport on android so we don't need to
  // implement anything here.
  class RendererWebKitPlatformSupportImpl::SandboxSupport {
-@@ -277,7 +277,7 @@
+@@ -281,7 +281,7 @@
  }
  
  blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
@@ -27,7 +27,7 @@
    // WebKit doesn't use WebSandboxSupport on android.
    return NULL;
  #else
-@@ -595,7 +595,7 @@
+@@ -577,7 +577,7 @@
    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
  }
  
diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc
index e0f048451120..907162ee5fcd 100644
--- a/www/chromium/files/patch-crypto__nss_util.cc
+++ b/www/chromium/files/patch-crypto__nss_util.cc
@@ -1,5 +1,5 @@
---- ./crypto/nss_util.cc.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./crypto/nss_util.cc	2014-08-22 15:06:26.000000000 +0200
+--- crypto/nss_util.cc.orig	2014-10-02 17:39:47 UTC
++++ crypto/nss_util.cc
 @@ -13,7 +13,7 @@
  #include <prtime.h>
  #include <secmod.h>
@@ -9,7 +9,7 @@
  #include <sys/mount.h>
  #include <sys/param.h>
  #endif
-@@ -141,7 +141,7 @@
+@@ -143,7 +143,7 @@
  // detection when database_dir is on NFS.  See http://crbug.com/48585.
  //
  // TODO(wtc): port this function to other USE_NSS platforms.  It is defined
@@ -18,7 +18,7 @@
  // is OS-specific.
  //
  // Because this function sets an environment variable it must be run before we
-@@ -152,10 +152,10 @@
+@@ -154,10 +154,10 @@
    base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
    if (base::GetFileSystemType(database_dir, &fs_type))
      db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp
index e8cdd82f9410..745b7fd7accd 100644
--- a/www/chromium/files/patch-device__hid__hid.gyp
+++ b/www/chromium/files/patch-device__hid__hid.gyp
@@ -1,5 +1,5 @@
---- ./device/hid/hid.gyp.orig	2014-08-20 21:03:08.000000000 +0200
-+++ ./device/hid/hid.gyp	2014-08-22 15:06:26.000000000 +0200
+--- device/hid/hid.gyp.orig	2014-10-02 17:39:47 UTC
++++ device/hid/hid.gyp
 @@ -61,6 +61,18 @@
              'input_service_linux.h',
            ],
diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp
index 28e30e0b1f0e..4a3f58dfc1c5 100644
--- a/www/chromium/files/patch-device__serial__serial.gyp
+++ b/www/chromium/files/patch-device__serial__serial.gyp
@@ -1,6 +1,6 @@
---- ./device/serial/serial.gyp.orig	2014-08-20 21:03:08.000000000 +0200
-+++ ./device/serial/serial.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -20,6 +20,12 @@
+--- device/serial/serial.gyp.orig	2014-10-02 17:39:47 UTC
++++ device/serial/serial.gyp
+@@ -32,6 +32,12 @@
              '../../build/linux/system.gyp:udev',
            ],
          }],
@@ -11,5 +11,5 @@
 +          ],
 +        }],
        ],
-       'variables': {
-         'mojom_base_output_dir': 'device/serial',
+       'dependencies': [
+         'device_serial_mojo',
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
index eb175647068f..b21b3aa5543b 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
+++ b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
@@ -1,6 +1,6 @@
---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig	2014-08-20 21:01:58.000000000 +0200
-+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc	2014-08-22 15:06:24.000000000 +0200
-@@ -36,7 +36,7 @@
+--- device/serial/serial_io_handler_posix.cc.orig	2014-10-02 17:18:57 UTC
++++ device/serial/serial_io_handler_posix.cc
+@@ -39,7 +39,7 @@
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)
      BITRATE_TO_SPEED_CASE(38400)
@@ -9,7 +9,7 @@
      BITRATE_TO_SPEED_CASE(57600)
      BITRATE_TO_SPEED_CASE(115200)
      BITRATE_TO_SPEED_CASE(230400)
-@@ -71,7 +71,7 @@
+@@ -77,7 +77,7 @@
      SPEED_TO_BITRATE_CASE(9600)
      SPEED_TO_BITRATE_CASE(19200)
      SPEED_TO_BITRATE_CASE(38400)
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc b/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
index 546fd8014c11..c1ed98af7d94 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
+++ b/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig	2014-08-20 21:01:58.000000000 +0200
-+++ ./chrome/browser/extensions/api/serial/serial_api.cc	2014-08-22 15:06:24.000000000 +0200
+--- extensions/browser/api/serial/serial_api.cc.orig	2014-10-02 17:39:47 UTC
++++ extensions/browser/api/serial/serial_api.cc
 @@ -85,11 +85,13 @@
  void SerialGetDevicesFunction::Work() {
    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
@@ -7,10 +7,10 @@
 +#if !defined(OS_FREEBSD) //XXX(rene) quick hack
    scoped_ptr<device::SerialDeviceEnumerator> enumerator =
        device::SerialDeviceEnumerator::Create();
-   mojo::Array<device::SerialDeviceInfoPtr> devices = enumerator->GetDevices();
+   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
    results_ = serial::GetDevices::Results::Create(
        devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
 +#endif
  }
  
- SerialConnectFunction::SerialConnectFunction() {}
+ SerialConnectFunction::SerialConnectFunction() {
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc
index 76248d6db94d..1dafe3fa1fe7 100644
--- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_control_list.cc
@@ -1,6 +1,6 @@
---- ./gpu/config/gpu_control_list.cc.orig	2014-08-20 21:02:37.000000000 +0200
-+++ ./gpu/config/gpu_control_list.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -1539,10 +1539,10 @@
+--- gpu/config/gpu_control_list.cc.orig	2014-10-02 17:39:47 UTC
++++ gpu/config/gpu_control_list.cc
+@@ -1480,10 +1480,10 @@
    return kOsWin;
  #elif defined(OS_ANDROID)
    return kOsAndroid;
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
index 63548bf48b54..2b37c3147b9d 100644
--- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
@@ -1,5 +1,5 @@
---- ./gpu/config/gpu_control_list_unittest.cc.orig	2014-08-20 21:02:37.000000000 +0200
-+++ ./gpu/config/gpu_control_list_unittest.cc	2014-08-22 15:06:26.000000000 +0200
+--- gpu/config/gpu_control_list_unittest.cc.orig	2014-10-02 17:39:47 UTC
++++ gpu/config/gpu_control_list_unittest.cc
 @@ -177,8 +177,7 @@
    features = control_list->MakeDecision(
        GpuControlList::kOsLinux, kOsVersion, gpu_info());
diff --git a/www/chromium/files/patch-gpu__config__gpu_info_collector.cc b/www/chromium/files/patch-gpu__config__gpu_info_collector.cc
new file mode 100644
index 000000000000..39651cb96c07
--- /dev/null
+++ b/www/chromium/files/patch-gpu__config__gpu_info_collector.cc
@@ -0,0 +1,12 @@
+--- gpu/config/gpu_info_collector.cc.orig	2014-10-02 17:39:47 UTC
++++ gpu/config/gpu_info_collector.cc
+@@ -126,7 +126,9 @@
+   gpu_info->pixel_shader_version = glsl_version;
+   gpu_info->vertex_shader_version = glsl_version;
+ 
++#ifndef __FreeBSD__
+   return CollectDriverInfoGL(gpu_info);
++#endif
+ }
+ 
+ void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc
index 2f8ac611623b..bb5d0db1aecf 100644
--- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc
@@ -1,5 +1,5 @@
---- ./gpu/config/gpu_test_config.cc.orig	2014-08-20 21:02:37.000000000 +0200
-+++ ./gpu/config/gpu_test_config.cc	2014-08-22 15:06:26.000000000 +0200
+--- gpu/config/gpu_test_config.cc.orig	2014-10-02 17:39:47 UTC
++++ gpu/config/gpu_test_config.cc
 @@ -23,8 +23,6 @@
  GPUTestConfig::OS GetCurrentOS() {
  #if defined(OS_CHROMEOS)
@@ -18,3 +18,22 @@
  #endif
    return GPUTestConfig::kOsUnknown;
  }
+@@ -234,6 +234,10 @@
+   if (gpu_info == NULL) {
+     GPUInfo my_gpu_info;
+     GpuIDResult result;
++#if defined(OS_FREEBSD)
++    rt = false;
++    LOG(WARNING) << "CollectGpuID not present on FreeBSD";
++#else
+     result = CollectGpuID(&my_gpu_info.gpu.vendor_id,
+                           &my_gpu_info.gpu.device_id);
+     if (result == kGpuIDNotSupported) {
+@@ -243,6 +247,7 @@
+     } else {
+       rt = SetGPUInfo(my_gpu_info);
+     }
++#endif
+   } else {
+     rt = SetGPUInfo(*gpu_info);
+   }
diff --git a/www/chromium/files/patch-gpu__config__gpu_util.cc b/www/chromium/files/patch-gpu__config__gpu_util.cc
new file mode 100644
index 000000000000..9633ee261979
--- /dev/null
+++ b/www/chromium/files/patch-gpu__config__gpu_util.cc
@@ -0,0 +1,15 @@
+--- gpu/config/gpu_util.cc.orig	2014-10-02 17:18:58 UTC
++++ gpu/config/gpu_util.cc
+@@ -54,10 +54,12 @@
+ }
+ 
+ void ApplyGpuDriverBugWorkarounds(CommandLine* command_line) {
++#ifndef __FreeBSD__
+   GPUInfo gpu_info;
+   CollectBasicGraphicsInfo(&gpu_info);
+ 
+   ApplyGpuDriverBugWorkarounds(gpu_info, command_line);
++#endif
+ }
+ 
+ void ApplyGpuDriverBugWorkarounds(
diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi
index 68dcb3b79f26..a8fb231ac5d8 100644
--- a/www/chromium/files/patch-gpu__gpu_config.gypi
+++ b/www/chromium/files/patch-gpu__gpu_config.gypi
@@ -1,7 +1,7 @@
---- ./gpu/gpu_config.gypi.orig	2014-08-20 21:02:38.000000000 +0200
-+++ ./gpu/gpu_config.gypi	2014-08-22 15:06:26.000000000 +0200
-@@ -63,7 +63,7 @@
-         '../third_party/amd/amd_videocard_info_win.cc',
+--- gpu/gpu_config.gypi.orig	2014-10-02 17:18:58 UTC
++++ gpu/gpu_config.gypi
+@@ -70,12 +70,18 @@
+         '../build/linux/system.gyp:libpci',
        ],
      }],
 -    ['OS=="linux" and use_x11==1', {
@@ -9,3 +9,14 @@
        'dependencies': [
          '../build/linux/system.gyp:x11',
          '../build/linux/system.gyp:xext',
+         '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
+       ],
+     }],
++    ['os_bsd==1', {
++      'sources!': [
++        'config/gpu_info_collector_linux.cc',
++        'config/gpu_info_collector_linux.h',
++      ],
++    }],
+   ],
+ }
diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
index 4f144bbdb7ef..540d26e50994 100644
--- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
+++ b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
@@ -1,5 +1,5 @@
---- ./media/audio/audio_input_volume_unittest.cc.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./media/audio/audio_input_volume_unittest.cc	2014-08-22 15:06:26.000000000 +0200
+--- media/audio/audio_input_volume_unittest.cc.orig	2014-10-02 17:39:47 UTC
++++ media/audio/audio_input_volume_unittest.cc
 @@ -74,7 +74,7 @@
          params, device_id);
      EXPECT_TRUE(NULL != ais);
diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc
index 95ebda22f7be..53dc9c46e1fb 100644
--- a/www/chromium/files/patch-media__base__audio_splicer.cc
+++ b/www/chromium/files/patch-media__base__audio_splicer.cc
@@ -1,5 +1,5 @@
---- ./media/base/audio_splicer.cc.orig	2014-08-20 21:03:11.000000000 +0200
-+++ ./media/base/audio_splicer.cc	2014-08-22 15:06:26.000000000 +0200
+--- media/base/audio_splicer.cc.orig	2014-10-02 17:39:47 UTC
++++ media/base/audio_splicer.cc
 @@ -137,7 +137,7 @@
        output_timestamp_helper_.GetTimestamp();
    const base::TimeDelta delta = timestamp - expected_timestamp;
diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
index e3121851bd25..e2d135bcad67 100644
--- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
+++ b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
@@ -1,5 +1,5 @@
---- ./media/filters/decrypting_audio_decoder.cc.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./media/filters/decrypting_audio_decoder.cc	2014-08-22 15:06:26.000000000 +0200
+--- media/filters/decrypting_audio_decoder.cc.orig	2014-10-02 17:39:47 UTC
++++ media/filters/decrypting_audio_decoder.cc
 @@ -30,7 +30,7 @@
    // Out of sync of 100ms would be pretty noticeable and we should keep any
    // drift below that.
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
index 0c1a628b0fdd..836067211d8b 100644
--- a/www/chromium/files/patch-media__media.gyp
+++ b/www/chromium/files/patch-media__media.gyp
@@ -1,6 +1,6 @@
---- ./media/media.gyp.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./media/media.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -683,7 +683,7 @@
+--- media/media.gyp.orig	2014-10-02 17:39:47 UTC
++++ media/media.gyp
+@@ -678,7 +678,7 @@
              'audio/openbsd/audio_manager_openbsd.h',
            ],
          }],
@@ -9,7 +9,7 @@
            'conditions': [
              ['use_x11==1', {
                'dependencies': [
-@@ -984,7 +984,7 @@
+@@ -986,7 +986,7 @@
              'base/simd/convert_yuv_to_rgb_x86.cc',
            ],
          }],
diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
index 5dca2f20ce7f..6af5e4fed2f4 100644
--- a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
+++ b/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
@@ -1,5 +1,5 @@
---- ./media/video/capture/video_capture_device_factory.cc.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./media/video/capture/video_capture_device_factory.cc	2014-08-22 22:39:36.000000000 +0200
+--- media/video/capture/video_capture_device_factory.cc.orig	2014-10-02 17:18:58 UTC
++++ media/video/capture/video_capture_device_factory.cc
 @@ -11,7 +11,7 @@
  
  #if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi
index c12709df1a8e..b8b153d40ebc 100644
--- a/www/chromium/files/patch-native_client__build__common.gypi
+++ b/www/chromium/files/patch-native_client__build__common.gypi
@@ -1,6 +1,6 @@
---- ./native_client/build/common.gypi.orig	2014-08-20 21:03:22.000000000 +0200
-+++ ./native_client/build/common.gypi	2014-08-22 15:06:26.000000000 +0200
-@@ -286,7 +286,7 @@
+--- native_client/build/common.gypi.orig	2014-10-02 17:40:29 UTC
++++ native_client/build/common.gypi
+@@ -290,7 +290,7 @@
      ],
    },
    'conditions': [
diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
index d03feb7c4f60..ad771b066ad2 100644
--- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
+++ b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
@@ -1,5 +1,5 @@
---- ./native_client/src/shared/platform/platform.gyp.orig	2014-08-20 21:03:23.000000000 +0200
-+++ ./native_client/src/shared/platform/platform.gyp	2014-08-22 15:06:26.000000000 +0200
+--- native_client/src/shared/platform/platform.gyp.orig	2014-10-02 17:40:30 UTC
++++ native_client/src/shared/platform/platform.gyp
 @@ -36,7 +36,7 @@
        'refcount_base.cc',
      ],
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.h b/www/chromium/files/patch-net__base__address_tracker_linux.h
index cfcb7e3ef4a5..30aed4c9c429 100644
--- a/www/chromium/files/patch-net__base__address_tracker_linux.h
+++ b/www/chromium/files/patch-net__base__address_tracker_linux.h
@@ -1,5 +1,5 @@
---- ./net/base/address_tracker_linux.h.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/address_tracker_linux.h	2014-08-22 15:06:26.000000000 +0200
+--- net/base/address_tracker_linux.h.orig	2014-10-02 17:39:47 UTC
++++ net/base/address_tracker_linux.h
 @@ -6,10 +6,12 @@
  #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
  
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
index c090844e77ce..2bd2d0c783d3 100644
--- a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
+++ b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
@@ -1,5 +1,5 @@
---- ./net/base/address_tracker_linux_unittest.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/address_tracker_linux_unittest.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/base/address_tracker_linux_unittest.cc.orig	2014-10-02 17:39:47 UTC
++++ net/base/address_tracker_linux_unittest.cc
 @@ -4,7 +4,11 @@
  
  #include "net/base/address_tracker_linux.h"
diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc
index b0fe597da4b4..119fdd583f99 100644
--- a/www/chromium/files/patch-net__base__dns_reloader.cc
+++ b/www/chromium/files/patch-net__base__dns_reloader.cc
@@ -1,5 +1,5 @@
---- ./net/base/dns_reloader.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/dns_reloader.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/base/dns_reloader.cc.orig	2014-10-02 17:18:59 UTC
++++ net/base/dns_reloader.cc
 @@ -7,6 +7,9 @@
  #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
      !defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc
index d564b3f50ea6..88b9f55c5fa5 100644
--- a/www/chromium/files/patch-net__base__mime_util_unittest.cc
+++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc
@@ -1,6 +1,6 @@
---- ./net/base/mime_util_unittest.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/mime_util_unittest.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -385,7 +385,7 @@
+--- net/base/mime_util_unittest.cc.orig	2014-10-02 17:39:47 UTC
++++ net/base/mime_util_unittest.cc
+@@ -383,7 +383,7 @@
      { "MeSsAge/*",  1, "eml" },
      { "image/bmp",  1, "bmp" },
      { "video/*",    6, "mp4" },
diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h
index cab50bca09ef..96c65b5796f9 100644
--- a/www/chromium/files/patch-net__base__net_util.h
+++ b/www/chromium/files/patch-net__base__net_util.h
@@ -1,5 +1,5 @@
---- ./net/base/net_util.h.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/net_util.h	2014-08-22 15:06:26.000000000 +0200
+--- net/base/net_util.h.orig	2014-10-02 17:39:47 UTC
++++ net/base/net_util.h
 @@ -13,6 +13,9 @@
  #elif defined(OS_POSIX)
  #include <sys/types.h>
diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc
index 460677c5a8b7..49cccfc16a2f 100644
--- a/www/chromium/files/patch-net__base__network_change_notifier.cc
+++ b/www/chromium/files/patch-net__base__network_change_notifier.cc
@@ -1,5 +1,5 @@
---- ./net/base/network_change_notifier.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/base/network_change_notifier.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/base/network_change_notifier.cc.orig	2014-10-02 17:39:47 UTC
++++ net/base/network_change_notifier.cc
 @@ -521,7 +521,6 @@
  #elif defined(OS_MACOSX)
    return new NetworkChangeNotifierMac();
diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc
index 085dcdeed2fd..f07d0bad1905 100644
--- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc
+++ b/www/chromium/files/patch-net__dns__address_sorter_posix.cc
@@ -1,5 +1,5 @@
---- ./net/dns/address_sorter_posix.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/dns/address_sorter_posix.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/dns/address_sorter_posix.cc.orig	2014-10-02 17:18:59 UTC
++++ net/dns/address_sorter_posix.cc
 @@ -10,6 +10,7 @@
  #include <sys/socket.h>  // Must be included before ifaddrs.h.
  #include <ifaddrs.h>
diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
index 8316bc889442..c7699213014d 100644
--- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
+++ b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
@@ -1,5 +1,5 @@
---- ./net/dns/dns_config_service_posix_unittest.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/dns/dns_config_service_posix_unittest.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2014-10-02 17:18:59 UTC
++++ net/dns/dns_config_service_posix_unittest.cc
 @@ -2,8 +2,6 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc
index 601d353ac327..da774a67fc4f 100644
--- a/www/chromium/files/patch-net__dns__dns_session.cc
+++ b/www/chromium/files/patch-net__dns__dns_session.cc
@@ -1,5 +1,5 @@
---- ./net/dns/dns_session.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/dns/dns_session.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/dns/dns_session.cc.orig	2014-10-02 17:39:47 UTC
++++ net/dns/dns_session.cc
 @@ -178,7 +178,7 @@
    base::TimeDelta current_error = rtt - estimate;
    estimate += current_error / 8;  // * alpha
diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
index 5a20ad1dbb33..a1259b9b8dfa 100644
--- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
+++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
@@ -1,5 +1,5 @@
---- ./net/http/http_auth_gssapi_posix.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/http/http_auth_gssapi_posix.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/http/http_auth_gssapi_posix.cc.orig	2014-10-02 17:18:59 UTC
++++ net/http/http_auth_gssapi_posix.cc
 @@ -431,8 +431,8 @@
      static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h
new file mode 100644
index 000000000000..e2bc5bf42caa
--- /dev/null
+++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h
@@ -0,0 +1,12 @@
+--- net/http/http_auth_gssapi_posix.h.orig	2014-10-02 17:18:59 UTC
++++ net/http/http_auth_gssapi_posix.h
+@@ -16,6 +16,9 @@
+     MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
+ // Including gssapi.h directly is deprecated in the 10.9 SDK.
+ #include <GSS/gssapi.h>
++#elif defined(OS_FREEBSD)
++// Including gssapi.h is deprecated since at least FreeBSD 9
++#include <gssapi/gssapi.h>
+ #else
+ #include <gssapi.h>
+ #endif
diff --git a/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h b/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h
new file mode 100644
index 000000000000..cf7f1e4d3b57
--- /dev/null
+++ b/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h
@@ -0,0 +1,12 @@
+--- net/http/mock_gssapi_library_posix.h.orig	2014-10-02 17:18:59 UTC
++++ net/http/mock_gssapi_library_posix.h
+@@ -15,6 +15,9 @@
+     MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
+ // Including gssapi.h directly is deprecated in the 10.9 SDK.
+ #include <GSS/gssapi.h>
++#elif defined(OS_FREEBSD)
++// Including gssapi.h is deprecated since at least FreeBSD 9
++#include <gssapi/gssapi.h>
+ #else
+ #include <gssapi.h>
+ #endif
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp
index c88c8bc3aed0..4c2aa9f04b7b 100644
--- a/www/chromium/files/patch-net__net.gyp
+++ b/www/chromium/files/patch-net__net.gyp
@@ -1,6 +1,6 @@
---- ./net/net.gyp.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/net.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -317,9 +317,10 @@
+--- net/net.gyp.orig	2014-10-02 17:39:47 UTC
++++ net/net.gyp
+@@ -322,9 +322,10 @@
                }],
                ['os_bsd==1', {
                  'sources!': [
@@ -12,7 +12,7 @@
                  ],
                },{
                  'dependencies': [
-@@ -551,7 +552,7 @@
+@@ -556,7 +557,7 @@
          '<@(net_test_sources)',
        ],
        'conditions': [
@@ -21,9 +21,9 @@
            'dependencies': [
              'epoll_server',
              'flip_in_mem_edsm_server_base',
-@@ -1016,6 +1017,11 @@
-               'dns/mock_mdns_socket_factory.h'
-             ]
+@@ -1028,6 +1029,11 @@
+               'test/cert_test_util_nss.cc',
+             ],
          }],
 +        [ 'os_bsd == 1', {
 +          'sources!': [
diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi
index 1c8751baa180..f8c35628e693 100644
--- a/www/chromium/files/patch-net__net.gypi
+++ b/www/chromium/files/patch-net__net.gypi
@@ -1,6 +1,6 @@
---- ./net/net.gypi.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/net.gypi	2014-08-22 15:06:26.000000000 +0200
-@@ -171,8 +171,8 @@
+--- net/net.gypi.orig	2014-10-02 17:39:47 UTC
++++ net/net.gypi
+@@ -177,8 +177,8 @@
        'android/network_change_notifier_factory_android.h',
        'android/network_library.cc',
        'android/network_library.h',
@@ -11,7 +11,7 @@
        'base/backoff_entry.cc',
        'base/backoff_entry.h',
        'base/bandwidth_metrics.cc',
-@@ -1221,7 +1221,7 @@
+@@ -1250,7 +1250,7 @@
        'android/keystore_unittest.cc',
        'android/network_change_notifier_android_unittest.cc',
        'base/address_list_unittest.cc',
diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
index 113958549b29..38f0a59aed54 100644
--- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
@@ -1,5 +1,5 @@
---- ./net/proxy/proxy_config_service_linux.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/proxy/proxy_config_service_linux.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/proxy/proxy_config_service_linux.cc.orig	2014-10-02 17:39:47 UTC
++++ net/proxy/proxy_config_service_linux.cc
 @@ -21,7 +21,13 @@
  #include <limits.h>
  #include <stdio.h>
diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc
index add6510d9d5d..ef43f9c8a637 100644
--- a/www/chromium/files/patch-net__proxy__proxy_service.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_service.cc
@@ -1,6 +1,6 @@
---- ./net/proxy/proxy_service.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/proxy/proxy_service.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -41,7 +41,7 @@
+--- net/proxy/proxy_service.cc.orig	2014-10-02 17:39:47 UTC
++++ net/proxy/proxy_service.cc
+@@ -40,7 +40,7 @@
  #elif defined(OS_MACOSX)
  #include "net/proxy/proxy_config_service_mac.h"
  #include "net/proxy/proxy_resolver_mac.h"
@@ -9,7 +9,7 @@
  #include "net/proxy/proxy_config_service_linux.h"
  #elif defined(OS_ANDROID)
  #include "net/proxy/proxy_config_service_android.h"
-@@ -1379,7 +1379,7 @@
+@@ -1412,7 +1412,7 @@
               << "profile_io_data.cc::CreateProxyConfigService and this should "
               << "be used only for examples.";
    return new UnsetProxyConfigService;
diff --git a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
index d770c8b10656..dfae1873f33e 100644
--- a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
+++ b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
@@ -1,6 +1,6 @@
---- ./net/quic/congestion_control/rtt_stats.cc.orig	2014-08-20 21:02:27.000000000 +0200
-+++ ./net/quic/congestion_control/rtt_stats.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -73,7 +73,7 @@
+--- net/quic/congestion_control/rtt_stats.cc.orig	2014-10-02 17:18:59 UTC
++++ net/quic/congestion_control/rtt_stats.cc
+@@ -85,7 +85,7 @@
    } else {
      mean_deviation_ = QuicTime::Delta::FromMicroseconds(
          kOneMinusBeta * mean_deviation_.ToMicroseconds() +
@@ -8,4 +8,4 @@
 +        kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()));
      smoothed_rtt_ = smoothed_rtt_.Multiply(kOneMinusAlpha).Add(
          rtt_sample.Multiply(kAlpha));
-     DVLOG(1) << "Cubic; smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
+     DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
index 965c418fb79a..32399e2d5d23 100644
--- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc
+++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
@@ -1,5 +1,5 @@
---- ./net/socket/socks5_client_socket.cc.orig	2014-08-20 21:02:27.000000000 +0200
-+++ ./net/socket/socks5_client_socket.cc	2014-08-22 15:06:26.000000000 +0200
+--- net/socket/socks5_client_socket.cc.orig	2014-10-02 17:18:59 UTC
++++ net/socket/socks5_client_socket.cc
 @@ -4,6 +4,10 @@
  
  #include "net/socket/socks5_client_socket.h"
diff --git a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
index 2fde666e8c50..dadb67efa16c 100644
--- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
+++ b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
@@ -1,5 +1,5 @@
---- ./net/socket/tcp_listen_socket_unittest.h.orig	2014-08-20 21:02:27.000000000 +0200
-+++ ./net/socket/tcp_listen_socket_unittest.h	2014-08-22 15:06:26.000000000 +0200
+--- net/socket/tcp_listen_socket_unittest.h.orig	2014-10-02 17:19:00 UTC
++++ net/socket/tcp_listen_socket_unittest.h
 @@ -13,6 +13,9 @@
  #include <arpa/inet.h>
  #include <errno.h>
diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
index 63b31e3bc9e2..9bd500edd78e 100644
--- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
+++ b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
@@ -1,6 +1,6 @@
---- ./net/udp/udp_socket_unittest.cc.orig	2014-08-20 21:02:28.000000000 +0200
-+++ ./net/udp/udp_socket_unittest.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -202,7 +202,7 @@
+--- net/udp/udp_socket_unittest.cc.orig	2014-10-02 17:19:00 UTC
++++ net/udp/udp_socket_unittest.cc
+@@ -204,7 +204,7 @@
        client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
  }
  
diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
index 52a0af7381cd..46d0964e8637 100644
--- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
+++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
@@ -1,5 +1,5 @@
---- ./ppapi/proxy/file_io_resource.cc.orig	2014-08-20 21:02:40.000000000 +0200
-+++ ./ppapi/proxy/file_io_resource.cc	2014-08-22 15:06:26.000000000 +0200
+--- ppapi/proxy/file_io_resource.cc.orig	2014-10-02 17:39:47 UTC
++++ ppapi/proxy/file_io_resource.cc
 @@ -283,15 +283,17 @@
  
    if (check_quota_) {
diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
index c852111d7747..34edb5a94c43 100644
--- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
+++ b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
@@ -1,5 +1,5 @@
---- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig	2014-08-20 21:02:39.000000000 +0200
-+++ ./ppapi/shared_impl/private/net_address_private_impl.cc	2014-08-22 15:06:26.000000000 +0200
+--- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2014-10-02 17:19:00 UTC
++++ ppapi/shared_impl/private/net_address_private_impl.cc
 @@ -14,6 +14,10 @@
  #include <sys/types.h>
  #endif
diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp
index bb66ec040011..45e5d81b7535 100644
--- a/www/chromium/files/patch-printing__printing.gyp
+++ b/www/chromium/files/patch-printing__printing.gyp
@@ -1,5 +1,5 @@
---- ./printing/printing.gyp.orig	2014-08-20 21:03:08.000000000 +0200
-+++ ./printing/printing.gyp	2014-08-22 15:06:26.000000000 +0200
+--- printing/printing.gyp.orig	2014-10-02 17:39:47 UTC
++++ printing/printing.gyp
 @@ -187,7 +187,7 @@
              'backend/print_backend_chromeos.cc',
            ],
diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi
index a0d59ea427ee..831098b76bb4 100644
--- a/www/chromium/files/patch-remoting__remoting_host.gypi
+++ b/www/chromium/files/patch-remoting__remoting_host.gypi
@@ -1,5 +1,5 @@
---- ./remoting/remoting_host.gypi.orig	2014-08-20 21:02:52.000000000 +0200
-+++ ./remoting/remoting_host.gypi	2014-08-22 15:06:26.000000000 +0200
+--- remoting/remoting_host.gypi.orig	2014-10-02 17:39:48 UTC
++++ remoting/remoting_host.gypi
 @@ -12,7 +12,7 @@
    'variables': {
      'conditions': [
@@ -9,7 +9,7 @@
          'enable_remoting_host': 1,
        }, {
          'enable_remoting_host': 0,
-@@ -270,7 +270,7 @@
+@@ -285,7 +285,7 @@
              'host/win/wts_terminal_observer.h',
            ],
            'conditions': [
diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi
index ea9f653372fe..865301e8eaf2 100644
--- a/www/chromium/files/patch-skia__skia_chrome.gypi
+++ b/www/chromium/files/patch-skia__skia_chrome.gypi
@@ -1,6 +1,6 @@
---- ./skia/skia_chrome.gypi.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./skia/skia_chrome.gypi	2014-08-22 15:06:26.000000000 +0200
-@@ -80,6 +80,11 @@
+--- skia/skia_chrome.gypi.orig	2014-10-02 17:39:48 UTC
++++ skia/skia_chrome.gypi
+@@ -87,6 +87,11 @@
      'ext/vector_platform_device_skia.h',
    ],
    'conditions': [
diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi
index e8cb9f4c48f2..6b93402be58c 100644
--- a/www/chromium/files/patch-skia__skia_common.gypi
+++ b/www/chromium/files/patch-skia__skia_common.gypi
@@ -1,6 +1,6 @@
---- ./skia/skia_common.gypi.orig	2014-08-20 21:03:15.000000000 +0200
-+++ ./skia/skia_common.gypi	2014-08-22 15:06:26.000000000 +0200
-@@ -66,7 +66,7 @@
+--- skia/skia_common.gypi.orig	2014-10-02 17:39:48 UTC
++++ skia/skia_common.gypi
+@@ -61,7 +61,7 @@
      }],
  
      #Settings for text blitting, chosen to approximate the system browser.
diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc
index 4084676e9d7c..8b0878b4a861 100644
--- a/www/chromium/files/patch-sync__util__get_session_name.cc
+++ b/www/chromium/files/patch-sync__util__get_session_name.cc
@@ -1,5 +1,5 @@
---- ./sync/util/get_session_name.cc.orig	2014-08-20 21:02:30.000000000 +0200
-+++ ./sync/util/get_session_name.cc	2014-08-22 15:06:26.000000000 +0200
+--- sync/util/get_session_name.cc.orig	2014-10-02 17:39:48 UTC
++++ sync/util/get_session_name.cc
 @@ -11,7 +11,7 @@
  #include "base/sys_info.h"
  #include "base/task_runner.h"
diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc
index 9d58d18eae92..47f84b2377e0 100644
--- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc
+++ b/www/chromium/files/patch-sync__util__get_session_name_linux.cc
@@ -1,5 +1,5 @@
---- ./sync/util/get_session_name_linux.cc.orig	2014-08-20 21:02:30.000000000 +0200
-+++ ./sync/util/get_session_name_linux.cc	2014-08-22 15:06:26.000000000 +0200
+--- sync/util/get_session_name_linux.cc.orig	2014-10-02 17:19:01 UTC
++++ sync/util/get_session_name_linux.cc
 @@ -13,8 +13,9 @@
  namespace internal {
  
diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
index 99b987d85b4a..8deaaf66e0f8 100644
--- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
+++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
@@ -1,6 +1,6 @@
---- ./testing/gtest/include/gtest/internal/gtest-port.h.orig	2014-08-20 21:03:23.000000000 +0200
-+++ ./testing/gtest/include/gtest/internal/gtest-port.h	2014-08-22 15:06:26.000000000 +0200
-@@ -265,6 +265,8 @@
+--- testing/gtest/include/gtest/internal/gtest-port.h.orig	2014-10-02 17:39:53 UTC
++++ testing/gtest/include/gtest/internal/gtest-port.h
+@@ -343,6 +343,8 @@
  # define GTEST_OS_NACL 1
  #elif defined __OpenBSD__
  # define GTEST_OS_OPENBSD 1
@@ -9,7 +9,7 @@
  #elif defined __QNX__
  # define GTEST_OS_QNX 1
  #endif  // __CYGWIN__
-@@ -477,7 +479,7 @@
+@@ -611,7 +613,7 @@
  // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
  // to your compiler flags.
  # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
@@ -18,7 +18,7 @@
  #endif  // GTEST_HAS_PTHREAD
  
  #if GTEST_HAS_PTHREAD
-@@ -646,7 +648,7 @@
+@@ -791,7 +793,7 @@
       (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
       (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
       GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc
index 1bfdfb397906..87e6e4aad4bd 100644
--- a/www/chromium/files/patch-testing__gtest__src__gtest.cc
+++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc
@@ -1,6 +1,6 @@
---- ./testing/gtest/src/gtest.cc.orig	2014-08-20 21:03:23.000000000 +0200
-+++ ./testing/gtest/src/gtest.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -117,6 +117,10 @@
+--- testing/gtest/src/gtest.cc.orig	2014-10-02 17:39:53 UTC
++++ testing/gtest/src/gtest.cc
+@@ -121,6 +121,10 @@
  
  #endif  // GTEST_OS_LINUX
  
@@ -11,7 +11,7 @@
  #if GTEST_HAS_EXCEPTIONS
  # include <stdexcept>
  #endif
-@@ -1592,7 +1596,7 @@
+@@ -1891,7 +1895,7 @@
  
  #if GTEST_OS_WINDOWS
    return _wcsicmp(lhs, rhs) == 0;
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__config.h b/www/chromium/files/patch-third_party__WebKit__Source__config.h
deleted file mode 100644
index 53ebc30584b5..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__config.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./third_party/WebKit/Source/config.h.orig	2014-08-20 21:08:07.000000000 +0200
-+++ ./third_party/WebKit/Source/config.h	2014-08-22 15:06:26.000000000 +0200
-@@ -155,6 +155,6 @@
- #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
- #endif
- 
--#if OS(LINUX) || OS(ANDROID) || OS(WIN)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || OS(WIN)
- #define WTF_USE_HARFBUZZ 1
- #endif
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
index 063cbcc8ee30..7922b122b2bc 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
@@ -1,6 +1,6 @@
---- ./third_party/WebKit/Source/core/core.gyp.orig	2014-08-20 21:08:03.000000000 +0200
-+++ ./third_party/WebKit/Source/core/core.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -650,7 +650,7 @@
+--- third_party/WebKit/Source/core/core.gyp.orig	2014-10-02 18:00:36 UTC
++++ third_party/WebKit/Source/core/core.gyp
+@@ -589,7 +589,7 @@
            # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
            'cflags': ['-Wno-uninitialized'],
          }],
@@ -9,7 +9,7 @@
            'sources/': [
              ['exclude', 'Linux\\.cpp$'],
            ],
-@@ -690,7 +690,7 @@
+@@ -627,7 +627,7 @@
          ['OS=="win" and buildtype=="Official"', {
            'msvs_shard': 19,
          }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
index a71e504b10b6..aec2d595b2d0 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
@@ -1,5 +1,5 @@
---- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig	2014-08-20 21:07:58.000000000 +0200
-+++ ./third_party/WebKit/Source/platform/blink_platform.gyp	2014-08-22 15:06:26.000000000 +0200
+--- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2014-10-02 18:00:37 UTC
++++ third_party/WebKit/Source/platform/blink_platform.gyp
 @@ -38,6 +38,9 @@
    'targets': [{
      'target_name': 'blink_common',
@@ -10,7 +10,7 @@
      'variables': { 'enable_wexit_time_destructors': 1 },
      'dependencies': [
        '../config.gyp:config',
-@@ -249,7 +252,7 @@
+@@ -248,7 +251,7 @@
      # compiler optimizations, see crbug.com/237063
      'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
      'conditions': [
@@ -19,16 +19,16 @@
          'sources/': [
            # Cherry-pick files excluded by the broader regular expressions above.
            ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
-@@ -269,7 +272,7 @@
+@@ -268,7 +271,7 @@
            ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
          ],
        }],
 -      ['OS=="linux" or OS=="android"', {
 +      ['OS=="linux" or OS=="android" or os_bsd==1', {
          'sources/': [
-           ['include', 'fonts/linux/FontPlatformDataLinuxHarfBuzz\\.cpp$'],
+           ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
          ]
-@@ -366,7 +369,7 @@
+@@ -367,7 +370,7 @@
            ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
          ],
        }],
@@ -37,7 +37,7 @@
          'sources/': [
            ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
          ],
-@@ -412,7 +415,7 @@
+@@ -413,7 +416,7 @@
            ['exclude', 'Android\\.cpp$'],
          ],
        }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp
index 2b17eecd10cb..71a235d85d9b 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp
@@ -1,6 +1,6 @@
---- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig	2014-08-20 21:07:57.000000000 +0200
-+++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp	2014-08-22 15:06:26.000000000 +0200
-@@ -50,13 +50,22 @@
+--- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig	2014-10-02 18:00:37 UTC
++++ third_party/WebKit/Source/platform/heap/ThreadState.cpp
+@@ -54,13 +54,22 @@
  #include <sanitizer/msan_interface.h>
  #endif
  
@@ -8,7 +8,7 @@
 +#include <pthread_np.h>
 +#endif
 +
- namespace WebCore {
+ namespace blink {
  
  static void* getStackStart()
  {
@@ -24,12 +24,12 @@
          void* base;
          size_t size;
          int error = pthread_attr_getstack(&attr, &base, &size);
-@@ -64,6 +73,9 @@
+@@ -68,6 +77,9 @@
          pthread_attr_destroy(&attr);
          return reinterpret_cast<Address>(base) + size;
      }
 +#if OS(FREEBSD)
-+    pthread_attr_destroy(&attr);
++	pthread_attr_destroy(&attr);
 +#endif
  #if defined(__GLIBC__)
      // pthread_getattr_np can fail for the main thread. In this case
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
deleted file mode 100644
index 9b8bba75e1f7..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig	2014-08-20 21:07:56.000000000 +0200
-+++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp	2014-08-22 15:06:26.000000000 +0200
-@@ -34,7 +34,7 @@
- #include "platform/fonts/FontDescription.h"
- #include "platform/fonts/FontPlatformData.h"
- 
--#if OS(LINUX)
-+#if OS(LINUX) || OS(FREEBSD)
- #include "public/platform/linux/WebFontInfo.h"
- #endif
- 
-@@ -77,7 +77,7 @@
- void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
- {
-     FontDescription::setSubpixelPositioning(useSubpixelPositioning);
--#if OS(LINUX)
-+#if OS(LINUX) || OS(FREEBSD)
-     WebFontInfo::setSubpixelPositioning(useSubpixelPositioning);
- #endif
- }
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
index 172eac3c7583..328d8e4120ec 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
@@ -1,6 +1,6 @@
---- ./third_party/WebKit/Source/web/web.gyp.orig	2014-08-20 21:07:57.000000000 +0200
-+++ ./third_party/WebKit/Source/web/web.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -142,7 +142,7 @@
+--- third_party/WebKit/Source/web/web.gyp.orig	2014-10-02 18:00:38 UTC
++++ third_party/WebKit/Source/web/web.gyp
+@@ -145,7 +145,7 @@
                        },
                      },
                  }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
deleted file mode 100644
index 09df9bd36abc..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig	2014-08-20 21:08:05.000000000 +0200
-+++ ./third_party/WebKit/Source/wtf/Assertions.cpp	2014-08-22 15:06:26.000000000 +0200
-@@ -38,6 +38,7 @@
- #include "OwnPtr.h"
- #include "PassOwnPtr.h"
- 
-+#include <stdlib.h>
- #include <stdio.h>
- #include <stdarg.h>
- #include <stdlib.h>
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
index 3351611a1f0a..fbe42f130b9b 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
+++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
@@ -1,5 +1,5 @@
---- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-08-20 21:08:05.000000000 +0200
-+++ ./third_party/WebKit/Source/wtf/ByteSwap.h	2014-08-22 15:06:26.000000000 +0200
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-10-02 18:00:38 UTC
++++ third_party/WebKit/Source/wtf/ByteSwap.h
 @@ -52,14 +52,20 @@
  
  #else
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
deleted file mode 100644
index fea54f26d9f8..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig	2014-08-20 21:08:05.000000000 +0200
-+++ ./third_party/WebKit/Source/wtf/DateMath.cpp	2014-08-22 15:06:26.000000000 +0200
-@@ -80,6 +80,7 @@
- #include "StringExtras.h"
- 
- #include <algorithm>
-+#include <cstdlib>
- #include <limits.h>
- #include <limits>
- #include <math.h>
-@@ -785,7 +786,7 @@
-                 return std::numeric_limits<double>::quiet_NaN();
- 
-             int sgn = (o < 0) ? -1 : 1;
--            o = abs(o);
-+            o = std::abs(o);
-             if (*dateString != ':') {
-                 if (o >= 24)
-                     offset = ((o / 100) * 60 + (o % 100)) * sgn;
-@@ -874,7 +875,7 @@
-     stringBuilder.append(' ');
- 
-     stringBuilder.append(utcOffset > 0 ? '+' : '-');
--    int absoluteUTCOffset = abs(utcOffset);
-+    int absoluteUTCOffset = std::abs(utcOffset);
-     stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset / 60));
-     stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset % 60));
- 
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
index 5ecf252cbf3f..8048b3d17e3f 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
@@ -1,5 +1,5 @@
---- ./third_party/WebKit/Source/wtf/wtf.gyp.orig	2014-08-20 21:08:05.000000000 +0200
-+++ ./third_party/WebKit/Source/wtf/wtf.gyp	2014-08-22 15:06:26.000000000 +0200
+--- third_party/WebKit/Source/wtf/wtf.gyp.orig	2014-10-02 18:00:38 UTC
++++ third_party/WebKit/Source/wtf/wtf.gyp
 @@ -70,7 +70,7 @@
        'target_name': 'wtf',
        'type': '<(component)',
diff --git a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
index 62b469c01f39..8ea17b8efaeb 100644
--- a/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
+++ b/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h
@@ -1,5 +1,5 @@
---- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig	2014-08-20 21:04:24.000000000 +0200
-+++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h	2014-08-22 15:06:26.000000000 +0200
+--- third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig	2014-10-02 17:40:34 UTC
++++ third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h
 @@ -1,7 +1,7 @@
  /* Automatically generated by configure - do not modify! */
  #ifndef FFMPEG_CONFIG_H
diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
index 6ee064303f84..c28da5279ca7 100644
--- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
+++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
@@ -1,5 +1,5 @@
---- ./third_party/ffmpeg/libavutil/mem.c.orig	2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/ffmpeg/libavutil/mem.c	2014-08-22 15:06:26.000000000 +0200
+--- third_party/ffmpeg/libavutil/mem.c.orig	2014-10-02 17:40:35 UTC
++++ third_party/ffmpeg/libavutil/mem.c
 @@ -32,7 +32,7 @@
  #include <stdint.h>
  #include <stdlib.h>
diff --git a/www/chromium/files/patch-third_party__khronos__khronos.gyp b/www/chromium/files/patch-third_party__khronos__khronos.gyp
index 0790d80fb187..876e4e5e172b 100644
--- a/www/chromium/files/patch-third_party__khronos__khronos.gyp
+++ b/www/chromium/files/patch-third_party__khronos__khronos.gyp
@@ -1,5 +1,5 @@
---- ./third_party/khronos/khronos.gyp.orig	2014-08-20 21:03:05.000000000 +0200
-+++ ./third_party/khronos/khronos.gyp	2014-08-22 15:06:26.000000000 +0200
+--- third_party/khronos/khronos.gyp.orig	2014-10-02 17:19:02 UTC
++++ third_party/khronos/khronos.gyp
 @@ -11,6 +11,7 @@
          'include_dirs': [
            '.',
diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
index c4440a1d27e0..d0a93f92e763 100644
--- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
+++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
@@ -1,5 +1,5 @@
---- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2014-08-20 21:03:03.000000000 +0200
-+++ ./third_party/libXNVCtrl/libXNVCtrl.gyp	2014-08-22 15:06:26.000000000 +0200
+--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2014-10-02 17:19:02 UTC
++++ third_party/libXNVCtrl/libXNVCtrl.gyp
 @@ -13,6 +13,9 @@
          'NVCtrlLib.h',
          'nv_control.h',
diff --git a/www/chromium/files/patch-third_party__libexif__libexif.gyp b/www/chromium/files/patch-third_party__libexif__libexif.gyp
index 6c63f8028938..cf62b7ae6de5 100644
--- a/www/chromium/files/patch-third_party__libexif__libexif.gyp
+++ b/www/chromium/files/patch-third_party__libexif__libexif.gyp
@@ -1,5 +1,5 @@
---- ./third_party/libexif/libexif.gyp.orig	2014-08-20 21:03:07.000000000 +0200
-+++ ./third_party/libexif/libexif.gyp	2014-08-21 23:18:11.000000000 +0200
+--- third_party/libexif/libexif.gyp.orig	2014-09-04 00:04:19 UTC
++++ third_party/libexif/libexif.gyp
 @@ -5,9 +5,9 @@
  {
    'variables': {
diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
index 5f62c637485a..a73b47e11390 100644
--- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
+++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
@@ -1,6 +1,6 @@
---- ./third_party/libjingle/libjingle.gyp.orig	2014-08-20 21:03:06.000000000 +0200
-+++ ./third_party/libjingle/libjingle.gyp	2014-08-22 15:06:26.000000000 +0200
-@@ -477,7 +477,7 @@
+--- third_party/libjingle/libjingle.gyp.orig	2014-10-02 17:39:48 UTC
++++ third_party/libjingle/libjingle.gyp
+@@ -484,7 +484,7 @@
                ],
              }],
              # TODO(mallinath) - Enable SCTP for iOS.
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
deleted file mode 100644
index 01812f20d781..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2014-08-20 21:03:47.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/cpumonitor.cc	2014-08-22 15:06:26.000000000 +0200
-@@ -53,13 +53,13 @@
- #include <mach/task.h>
- #endif  // defined(IOS) || defined(OSX)
- 
--#if defined(LINUX) || defined(ANDROID)
-+#if defined(LINUX) || defined(ANDROID) || defined(BSD)
- #include <sys/resource.h>
- #include <errno.h>
- #include <stdio.h>
- #include "talk/base/fileutils.h"
- #include "talk/base/pathutils.h"
--#endif // defined(LINUX) || defined(ANDROID)
-+#endif // defined(LINUX) || defined(ANDROID) || defined(BSD)
- 
- #if defined(IOS) || defined(OSX)
- static uint64 TimeValueTToInt64(const time_value_t &time_value) {
-@@ -285,6 +285,11 @@
-   const uint64 cpu_times = nice + system + user;
-   const uint64 total_times = cpu_times + idle;
- #endif  // defined(LINUX) || defined(ANDROID)
-+#if defined(BSD)
-+  const uint64 cpu_times = 0;
-+  const uint64 total_times = 0;
-+  return 0.f;
-+#endif
- 
- #if defined(__native_client__)
-   // TODO(ryanpetrie): Implement this via PPAPI when it's available.
-@@ -359,7 +364,7 @@
-       TimeValueTToInt64(task_term_info.system_time));
- #endif  // defined(IOS) || defined(OSX)
- 
--#if defined(LINUX) || defined(ANDROID)
-+#if defined(LINUX) || defined(ANDROID) || defined(BSD)
-   rusage usage;
-   if (getrusage(RUSAGE_SELF, &usage) < 0) {
-     LOG_ERR(LS_ERROR) << "getrusage failed";
-@@ -369,7 +374,7 @@
-   const uint64 cpu_times =
-       (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec +
-       usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
--#endif  // defined(LINUX) || defined(ANDROID)
-+#endif  // defined(LINUX) || defined(ANDROID) || defined(BSD)
- 
- #if defined(__native_client__)
-   // TODO(ryanpetrie): Implement this via PPAPI when it's available.
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
deleted file mode 100644
index b19dd21df383..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./third_party/libjingle/source/talk/base/ipaddress.h.orig	2014-08-20 21:03:47.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/ipaddress.h	2014-08-22 15:06:26.000000000 +0200
-@@ -34,6 +34,9 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #endif
-+#ifdef BSD
-+#include <sys/socket.h>
-+#endif
- #ifdef WIN32
- #include <winsock2.h>
- #include <ws2tcpip.h>
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
deleted file mode 100644
index 02906e449552..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./third_party/libjingle/source/talk/base/linux.cc.orig	2014-08-20 21:03:47.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/linux.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -25,7 +25,7 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#if defined(LINUX) || defined(ANDROID)
-+#if defined(LINUX) || defined(ANDROID) || defined(BSD)
- #include "talk/base/linux.h"
- 
- #include <ctype.h>
-@@ -362,4 +362,4 @@
- 
- }  // namespace talk_base
- 
--#endif  // defined(LINUX) || defined(ANDROID)
-+#endif  // defined(LINUX) || defined(ANDROID) || defined(BSD)
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
deleted file mode 100644
index 417b583219a8..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./third_party/libjingle/source/talk/base/linux.h.orig	2014-08-20 21:03:46.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/linux.h	2014-08-22 15:06:27.000000000 +0200
-@@ -28,7 +28,7 @@
- #ifndef TALK_BASE_LINUX_H_
- #define TALK_BASE_LINUX_H_
- 
--#if defined(LINUX) || defined(ANDROID)
-+#if defined(LINUX) || defined(ANDROID) || defined(BSD)
- #include <string>
- #include <map>
- #include <vector>
-@@ -136,5 +136,5 @@
- 
- }  // namespace talk_base
- 
--#endif  // defined(LINUX) || defined(ANDROID)
-+#endif  // defined(LINUX) || defined(ANDROID) || defined(BSD)
- #endif  // TALK_BASE_LINUX_H_
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
deleted file mode 100644
index 4da5983af68d..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./third_party/libjingle/source/talk/base/network.h.orig	2014-08-20 21:03:47.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/network.h	2014-08-22 15:06:27.000000000 +0200
-@@ -38,6 +38,10 @@
- #include "talk/base/messagehandler.h"
- #include "talk/base/sigslot.h"
- 
-+#if defined(OS_FREEBSD)
-+#include <sys/types.h>
-+#endif
-+
- #if defined(POSIX)
- struct ifaddrs;
- #endif  // defined(POSIX)
diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
index ae0078659196..f3eb3f4f1f91 100644
--- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
+++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
@@ -1,11 +1,11 @@
---- ./third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-08-20 21:03:45.000000000 +0200
-+++ ./third_party/libjpeg_turbo/libjpeg.gyp	2014-08-21 23:18:11.000000000 +0200
-@@ -245,7 +245,7 @@
+--- third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-09-04 00:29:24 UTC
++++ third_party/libjpeg_turbo/libjpeg.gyp
+@@ -246,7 +246,7 @@
              ],
            },
          }],
--        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', {
-+        [ 'OS=="linux" or os_bsd==1 or (OS=="android" and target_arch!="arm")', {
+-        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', {
++        [ 'OS=="linux" or os_bsd==1 or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', {
            'conditions': [
              [ 'use_system_yasm==0', {
                'dependencies': [
diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
index d6bda31ede72..efe72bb3040a 100644
--- a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
+++ b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
@@ -1,5 +1,5 @@
---- ./third_party/libphonenumber/libphonenumber.gyp.orig	2014-08-20 21:02:59.000000000 +0200
-+++ ./third_party/libphonenumber/libphonenumber.gyp	2014-08-22 15:06:27.000000000 +0200
+--- third_party/libphonenumber/libphonenumber.gyp.orig	2014-10-02 17:19:02 UTC
++++ third_party/libphonenumber/libphonenumber.gyp
 @@ -11,6 +11,7 @@
        # generated protocol headers to be available with "phonenumbers" include
        # path, e.g. #include "phonenumbers/foo.pb.h".
diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
index 903b4fc9d022..d52d5b5f594e 100644
--- a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
+++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
@@ -1,5 +1,5 @@
---- ./third_party/libvpx/unpack_lib_posix.sh.orig	2014-08-20 21:03:55.000000000 +0200
-+++ ./third_party/libvpx/unpack_lib_posix.sh	2014-08-22 15:06:27.000000000 +0200
+--- third_party/libvpx/unpack_lib_posix.sh.orig	2014-10-02 17:40:17 UTC
++++ third_party/libvpx/unpack_lib_posix.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash -e
 +#!/usr/bin/env bash
diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
index 389b937a949b..2182a696ba12 100644
--- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
+++ b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
@@ -1,5 +1,5 @@
---- ./third_party/ots/include/opentype-sanitiser.h.orig	2014-08-20 21:03:55.000000000 +0200
-+++ ./third_party/ots/include/opentype-sanitiser.h	2014-08-22 15:06:27.000000000 +0200
+--- third_party/ots/include/opentype-sanitiser.h.orig	2014-10-02 17:40:20 UTC
++++ third_party/ots/include/opentype-sanitiser.h
 @@ -22,6 +22,7 @@
  #else
  #include <arpa/inet.h>
diff --git a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
index ebd428eed88f..c57575bab76a 100644
--- a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
+++ b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
@@ -1,5 +1,5 @@
---- ./third_party/pdfium/build/standalone.gypi.orig	2014-08-20 21:03:59.000000000 +0200
-+++ ./third_party/pdfium/build/standalone.gypi	2014-08-22 17:00:23.000000000 +0200
+--- third_party/pdfium/build/standalone.gypi.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/build/standalone.gypi
 @@ -13,7 +13,7 @@
        'variables': {
          'variables': {
@@ -18,7 +18,7 @@
                'host_arch%': 'ia32',
              }],
            ],
-@@ -250,4 +250,4 @@
+@@ -259,4 +259,4 @@
      # See comment in Chromium's common.gypi for why this is needed.
      'SYMROOT': '<(DEPTH)/xcodebuild',
    }
diff --git a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
index 889bf0bbf209..aadef589923a 100644
--- a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
+++ b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
@@ -1,5 +1,5 @@
---- ./third_party/pdfium/core/include/fxcrt/fx_system.h.orig	2014-08-20 21:03:59.000000000 +0200
-+++ ./third_party/pdfium/core/include/fxcrt/fx_system.h	2014-08-22 15:13:48.000000000 +0200
+--- third_party/pdfium/core/include/fxcrt/fx_system.h.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/core/include/fxcrt/fx_system.h
 @@ -21,7 +21,7 @@
  #elif defined(_WIN32) || defined(_WIN64)
  #define _FX_OS_ _FX_WIN32_DESKTOP_
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
index 53950176e79e..3bbe0340466b 100644
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
+++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
@@ -1,6 +1,6 @@
---- ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig	2014-08-20 21:04:00.000000000 +0200
-+++ ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	2014-08-22 22:27:31.000000000 +0200
-@@ -1062,7 +1062,7 @@
+--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp
+@@ -1052,7 +1052,7 @@
  //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend)
  FX_BOOL CJS_PublicMethods::AFNumber_Format(OBJ_METHOD_PARAMS)
  {
@@ -9,7 +9,7 @@
  	v8::Isolate* isolate = ::GetIsolate(cc);
  	CJS_Context* pContext = (CJS_Context *)cc;
  	ASSERT(pContext != NULL);
-@@ -1403,7 +1403,7 @@
+@@ -1393,7 +1393,7 @@
  //function AFPercent_Format(nDec, sepStyle)
  FX_BOOL CJS_PublicMethods::AFPercent_Format(OBJ_METHOD_PARAMS)
  {
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
index fffe1c0a4675..75526fd21fb5 100644
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
+++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
@@ -1,5 +1,5 @@
---- ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig	2014-08-20 21:04:00.000000000 +0200
-+++ ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp	2014-08-22 19:48:05.000000000 +0200
+--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp
 @@ -753,12 +753,17 @@
  
  double _getLocalTZA()
diff --git a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp
index ea43f69b97e9..ebd2b8f0bf83 100644
--- a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp
+++ b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp
@@ -1,11 +1,11 @@
---- ./third_party/pdfium/pdfium.gyp.orig	2014-08-20 21:04:00.000000000 +0200
-+++ ./third_party/pdfium/pdfium.gyp	2014-08-22 16:59:52.000000000 +0200
-@@ -14,7 +14,7 @@
+--- third_party/pdfium/pdfium.gyp.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/pdfium.gyp
+@@ -13,7 +13,7 @@
        ['pdf_use_skia==1', {
          'defines': ['_SKIA_SUPPORT_'],
        }],
 -      ['OS=="linux"', {
 +      ['OS=="linux" or OS=="freebsd"', {
-         'cflags!': [
-           '-fno-exceptions',
-         ],
+         'conditions': [
+           ['target_arch=="x64"', {
+             'defines' : [ '_FX_CPU_=_FX_X64_', ],
diff --git a/www/chromium/files/patch-third_party__pdfium__third_party__logging.h b/www/chromium/files/patch-third_party__pdfium__third_party__logging.h
new file mode 100644
index 000000000000..986dc05af056
--- /dev/null
+++ b/www/chromium/files/patch-third_party__pdfium__third_party__logging.h
@@ -0,0 +1,11 @@
+--- third_party/pdfium/third_party/logging.h.orig	2014-10-02 17:40:24 UTC
++++ third_party/pdfium/third_party/logging.h
+@@ -10,7 +10,7 @@
+ #define CHECK(condition)                                                \
+   if (!(condition)) {                                                   \
+     abort();                                                            \
+-    *(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42;              \
++    *(reinterpret_cast<volatile char*>(__null) + 42) = 0x42;              \
+   }
+ 
+ #define NOTREACHED() abort()
diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
index cfe61867d02f..a8040aa0f232 100644
--- a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
+++ b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
@@ -1,5 +1,5 @@
---- ./third_party/sfntly/sfntly.gyp.orig	2014-08-20 21:03:05.000000000 +0200
-+++ ./third_party/sfntly/sfntly.gyp	2014-08-22 15:06:27.000000000 +0200
+--- third_party/sfntly/sfntly.gyp.orig	2014-10-02 17:19:02 UTC
++++ third_party/sfntly/sfntly.gyp
 @@ -126,7 +126,7 @@
          'cpp/src/sample/chromium/subsetter_impl.h',
        ],
diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
index def88d45a9e1..fb52106c35fc 100644
--- a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
+++ b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
@@ -1,5 +1,5 @@
---- ./third_party/sqlite/sqlite.gyp.orig	2014-08-20 21:03:05.000000000 +0200
-+++ ./third_party/sqlite/sqlite.gyp	2014-08-22 15:06:27.000000000 +0200
+--- third_party/sqlite/sqlite.gyp.orig	2014-10-02 17:39:48 UTC
++++ third_party/sqlite/sqlite.gyp
 @@ -105,6 +105,8 @@
              'amalgamation',
              # Needed for fts2 to build.
diff --git a/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc b/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc
new file mode 100644
index 000000000000..c56d148649f9
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc
@@ -0,0 +1,36 @@
+--- third_party/webrtc/base/cpumonitor.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/cpumonitor.cc
+@@ -36,13 +36,13 @@
+ #include <mach/task.h>
+ #endif  // defined(WEBRTC_MAC)
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include <sys/resource.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include "webrtc/base/fileutils.h"
+ #include "webrtc/base/pathutils.h"
+-#endif // defined(WEBRTC_LINUX)
++#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ 
+ #if defined(WEBRTC_MAC)
+ static uint64 TimeValueTToInt64(const time_value_t &time_value) {
+@@ -342,7 +342,7 @@
+       TimeValueTToInt64(task_term_info.system_time));
+ #endif  // defined(WEBRTC_MAC)
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+   rusage usage;
+   if (getrusage(RUSAGE_SELF, &usage) < 0) {
+     LOG_ERR(LS_ERROR) << "getrusage failed";
+@@ -352,7 +352,7 @@
+   const uint64 cpu_times =
+       (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec +
+       usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
+-#endif  // defined(WEBRTC_LINUX)
++#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ 
+ #if defined(__native_client__)
+   // TODO(ryanpetrie): Implement this via PPAPI when it's available.
diff --git a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
index 9591db5fa0bd..b3ae82e41eec 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
+++ b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/base/httpcommon.cc.orig	2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/webrtc/base/httpcommon.cc	2014-08-22 18:44:03.000000000 +0200
+--- third_party/webrtc/base/httpcommon.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/httpcommon.cc
 @@ -382,7 +382,7 @@
      gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
    }
diff --git a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
new file mode 100644
index 000000000000..5d9021eda452
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
@@ -0,0 +1,12 @@
+--- third_party/webrtc/base/ipaddress.h.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/ipaddress.h
+@@ -17,6 +17,9 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #endif
++#if defined(WEBRTC_BSD)
++#include <sys/socket.h>
++#endif
+ #if defined(WEBRTC_WIN)
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.cc b/www/chromium/files/patch-third_party__webrtc__base__linux.cc
new file mode 100644
index 000000000000..1e20b7d72ab6
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__linux.cc
@@ -0,0 +1,17 @@
+--- third_party/webrtc/base/linux.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/linux.cc
+@@ -8,7 +8,7 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include "webrtc/base/linux.h"
+ 
+ #include <ctype.h>
+@@ -345,4 +345,4 @@
+ 
+ }  // namespace rtc
+ 
+-#endif  // defined(WEBRTC_LINUX)
++#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.h b/www/chromium/files/patch-third_party__webrtc__base__linux.h
new file mode 100644
index 000000000000..7c95f39ee948
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__linux.h
@@ -0,0 +1,18 @@
+--- third_party/webrtc/base/linux.h.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/linux.h
+@@ -11,7 +11,7 @@
+ #ifndef WEBRTC_BASE_LINUX_H_
+ #define WEBRTC_BASE_LINUX_H_
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include <string>
+ #include <map>
+ #include <vector>
+@@ -119,5 +119,5 @@
+ 
+ }  // namespace rtc
+ 
+-#endif  // defined(WEBRTC_LINUX)
++#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #endif  // WEBRTC_BASE_LINUX_H_
diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.cc b/www/chromium/files/patch-third_party__webrtc__base__network.cc
index 4f74d9ff7ee3..9567127fb370 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__network.cc
+++ b/www/chromium/files/patch-third_party__webrtc__base__network.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/base/network.cc.orig	2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/webrtc/base/network.cc	2014-08-22 18:51:07.000000000 +0200
+--- third_party/webrtc/base/network.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/network.cc
 @@ -18,7 +18,7 @@
  // linux/if.h can't be included at the same time as the posix sys/if.h, and
  // it's transitively required by linux/route.h, so include that version on
diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.h b/www/chromium/files/patch-third_party__webrtc__base__network.h
new file mode 100644
index 000000000000..0b57fee375db
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__network.h
@@ -0,0 +1,13 @@
+--- third_party/webrtc/base/network.h.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/network.h
+@@ -21,6 +21,10 @@
+ #include "webrtc/base/messagehandler.h"
+ #include "webrtc/base/sigslot.h"
+ 
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(WEBRTC_POSIX)
+ struct ifaddrs;
+ #endif  // defined(WEBRTC_POSIX)
diff --git a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
index e1af1ce4eb16..a0e1f69ec240 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
+++ b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/base/physicalsocketserver.cc.orig	2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/webrtc/base/physicalsocketserver.cc	2014-08-22 18:54:07.000000000 +0200
+--- third_party/webrtc/base/physicalsocketserver.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/physicalsocketserver.cc
 @@ -240,7 +240,7 @@
      socklen_t optlen = sizeof(*value);
      int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
diff --git a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h
index 912bcace4a48..79f826c54285 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h
+++ b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h
@@ -1,11 +1,11 @@
---- ./third_party/webrtc/base/stringutils.h.orig	2014-08-20 21:04:28.000000000 +0200
-+++ ./third_party/webrtc/base/stringutils.h	2014-08-22 18:44:28.000000000 +0200
+--- third_party/webrtc/base/stringutils.h.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/stringutils.h
 @@ -23,11 +23,11 @@
  #endif  // WEBRTC_WIN 
  
  #if defined(WEBRTC_POSIX)
 -#ifdef BSD
-+#ifdef WEBRTC_BSD
++#if defined(WEBRTC_BSD) || defined(BSD)
  #include <stdlib.h>
 -#else  // BSD
 +#else  // WEBRTC_BSD
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
index 2c2649660efb..2e7c482b04d3 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
+++ b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
@@ -1,29 +1,29 @@
---- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig	2014-08-20 21:03:47.000000000 +0200
-+++ ./third_party/libjingle/source/talk/base/systeminfo.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -36,8 +36,12 @@
- #elif defined(OSX)
+--- third_party/webrtc/base/systeminfo.cc.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/base/systeminfo.cc
+@@ -19,8 +19,12 @@
+ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
  #include <ApplicationServices/ApplicationServices.h>
  #include <CoreServices/CoreServices.h>
--#elif defined(LINUX) || defined(ANDROID)
-+#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
+-#elif defined(WEBRTC_LINUX)
++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
  #include <unistd.h>
-+#if defined(OS_FREEBSD)
++#if defined(WEBRTC_BSD)
 +#include <sys/types.h>
 +#include <sys/sysctl.h>
 +#endif
  #endif
- #if defined(OSX) || defined(IOS)
+ #if defined(WEBRTC_MAC)
  #include <sys/sysctl.h>
-@@ -48,7 +52,7 @@
- #include "talk/base/win32.h"
- #elif defined(OSX)
- #include "talk/base/macconversion.h"
--#elif defined(LINUX) || defined(ANDROID)
-+#elif defined(LINUX) || defined(ANDROID) || defined(BSD)
- #include "talk/base/linux.h"
+@@ -31,7 +35,7 @@
+ #include "webrtc/base/win32.h"
+ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+ #include "webrtc/base/macconversion.h"
+-#elif defined(WEBRTC_LINUX)
++#elif defined(WEBRTC_LINUX) || defined(WEBRT_BSD)
+ #include "webrtc/base/linux.h"
  #endif
- #include "talk/base/common.h"
-@@ -185,6 +189,17 @@
+ #include "webrtc/base/common.h"
+@@ -168,6 +172,17 @@
    }
  #elif defined(__native_client__)
    // TODO(ryanpetrie): Implement this via PPAPI when it's available.
@@ -37,7 +37,7 @@
 +    logical_cpus_ = *static_cast<int*>(sysctl_value);
 +  }
 +  // L3 / L2 cache size?
-+  // CPU family/model/stepping (available in dmesg, kernel only TODO)
- #else  // LINUX || ANDROID
++  // CPU family/model/stepping (available in dmesg, kernel only TODO) 
+ #else  // WEBRTC_LINUX
    ProcCpuInfo proc_info;
    if (proc_info.LoadFromSystem()) {
diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi
index 5c64a9b8bae1..43bbc3b12900 100644
--- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__build__common.gypi
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/build/common.gypi.orig	2014-08-20 21:04:25.000000000 +0200
-+++ ./third_party/webrtc/build/common.gypi	2014-08-23 16:42:44.000000000 +0200
+--- third_party/webrtc/build/common.gypi.orig	2014-10-02 17:40:33 UTC
++++ third_party/webrtc/build/common.gypi
 @@ -321,6 +321,13 @@
            'WEBRTC_LINUX',
          ],
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
index 3dc87795e9b0..0a4e1b61a3ca 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2014-08-20 21:04:06.000000000 +0200
-+++ ./third_party/webrtc/modules/audio_device/audio_device.gypi	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/modules/audio_device/audio_device.gypi
 @@ -49,7 +49,7 @@
          'dummy/file_audio_device.h',
        ],
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
index 7015d8530b42..53452089f85f 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
@@ -1,6 +1,6 @@
---- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2014-08-20 21:04:19.000000000 +0200
-+++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi	2014-08-22 15:06:27.000000000 +0200
-@@ -107,6 +107,11 @@
+--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
+@@ -109,6 +109,11 @@
              ],
            },
          }],
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
index f33da8cfd0d6..544bb93c5410 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
+++ b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2014-08-20 21:04:19.000000000 +0200
-+++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
 @@ -15,6 +15,7 @@
  #include <string.h>
  
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
index 8819aeaee6dc..950e7b3ad0e2 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
+++ b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig	2014-08-20 21:04:18.000000000 +0200
-+++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/modules/video_coding/main/source/receiver.cc
 @@ -134,8 +134,8 @@
    // Assume that render timing errors are due to changes in the video stream.
    if (next_render_time_ms < 0) {
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
index 6dde8fdd8447..b1ba0d24232f 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2014-08-20 21:04:27.000000000 +0200
-+++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc
 @@ -12,7 +12,11 @@
  
  #include <assert.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
index 6f03a3bc066c..360a5fce2a6e 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig	2014-08-20 21:04:27.000000000 +0200
-+++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/system_wrappers/source/cpu_info.cc
 @@ -12,7 +12,10 @@
  
  #if defined(_WIN32)
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
index 0a36fc24289e..8d7a76cfb6f6 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2014-08-20 21:04:27.000000000 +0200
-+++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/system_wrappers/source/thread_posix.cc
 @@ -51,9 +51,11 @@
  #include <string.h>  // strncpy
  #include <unistd.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
index b97af8be5dc8..93d4ab14441b 100644
--- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
+++ b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
@@ -1,5 +1,5 @@
---- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2014-08-20 21:04:25.000000000 +0200
-+++ ./third_party/webrtc/voice_engine/voice_engine_defines.h	2014-08-22 15:06:27.000000000 +0200
+--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2014-10-02 17:40:34 UTC
++++ third_party/webrtc/voice_engine/voice_engine_defines.h
 @@ -237,7 +237,7 @@
  #include <pthread.h>
  #include <sys/socket.h>
diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
index 4d8632efc42d..20eb0aa948fa 100644
--- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
+++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
@@ -1,6 +1,6 @@
---- ./tools/gyp/pylib/gyp/generator/make.py.orig	2014-08-20 21:04:05.000000000 +0200
-+++ ./tools/gyp/pylib/gyp/generator/make.py	2014-08-22 15:06:27.000000000 +0200
-@@ -87,7 +87,7 @@
+--- tools/gyp/pylib/gyp/generator/make.py.orig	2014-10-02 17:40:30 UTC
++++ tools/gyp/pylib/gyp/generator/make.py
+@@ -88,7 +88,7 @@
    else:
      operating_system = flavor
      if flavor == 'android':
@@ -9,7 +9,7 @@
      default_variables.setdefault('OS', operating_system)
      default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
      default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
-@@ -275,7 +275,7 @@
+@@ -276,7 +276,7 @@
  CFLAGS.target ?= $(CFLAGS)
  CXX.target ?= %(CXX.target)s
  CXXFLAGS.target ?= $(CXXFLAGS)
@@ -18,7 +18,7 @@
  LDFLAGS.target ?= $(LDFLAGS)
  AR.target ?= $(AR)
  
-@@ -292,13 +292,13 @@
+@@ -293,13 +293,13 @@
  
  # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
  # to replicate this environment fallback in make as well.
@@ -39,7 +39,7 @@
  
  # Define a dir function that can handle spaces.
  # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1787,7 +1787,7 @@
+@@ -1824,7 +1824,7 @@
        return modules
  
      # Retrieve the default value of 'SHARED_LIB_SUFFIX'
diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
index 0ef63f92ba6d..bf8b5326125e 100644
--- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
+++ b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
@@ -1,5 +1,5 @@
---- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2014-08-20 21:04:18.000000000 +0200
-+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp	2014-08-22 15:06:27.000000000 +0200
+--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2014-10-02 17:40:30 UTC
++++ tools/gyp/test/additional-targets/src/dir1/actions.gyp
 @@ -47,7 +47,7 @@
      },
    ],
diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
index 93aa591819a8..09fbdedc774e 100644
--- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
+++ b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
@@ -1,5 +1,5 @@
---- ./tools/gyp/test/library/src/library.gyp.orig	2014-08-20 21:04:18.000000000 +0200
-+++ ./tools/gyp/test/library/src/library.gyp	2014-08-22 15:06:27.000000000 +0200
+--- tools/gyp/test/library/src/library.gyp.orig	2014-10-02 17:40:30 UTC
++++ tools/gyp/test/library/src/library.gyp
 @@ -48,7 +48,7 @@
      },
    ],
diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.cc b/www/chromium/files/patch-ui__app_list__app_list_constants.cc
index de20c5751d6a..33a346e62861 100644
--- a/www/chromium/files/patch-ui__app_list__app_list_constants.cc
+++ b/www/chromium/files/patch-ui__app_list__app_list_constants.cc
@@ -1,6 +1,6 @@
---- ./ui/app_list/app_list_constants.cc.orig	2014-08-20 21:02:20.000000000 +0200
-+++ ./ui/app_list/app_list_constants.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -88,7 +88,7 @@
+--- ui/app_list/app_list_constants.cc.orig	2014-10-02 17:39:48 UTC
++++ ui/app_list/app_list_constants.cc
+@@ -95,7 +95,7 @@
  const ui::ResourceBundle::FontStyle kItemTextFontStyle =
      ui::ResourceBundle::SmallBoldFont;
  
diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.h b/www/chromium/files/patch-ui__app_list__app_list_constants.h
index 5d32e886dbfd..58a9bd2cbffd 100644
--- a/www/chromium/files/patch-ui__app_list__app_list_constants.h
+++ b/www/chromium/files/patch-ui__app_list__app_list_constants.h
@@ -1,6 +1,6 @@
---- ./ui/app_list/app_list_constants.h.orig	2014-08-20 21:02:20.000000000 +0200
-+++ ./ui/app_list/app_list_constants.h	2014-08-22 15:06:27.000000000 +0200
-@@ -62,8 +62,8 @@
+--- ui/app_list/app_list_constants.h.orig	2014-10-02 17:39:48 UTC
++++ ui/app_list/app_list_constants.h
+@@ -66,8 +66,8 @@
  
  APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle;
  
diff --git a/www/chromium/files/patch-ui__base__ui_base.gyp b/www/chromium/files/patch-ui__base__ui_base.gyp
index e5379f85e76a..4c0fd7628092 100644
--- a/www/chromium/files/patch-ui__base__ui_base.gyp
+++ b/www/chromium/files/patch-ui__base__ui_base.gyp
@@ -1,6 +1,6 @@
---- ./ui/base/ui_base.gyp.orig	2014-08-20 21:02:15.000000000 +0200
-+++ ./ui/base/ui_base.gyp	2014-08-22 15:06:27.000000000 +0200
-@@ -366,7 +366,7 @@
+--- ui/base/ui_base.gyp.orig	2014-10-02 17:39:48 UTC
++++ ui/base/ui_base.gyp
+@@ -427,7 +427,7 @@
              'x/selection_utils.h',
            ]
          }],
diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc
index b5692997715c..10656707bfb5 100644
--- a/www/chromium/files/patch-ui__events__event_switches.cc
+++ b/www/chromium/files/patch-ui__events__event_switches.cc
@@ -1,8 +1,8 @@
---- ./ui/events/event_switches.cc.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/events/event_switches.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -32,7 +32,7 @@
- //   disabled: Use the aura gesture detector.
- const char kUnifiedGestureDetectorDisabled[] = "disabled";
+--- ui/events/event_switches.cc.orig	2014-10-02 17:39:48 UTC
++++ ui/events/event_switches.cc
+@@ -39,7 +39,7 @@
+ const char kCompensateForUnstablePinchZoom[] =
+     "compensate-for-unstable-pinch-zoom";
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h
index dd7952be42ac..07ea0f37e972 100644
--- a/www/chromium/files/patch-ui__events__event_switches.h
+++ b/www/chromium/files/patch-ui__events__event_switches.h
@@ -1,8 +1,8 @@
---- ./ui/events/event_switches.h.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/events/event_switches.h	2014-08-22 15:06:27.000000000 +0200
-@@ -20,7 +20,7 @@
- EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorEnabled[];
+--- ui/events/event_switches.h.orig	2014-10-02 17:39:48 UTC
++++ ui/events/event_switches.h
+@@ -21,7 +21,7 @@
  EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorDisabled[];
+ EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp
index 9e422eb6e602..4ba85d435130 100644
--- a/www/chromium/files/patch-ui__gl__gl.gyp
+++ b/www/chromium/files/patch-ui__gl__gl.gyp
@@ -1,6 +1,6 @@
---- ./ui/gl/gl.gyp.orig	2014-08-20 21:02:15.000000000 +0200
-+++ ./ui/gl/gl.gyp	2014-08-22 15:06:27.000000000 +0200
-@@ -171,7 +171,7 @@
+--- ui/gl/gl.gyp.orig	2014-10-02 17:39:48 UTC
++++ ui/gl/gl.gyp
+@@ -174,7 +174,7 @@
          },
        ],
        'conditions': [
@@ -9,7 +9,7 @@
            'sources': [
              'egl_util.cc',
              'egl_util.h',
-@@ -190,7 +190,7 @@
+@@ -195,7 +195,7 @@
              '<(DEPTH)/third_party/khronos',
          ],
          }],
diff --git a/www/chromium/files/patch-ui__resources__ui_resources.grd b/www/chromium/files/patch-ui__resources__ui_resources.grd
deleted file mode 100644
index 9540badb4cac..000000000000
--- a/www/chromium/files/patch-ui__resources__ui_resources.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/resources/ui_resources.grd.orig	2014-09-10 01:47:14.000000000 +0200
-+++ ui/resources/ui_resources.grd	2014-09-17 13:51:43.000000000 +0200
-@@ -39,7 +39,7 @@
-         <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" />
-         <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" />
-       </if>
--      <if expr="is_linux and use_aura">
-+      <if expr="(is_linux or is_bsd) and use_aura">
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
diff --git a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
index 8b086bae6f79..8937c44b0cb7 100644
--- a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
+++ b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
@@ -1,6 +1,6 @@
---- ./ui/shell_dialogs/select_file_dialog.cc.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/shell_dialogs/select_file_dialog.cc	2014-08-22 15:06:27.000000000 +0200
-@@ -20,7 +20,7 @@
+--- ui/shell_dialogs/select_file_dialog.cc.orig	2014-10-02 17:19:03 UTC
++++ ui/shell_dialogs/select_file_dialog.cc
+@@ -19,7 +19,7 @@
  #include "ui/shell_dialogs/select_file_dialog_mac.h"
  #elif defined(OS_ANDROID)
  #include "ui/shell_dialogs/select_file_dialog_android.h"
@@ -9,7 +9,7 @@
  #include "ui/shell_dialogs/linux_shell_dialog.h"
  #endif
  
-@@ -76,7 +76,7 @@
+@@ -75,7 +75,7 @@
        return dialog;
    }
  
diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp
index 9a05d9004926..45c3b5892859 100644
--- a/www/chromium/files/patch-ui__views__views.gyp
+++ b/www/chromium/files/patch-ui__views__views.gyp
@@ -1,6 +1,6 @@
---- ./ui/views/views.gyp.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/views/views.gyp	2014-08-22 15:06:27.000000000 +0200
-@@ -490,7 +490,7 @@
+--- ui/views/views.gyp.orig	2014-10-02 17:39:48 UTC
++++ ui/views/views.gyp
+@@ -605,7 +605,7 @@
              '../display/display.gyp:display_util',
            ],
          }],
diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc
index dcccda1ed2f9..41174dbbc365 100644
--- a/www/chromium/files/patch-ui__views__views_delegate.cc
+++ b/www/chromium/files/patch-ui__views__views_delegate.cc
@@ -1,5 +1,5 @@
---- ./ui/views/views_delegate.cc.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/views/views_delegate.cc	2014-08-22 15:06:27.000000000 +0200
+--- ui/views/views_delegate.cc.orig	2014-10-02 17:19:03 UTC
++++ ui/views/views_delegate.cc
 @@ -50,7 +50,7 @@
  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
    return false;
diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h
index fcf56090bc95..3b7a8d1647ec 100644
--- a/www/chromium/files/patch-ui__views__views_delegate.h
+++ b/www/chromium/files/patch-ui__views__views_delegate.h
@@ -1,5 +1,5 @@
---- ./ui/views/views_delegate.h.orig	2014-08-20 21:02:18.000000000 +0200
-+++ ./ui/views/views_delegate.h	2014-08-22 15:06:27.000000000 +0200
+--- ui/views/views_delegate.h.orig	2014-10-02 17:19:03 UTC
++++ ui/views/views_delegate.h
 @@ -98,7 +98,7 @@
    // Returns true if the window passed in is in the Windows 8 metro
    // environment.
diff --git a/www/chromium/files/patch-ui__views__window__custom_frame_view.cc b/www/chromium/files/patch-ui__views__window__custom_frame_view.cc
new file mode 100644
index 000000000000..ce53449abb5c
--- /dev/null
+++ b/www/chromium/files/patch-ui__views__window__custom_frame_view.cc
@@ -0,0 +1,11 @@
+--- ui/views/window/custom_frame_view.cc.orig	2014-10-06 09:19:47.000000000 +0200
++++ ui/views/window/custom_frame_view.cc	2014-10-06 09:20:31.000000000 +0200
+@@ -281,7 +281,7 @@
+ int CustomFrameView::CaptionButtonY() const {
+   // Maximized buttons start at window top so that even if their images aren't
+   // drawn flush with the screen edge, they still obey Fitts' Law.
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   return FrameBorderThickness();
+ #else
+   return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/www/chromium/files/patch-v8__src__platform-freebsd.cc b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
index 493b2e470d13..d9cfe09fd719 100644
--- a/www/chromium/files/patch-v8__src__platform-freebsd.cc
+++ b/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc
@@ -1,6 +1,6 @@
---- ./v8/src/platform-freebsd.cc.orig	2014-08-20 21:04:33.000000000 +0200
-+++ ./v8/src/platform-freebsd.cc	2014-08-22 18:16:57.000000000 +0200
-@@ -130,14 +130,14 @@
+--- v8/src/base/platform/platform-freebsd.cc.orig	2014-10-02 17:41:11 UTC
++++ v8/src/base/platform/platform-freebsd.cc
+@@ -131,14 +131,14 @@
      addr_buffer[0] = '0';
      addr_buffer[1] = 'x';
      addr_buffer[10] = 0;
@@ -21,7 +21,7 @@
      unsigned end = StringToLong(addr_buffer);
      char buffer[MAP_LENGTH];
      int bytes_read = -1;
-@@ -145,8 +145,8 @@
+@@ -146,8 +146,8 @@
        bytes_read++;
        if (bytes_read >= MAP_LENGTH - 1)
          break;
diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
new file mode 100644
index 000000000000..d7bbced0213a
--- /dev/null
+++ b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
@@ -0,0 +1,12 @@
+--- v8/src/base/platform/platform-posix.cc.orig	2014-10-02 17:41:11 UTC
++++ v8/src/base/platform/platform-posix.cc
+@@ -324,7 +324,9 @@
+ #if defined(ANDROID)
+   return static_cast<int>(syscall(__NR_gettid));
+ #else
++#ifdef HAVE_SYSCALL_H
+   return static_cast<int>(syscall(SYS_gettid));
++#endif
+ #endif  // defined(ANDROID)
+ }
+ 
diff --git a/www/chromium/files/patch-v8__src__preparser.h b/www/chromium/files/patch-v8__src__preparser.h
new file mode 100644
index 000000000000..12fa993b6abf
--- /dev/null
+++ b/www/chromium/files/patch-v8__src__preparser.h
@@ -0,0 +1,11 @@
+--- v8/src/preparser.h.orig	2014-10-02 17:41:11 UTC
++++ v8/src/preparser.h
+@@ -437,7 +437,7 @@
+   void ReportMessageAt(Scanner::Location location, const char* message,
+                        bool is_reference_error = false) {
+     Traits::ReportMessageAt(location, message,
+-                            reinterpret_cast<const char*>(NULL),
++                            reinterpret_cast<const char*>(__null),
+                             is_reference_error);
+   }
+ 
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 0793ed3770eb..571c5b9e4683 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -63,7 +63,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/mksnapshot
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/extension/demo/library.js
-%%DATADIR%%/resources/inspector/Images/addIcon.png
 %%DATADIR%%/resources/inspector/Images/applicationCache.png
 %%DATADIR%%/resources/inspector/Images/back.png
 %%DATADIR%%/resources/inspector/Images/breakpoint.png
@@ -71,11 +70,17 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png
 %%DATADIR%%/resources/inspector/Images/breakpoint_2x.png
 %%DATADIR%%/resources/inspector/Images/checker.png
+%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png
+%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png
+%%DATADIR%%/resources/inspector/Images/chromeSelect.png
+%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
 %%DATADIR%%/resources/inspector/Images/cookie.png
 %%DATADIR%%/resources/inspector/Images/database.png
 %%DATADIR%%/resources/inspector/Images/databaseTable.png
 %%DATADIR%%/resources/inspector/Images/deleteIcon.png
 %%DATADIR%%/resources/inspector/Images/domain.png
+%%DATADIR%%/resources/inspector/Images/errorWave.png
+%%DATADIR%%/resources/inspector/Images/errorWave_2x.png
 %%DATADIR%%/resources/inspector/Images/fileSystem.png
 %%DATADIR%%/resources/inspector/Images/forward.png
 %%DATADIR%%/resources/inspector/Images/frame.png
@@ -91,7 +96,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png
 %%DATADIR%%/resources/inspector/Images/paneFilterButtons.png
 %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png
-%%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png
 %%DATADIR%%/resources/inspector/Images/popoverArrows.png
 %%DATADIR%%/resources/inspector/Images/popoverBackground.png
 %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
@@ -123,94 +127,65 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/thumbHoverVert.png
 %%DATADIR%%/resources/inspector/Images/thumbVert.png
 %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png
-%%DATADIR%%/resources/inspector/Images/trackHoriz.png
-%%DATADIR%%/resources/inspector/Images/trackVert.png
 %%DATADIR%%/resources/inspector/accelerometer.css
-%%DATADIR%%/resources/inspector/audits/AuditsPanel.js
+%%DATADIR%%/resources/inspector/audits/_module.js
 %%DATADIR%%/resources/inspector/auditsPanel.css
-%%DATADIR%%/resources/inspector/breadcrumbList.css
 %%DATADIR%%/resources/inspector/breakpointsList.css
 %%DATADIR%%/resources/inspector/canvasProfiler.css
-%%DATADIR%%/resources/inspector/cm/cmdevtools.css
 %%DATADIR%%/resources/inspector/cm/codemirror.css
-%%DATADIR%%/resources/inspector/console/ConsolePanel.js
+%%DATADIR%%/resources/inspector/cmdevtools.css
+%%DATADIR%%/resources/inspector/console/_module.js
 %%DATADIR%%/resources/inspector/dataGrid.css
-%%DATADIR%%/resources/inspector/devices/DevicesView.js
+%%DATADIR%%/resources/inspector/devices/_module.js
 %%DATADIR%%/resources/inspector/devicesView.css
 %%DATADIR%%/resources/inspector/devtools.html
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
-%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
+%%DATADIR%%/resources/inspector/documentation/_module.js
+%%DATADIR%%/resources/inspector/elements/_module.js
 %%DATADIR%%/resources/inspector/elementsPanel.css
-%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js
+%%DATADIR%%/resources/inspector/extensions/_module.js
 %%DATADIR%%/resources/inspector/filter.css
 %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css
 %%DATADIR%%/resources/inspector/flameChart.css
 %%DATADIR%%/resources/inspector/heapProfiler.css
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/_module.js
 %%DATADIR%%/resources/inspector/helpScreen.css
 %%DATADIR%%/resources/inspector/indexedDBViews.css
 %%DATADIR%%/resources/inspector/inspector.css
 %%DATADIR%%/resources/inspector/inspectorCommon.css
-%%DATADIR%%/resources/inspector/layers/LayersPanel.js
+%%DATADIR%%/resources/inspector/layers/_module.js
 %%DATADIR%%/resources/inspector/layersPanel.css
 %%DATADIR%%/resources/inspector/main/Main.js
 %%DATADIR%%/resources/inspector/navigatorView.css
-%%DATADIR%%/resources/inspector/network/NetworkPanel.js
+%%DATADIR%%/resources/inspector/network/_module.js
 %%DATADIR%%/resources/inspector/networkLogView.css
 %%DATADIR%%/resources/inspector/networkPanel.css
 %%DATADIR%%/resources/inspector/overrides.css
 %%DATADIR%%/resources/inspector/panelEnablerView.css
-%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js
-%%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker/HeapSnapshotWorker.js
+%%DATADIR%%/resources/inspector/profiler/_module.js
 %%DATADIR%%/resources/inspector/profilesPanel.css
+%%DATADIR%%/resources/inspector/requestCookiesView.css
+%%DATADIR%%/resources/inspector/requestHeadersView.css
 %%DATADIR%%/resources/inspector/resourceView.css
-%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js
+%%DATADIR%%/resources/inspector/resources/_module.js
 %%DATADIR%%/resources/inspector/resourcesPanel.css
 %%DATADIR%%/resources/inspector/responsiveDesignView.css
 %%DATADIR%%/resources/inspector/revisionHistory.css
 %%DATADIR%%/resources/inspector/screencastView.css
-%%DATADIR%%/resources/inspector/script_formatter_worker/ScriptFormatterWorker.js
-%%DATADIR%%/resources/inspector/search/AdvancedSearchView.js
-%%DATADIR%%/resources/inspector/settings/SettingsScreen.js
-%%DATADIR%%/resources/inspector/sidebarPane.css
-%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js
-%%DATADIR%%/resources/inspector/sources/SourcesPanel.js
+%%DATADIR%%/resources/inspector/script_formatter_worker/_module.js
+%%DATADIR%%/resources/inspector/settings/_module.js
+%%DATADIR%%/resources/inspector/source_frame/_module.js
+%%DATADIR%%/resources/inspector/sources/_module.js
 %%DATADIR%%/resources/inspector/sourcesPanel.css
 %%DATADIR%%/resources/inspector/sourcesView.css
 %%DATADIR%%/resources/inspector/spectrum.css
-%%DATADIR%%/resources/inspector/splitView.css
-%%DATADIR%%/resources/inspector/suggestBox.css
-%%DATADIR%%/resources/inspector/temp_storage_shared_worker/TempStorageSharedWorker.js
-%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js
+%%DATADIR%%/resources/inspector/temp_storage_shared_worker/_module.js
+%%DATADIR%%/resources/inspector/timeline/_module.js
 %%DATADIR%%/resources/inspector/timelinePanel.css
+%%DATADIR%%/resources/inspector/webSocketFrameView.css
 share/icons/hicolor/128x128/apps/chrome.png
 share/icons/hicolor/22x22/apps/chrome.png
 share/icons/hicolor/24x24/apps/chrome.png
 share/icons/hicolor/256x256/apps/chrome.png
 share/icons/hicolor/48x48/apps/chrome.png
 share/icons/hicolor/64x64/apps/chrome.png
-@dirrmtry %%DATADIR%%/locales
-@dirrmtry %%DATADIR%%/resources/extension/demo
-@dirrmtry %%DATADIR%%/resources/extension
-@dirrmtry %%DATADIR%%/resources/inspector/Images
-@dirrmtry %%DATADIR%%/resources/inspector/audits
-@dirrmtry %%DATADIR%%/resources/inspector/cm
-@dirrmtry %%DATADIR%%/resources/inspector/console
-@dirrmtry %%DATADIR%%/resources/inspector/devices
-@dirrmtry %%DATADIR%%/resources/inspector/elements
-@dirrmtry %%DATADIR%%/resources/inspector/extensions
-@dirrmtry %%DATADIR%%/resources/inspector/layers
-@dirrmtry %%DATADIR%%/resources/inspector/main
-@dirrmtry %%DATADIR%%/resources/inspector/network
-@dirrmtry %%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker
-@dirrmtry %%DATADIR%%/resources/inspector/profiler
-@dirrmtry %%DATADIR%%/resources/inspector/resources
-@dirrmtry %%DATADIR%%/resources/inspector/script_formatter_worker
-@dirrmtry %%DATADIR%%/resources/inspector/search
-@dirrmtry %%DATADIR%%/resources/inspector/settings
-@dirrmtry %%DATADIR%%/resources/inspector/source_frame
-@dirrmtry %%DATADIR%%/resources/inspector/sources
-@dirrmtry %%DATADIR%%/resources/inspector/temp_storage_shared_worker
-@dirrmtry %%DATADIR%%/resources/inspector/timeline
-@dirrmtry %%DATADIR%%/resources/inspector
-@dirrmtry %%DATADIR%%/resources
-@dirrmtry %%DATADIR%%