Attachment 179266 Details for Bug 215271 – patch-chromium-use-system-ffmpeg

[patch] patch-chromium-use-system-ffmpeg

chromium.diff (text/plain), 438.95 KB, created by Carlos J. Puga Medina on 2017-01-24 00:05:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-01-24 00:05:08 UTC

Size: 438.95 KB

patch

obsolete

>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 432254)
>+++ www/chromium/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	55.0.2883.87
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
>@@ -13,12 +14,13 @@
> LICENSE=	BSD3CLAUSE LGPL21 MPL
> LICENSE_COMB=	multi
> 
>-BUILD_DEPENDS=	bash:shells/bash \
>+BUILD_DEPENDS=	gperf:devel/gperf \
> 		clang39:devel/llvm39 \
>+		yasm:devel/yasm \
> 		python:lang/python \
>+		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
>+		bash:shells/bash \
> 		flock:sysutils/flock \
>-		gperf:devel/gperf \
>-		yasm:devel/yasm \
> 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
> 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
> 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
>@@ -25,34 +27,35 @@
> 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
> 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
> 
>-LIB_DEPENDS=	libcairo.so:graphics/cairo \
>-		libcups.so:print/cups \
>+LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
>+		libsnappy.so:archivers/snappy \
>+		libFLAC.so:audio/flac \
>+		libspeex.so:audio/speex \
> 		libdbus-1.so:devel/dbus \
> 		libdbus-glib-1.so:devel/dbus-glib \
>+		libicuuc.so:devel/icu \
>+		libjsoncpp.so:devel/jsoncpp \
>+		libpci.so:devel/libpci \
>+		libnspr4.so:devel/nspr \
>+		libre2.so:devel/re2 \
>+		libcairo.so:graphics/cairo \
> 		libdrm.so:graphics/libdrm \
>-		libexpat.so:textproc/expat2 \
>-		libFLAC.so:audio/flac \
>+		libexif.so:graphics/libexif \
>+		libpng.so:graphics/png \
>+		libwebp.so:graphics/webp \
>+		libavcodec.so:multimedia/ffmpeg \
>+		libcups.so:print/cups \
> 		libfreetype.so:print/freetype2 \
>-		libgnome-keyring.so:security/libgnome-keyring \
> 		libharfbuzz.so:print/harfbuzz \
>-		libexif.so:graphics/libexif \
>-		libfontconfig.so:x11-fonts/fontconfig \
> 		libgcrypt.so:security/libgcrypt \
>-		libicuuc.so:devel/icu \
>-		libjsoncpp.so:devel/jsoncpp \
>-		libnspr4.so:devel/nspr \
>+		libgnome-keyring.so:security/libgnome-keyring \
> 		libnss3.so:security/nss \
>-		libpci.so:devel/libpci \
>-		libpng.so:graphics/png \
>-		libre2.so:devel/re2 \
>-		libsnappy.so:archivers/snappy \
>-		libspeechd.so:accessibility/speech-dispatcher \
>-		libspeex.so:audio/speex \
>-		libwebp.so:graphics/webp \
>-		libxml2.so:textproc/libxml2
>+		libexpat.so:textproc/expat2 \
>+		libxml2.so:textproc/libxml2 \
>+		libfontconfig.so:x11-fonts/fontconfig
> 
>-RUN_DEPENDS=	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
>-		xdg-open:devel/xdg-utils
>+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
>+		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
> 
> ONLY_FOR_ARCHS=	i386 amd64
> USES=		compiler bison cpe desktop-file-utils execinfo jpeg \
>@@ -110,7 +113,7 @@
> OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
> OPTIONS_GROUP_TESTS=	DEBUG TEST
> 
>-OPTIONS_DEFAULT=	CODECS GCONF KERBEROS ALSA PULSEAUDIO
>+OPTIONS_DEFAULT=	ALSA CODECS DRIVER GCONF KERBEROS
> OPTIONS_SUB=		yes
> 
> GCONF_USE=	GNOME=gconf2
>@@ -117,7 +120,8 @@
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
> ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
> 			alsa-lib>=1.1.1_1:audio/alsa-lib
>-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
>+ALSA_RUN_DEPENDS_OFF=	${BUILD_DEPENDS:M*pulseaudio*}
>+PULSEAUDIO_BUILD_DEPENDS=	pulseaudio>0:audio/pulseaudio
> DRIVER_MAKE_ARGS=chromedriver
> TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
> 
>@@ -224,7 +228,7 @@
> 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
> 	cd ${WRKSRC} && ${PYTHON_CMD} \
> 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
>-		flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
>+		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
> 
> do-configure:
> 	# GN generator bootstrapping and generating ninja files
>Index: www/chromium/files/patch-BUILD.gn
>===================================================================
>--- www/chromium/files/patch-BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- BUILD.gn.orig	2016-12-01 23:02:04 UTC
>+--- BUILD.gn.orig	2016-12-09 05:04:13 UTC
> +++ BUILD.gn
> @@ -215,7 +215,7 @@ group("both_gn_and_gyp") {
>      ]
>Index: www/chromium/files/patch-base_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-base_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-base_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- base/BUILD.gn.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/BUILD.gn	2016-10-25 21:49:35.259700000 +0300
>-@@ -1051,6 +1051,35 @@
>+--- base/BUILD.gn.orig	2016-12-09 05:04:13 UTC
>++++ base/BUILD.gn
>+@@ -1064,6 +1064,35 @@ component("base") {
>      public_deps += [ "//base/allocator:unified_allocator_shim" ]
>    }
>  
>@@ -36,7 +36,7 @@
>    # Allow more direct string conversions on platforms with native utf8
>    # strings
>    if (is_mac || is_ios || is_chromeos || is_chromecast) {
>-@@ -1322,7 +1351,7 @@
>+@@ -1337,7 +1366,7 @@ component("base") {
>    }
>  
>    # Linux.
>@@ -45,7 +45,7 @@
>      if (is_asan || is_lsan || is_msan || is_tsan) {
>        # For llvm-sanitizer.
>        data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
>-@@ -1347,7 +1376,7 @@
>+@@ -1362,7 +1391,7 @@ component("base") {
>        "//base/third_party/xdg_user_dirs",
>      ]
>    } else {
>@@ -54,7 +54,7 @@
>      sources -= [
>        "nix/mime_util_xdg.cc",
>        "nix/mime_util_xdg.h",
>-@@ -1363,6 +1392,13 @@
>+@@ -1378,6 +1407,13 @@ component("base") {
>      }
>    }
>  
>@@ -68,7 +68,7 @@
>    # iOS
>    if (is_ios) {
>      set_sources_assignment_filter([])
>-@@ -2117,6 +2153,12 @@
>+@@ -2137,6 +2173,12 @@ test("base_unittests") {
>      set_sources_assignment_filter(sources_assignment_filter)
>    }
>  
>Index: www/chromium/files/patch-base__trace_event__process_memory_dump.h
>===================================================================
>--- www/chromium/files/patch-base__trace_event__process_memory_dump.h	(revision 432254)
>+++ www/chromium/files/patch-base__trace_event__process_memory_dump.h	(working copy)
>@@ -1,6 +1,6 @@
>---- base/trace_event/process_memory_dump.h.orig	2016-05-25 15:00:55.000000000 -0400
>-+++ base/trace_event/process_memory_dump.h	2016-05-27 01:46:53.167565000 -0400
>-@@ -23,7 +23,7 @@
>+--- base/trace_event/process_memory_dump.h.orig	2016-12-09 05:04:13 UTC
>++++ base/trace_event/process_memory_dump.h
>+@@ -24,7 +24,7 @@
>  
>  // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
>  // resident memory.
>Index: www/chromium/files/patch-base_allocator_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-base_allocator_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-base_allocator_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- base/allocator/BUILD.gn.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/allocator/BUILD.gn	2016-10-13 04:07:29.886540000 +0300
>-@@ -330,6 +330,9 @@
>+--- base/allocator/BUILD.gn.orig	2016-12-09 05:04:13 UTC
>++++ base/allocator/BUILD.gn
>+@@ -333,6 +333,9 @@ if (use_experimental_allocator_shim) {
>        ]
>      } else if (is_linux && use_allocator == "none") {
>        sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ]
>Index: www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
>===================================================================
>--- www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc	(revision 432254)
>+++ www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2016-12-01 23:02:05 UTC
>+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
> @@ -3,19 +3,28 @@
>  // found in the LICENSE file.
>Index: www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h
>===================================================================
>--- www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h	(revision 432254)
>+++ www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h	(working copy)
>@@ -1,11 +1,11 @@
>---- base/allocator/allocator_shim_override_libc_symbols.h.orig	2016-08-13 16:23:28.370905000 +0300
>-+++ base/allocator/allocator_shim_override_libc_symbols.h	2016-08-13 16:23:33.784774000 +0300
>+--- base/allocator/allocator_shim_override_libc_symbols.h.orig	2016-12-09 05:04:13 UTC
>++++ base/allocator/allocator_shim_override_libc_symbols.h
> @@ -10,7 +10,7 @@
>  #endif
>  #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_
>-
>+ 
> -#include <malloc.h>
> +#include <stdlib.h>
>-
>+ 
>  #include "base/allocator/allocator_shim_internals.h"
>-
>+ 
>Index: www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/allocator/allocator_shim_unittest.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/allocator/allocator_shim_unittest.cc	2016-10-25 21:48:23.218013000 +0300
>+--- base/allocator/allocator_shim_unittest.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/allocator/allocator_shim_unittest.cc
> @@ -4,7 +4,6 @@
>  
>  #include "base/allocator/allocator_shim.h"
>@@ -8,7 +8,7 @@
>  #include <stdlib.h>
>  #include <string.h>
>  
>-@@ -193,11 +192,13 @@
>+@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
>    ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);
>  
>  #if !defined(OS_WIN)
>@@ -22,7 +22,7 @@
>  
>    void* posix_memalign_ptr = nullptr;
>    int res = posix_memalign(&posix_memalign_ptr, 256, 59);
>-@@ -214,12 +215,14 @@
>+@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
>    ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
>    ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
>  
>@@ -37,7 +37,7 @@
>  #endif  // OS_WIN
>  
>    char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));
>-@@ -240,8 +243,10 @@
>+@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
>    ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
>  
>  #if !defined(OS_WIN)
>@@ -48,7 +48,7 @@
>  
>    free(posix_memalign_ptr);
>    ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);
>-@@ -249,8 +254,10 @@
>+@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
>    free(valloc_ptr);
>    ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);
>  
>Index: www/chromium/files/patch-base_debug_proc__maps__linux.cc
>===================================================================
>--- www/chromium/files/patch-base_debug_proc__maps__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-base_debug_proc__maps__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/debug/proc_maps_linux.cc.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/debug/proc_maps_linux.cc	2016-09-05 22:49:53.622055000 +0300
>+--- base/debug/proc_maps_linux.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/debug/proc_maps_linux.cc
> @@ -12,7 +12,7 @@
>  #include "base/strings/string_split.h"
>  #include "build/build_config.h"
>Index: www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc
>===================================================================
>--- www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc	(revision 432254)
>+++ www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/debug/scoped_thread_heap_usage.cc.orig	2016-12-12 23:57:03 UTC
>+--- base/debug/scoped_thread_heap_usage.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/debug/scoped_thread_heap_usage.cc
> @@ -14,11 +14,13 @@
>  #include "base/threading/thread_local_storage.h"
>Index: www/chromium/files/patch-base_debug_stack__trace__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_debug_stack__trace__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_debug_stack__trace__posix.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/debug/stack_trace_posix.cc.orig	2016-05-11 19:02:11 UTC
>+--- base/debug/stack_trace_posix.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/debug/stack_trace_posix.cc
> @@ -571,6 +571,10 @@ class SandboxSymbolizeHelper {
>    // for the modules that are loaded in the current process.
>Index: www/chromium/files/patch-base_files_file__path__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_files_file__path__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_files_file__path__unittest.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/files/file_path_unittest.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/files/file_path_unittest.cc	2016-10-25 21:44:53.079388000 +0300
>-@@ -1133,7 +1133,7 @@
>+--- base/files/file_path_unittest.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/files/file_path_unittest.cc
>+@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_
>        "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
>    };
>  
>Index: www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
>===================================================================
>--- www/chromium/files/patch-base_files_file__path__watcher__kqueue.h	(revision 432254)
>+++ www/chromium/files/patch-base_files_file__path__watcher__kqueue.h	(working copy)
>@@ -1,4 +1,4 @@
>---- base/files/file_path_watcher_kqueue.h.orig	2016-03-25 13:04:44 UTC
>+--- base/files/file_path_watcher_kqueue.h.orig	2016-12-09 05:04:13 UTC
> +++ base/files/file_path_watcher_kqueue.h
> @@ -5,6 +5,10 @@
>  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
>@@ -9,5 +9,5 @@
> +#include <sys/types.h>
> +#endif
>  #include <sys/event.h>
>- #include <vector>
>  
>+ #include <memory>
>Index: www/chromium/files/patch-base_files_file__util.h
>===================================================================
>--- www/chromium/files/patch-base_files_file__util.h	(revision 432254)
>+++ www/chromium/files/patch-base_files_file__util.h	(working copy)
>@@ -1,6 +1,6 @@
>---- base/files/file_util.h.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/files/file_util.h	2016-09-05 23:00:09.940024000 +0300
>-@@ -391,7 +391,7 @@
>+--- base/files/file_util.h.orig	2016-12-09 05:04:13 UTC
>++++ base/files/file_util.h
>+@@ -393,7 +393,7 @@ BASE_EXPORT bool VerifyPathControlledByA
>  // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
>  BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
>  
>Index: www/chromium/files/patch-base_linux__util.cc
>===================================================================
>--- www/chromium/files/patch-base_linux__util.cc	(revision 432254)
>+++ www/chromium/files/patch-base_linux__util.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/linux_util.cc.orig	2016-08-13 05:03:14.838982000 +0300
>-+++ base/linux_util.cc	2016-08-13 05:04:48.912092000 +0300
>-@@ -86,12 +86,14 @@
>+--- base/linux_util.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/linux_util.cc
>+@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
>      "CrOS";
>  #elif defined(OS_ANDROID)
>      "Android";
>@@ -9,7 +9,7 @@
>  #else  // if defined(OS_LINUX)
>      "Unknown";
>  #endif
>-
>+ 
>  std::string GetLinuxDistro() {
> -#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
> +#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
>Index: www/chromium/files/patch-base_native__library__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_native__library__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_native__library__posix.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- base/native_library_posix.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/native_library_posix.cc	2016-10-14 03:14:48.329757000 +0300
>-@@ -35,7 +35,7 @@
>-   // versions. Crash here to warn developers that they're trying to rely on
>-   // uncertain behavior.
>+--- base/native_library_posix.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/native_library_posix.cc
>+@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio
>+   // further investigation, as it might vary across versions. Crash here to
>+   // warn developers that they're trying to rely on uncertain behavior.
>    CHECK(!options.prefer_own_symbols);
> -#else
> +#elif !defined(OS_BSD)
>Index: www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
>===================================================================
>--- www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/posix/unix_domain_socket_linux.cc.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/posix/unix_domain_socket_linux.cc	2016-09-06 23:39:53.563078000 +0300
>+--- base/posix/unix_domain_socket_linux.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/posix/unix_domain_socket_linux.cc
> @@ -23,6 +23,15 @@
>  
>  namespace base {
>@@ -16,7 +16,7 @@
>  const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
>  
>  #if !defined(OS_NACL_NONSFI)
>-@@ -40,8 +49,14 @@
>+@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o
>  
>  // static
>  bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
>@@ -31,7 +31,7 @@
>  }
>  #endif  // !defined(OS_NACL_NONSFI)
>  
>-@@ -147,7 +162,11 @@
>+@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
>        // The PNaCl toolchain for Non-SFI binary build does not support
>        // SCM_CREDENTIALS.
>        if (cmsg->cmsg_level == SOL_SOCKET &&
>Index: www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/posix/unix_domain_socket_linux_unittest.cc.orig	2016-03-25 13:04:44 UTC
>+--- base/posix/unix_domain_socket_linux_unittest.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/posix/unix_domain_socket_linux_unittest.cc
> @@ -2,10 +2,15 @@
>  // Use of this source code is governed by a BSD-style license that can be
>Index: www/chromium/files/patch-base_process_internal__linux.h
>===================================================================
>--- www/chromium/files/patch-base_process_internal__linux.h	(revision 432254)
>+++ www/chromium/files/patch-base_process_internal__linux.h	(working copy)
>@@ -1,4 +1,4 @@
>---- base/process/internal_linux.h.orig	2016-03-25 13:04:44 UTC
>+--- base/process/internal_linux.h.orig	2016-12-09 05:04:13 UTC
> +++ base/process/internal_linux.h
> @@ -14,6 +14,8 @@
>  
>Index: www/chromium/files/patch-base_process_launch.cc
>===================================================================
>--- www/chromium/files/patch-base_process_launch.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_launch.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/launch.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/launch.cc	2016-10-13 04:27:47.136877000 +0300
>-@@ -15,7 +15,7 @@
>+--- base/process/launch.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/process/launch.cc
>+@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
>  
>  LaunchOptions LaunchOptionsForTest() {
>    LaunchOptions options;
>Index: www/chromium/files/patch-base_process_launch.h
>===================================================================
>--- www/chromium/files/patch-base_process_launch.h	(revision 432254)
>+++ www/chromium/files/patch-base_process_launch.h	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/launch.h.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/launch.h	2016-10-13 04:27:24.908534000 +0300
>-@@ -138,7 +138,7 @@
>+--- base/process/launch.h.orig	2016-12-09 05:04:13 UTC
>++++ base/process/launch.h
>+@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
>    // will be the same as its pid.
>    bool new_process_group = false;
>  
>@@ -9,7 +9,7 @@
>    // If non-zero, start the process using clone(), using flags as provided.
>    // Unlike in clone, clone_flags may not contain a custom termination signal
>    // that is sent to the parent when the child dies. The termination signal will
>-@@ -151,7 +151,7 @@
>+@@ -151,7 +151,7 @@ struct BASE_EXPORT LaunchOptions {
>  
>    // Sets parent process death signal to SIGKILL.
>    bool kill_on_parent_death = false;
>@@ -17,4 +17,4 @@
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  
>  #if defined(OS_POSIX)
>-   // If non-null, a delegate to be run immediately prior to executing the new
>+   // If not empty, launch the specified executable instead of
>Index: www/chromium/files/patch-base_process_launch__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_process_launch__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_launch__posix.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/process/launch_posix.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/launch_posix.cc	2016-10-16 15:45:00.730008000 +0300
>+--- base/process/launch_posix.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/process/launch_posix.cc
> @@ -62,6 +62,7 @@
>  #include <sys/event.h>
>  #else
>Index: www/chromium/files/patch-base_process_memory.h
>===================================================================
>--- www/chromium/files/patch-base_process_memory.h	(revision 432254)
>+++ www/chromium/files/patch-base_process_memory.h	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/memory.h.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/process/memory.h	2016-09-11 01:10:36.394804000 +0300
>-@@ -32,7 +32,7 @@
>+--- base/process/memory.h.orig	2016-12-09 05:04:13 UTC
>++++ base/process/memory.h
>+@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO
>  // Crash reporting classifies such crashes as OOM.
>  BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
>  
>Index: www/chromium/files/patch-base_process_memory__stubs.cc
>===================================================================
>--- www/chromium/files/patch-base_process_memory__stubs.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_memory__stubs.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/memory_stubs.cc.orig	2016-03-25 13:04:44 UTC
>+--- base/process/memory_stubs.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/process/memory_stubs.cc
>-@@ -27,6 +27,8 @@ bool AdjustOOMScore(ProcessId process, i
>+@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t 
>  // their respective stdlib function since those functions will return null on a
>  // failure to allocate.
>  
>@@ -9,7 +9,7 @@
>  bool UncheckedMalloc(size_t size, void** result) {
>    *result = malloc(size);
>    return *result != nullptr;
>-@@ -36,5 +38,6 @@ bool UncheckedCalloc(size_t num_items, s
>+@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s
>    *result = calloc(num_items, size);
>    return *result != nullptr;
>  }
>Index: www/chromium/files/patch-base_process_memory__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_process_memory__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_memory__unittest.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/memory_unittest.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/memory_unittest.cc	2016-10-13 04:32:50.457987000 +0300
>-@@ -82,10 +82,10 @@
>+--- base/process/memory_unittest.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/process/memory_unittest.cc
>+@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
>    ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
>  }
>  
>@@ -13,7 +13,7 @@
>      BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
>      !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
>  
>-@@ -439,5 +439,5 @@
>+@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
>    EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
>    EXPECT_TRUE(value_ == NULL);
>  }
>Index: www/chromium/files/patch-base_process_process__handle__freebsd.cc
>===================================================================
>--- www/chromium/files/patch-base_process_process__handle__freebsd.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__handle__freebsd.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/process_handle_freebsd.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/process_handle_freebsd.cc	2016-10-26 19:55:22.341492000 +0300
>-@@ -16,7 +16,7 @@
>+--- base/process/process_handle_freebsd.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/process/process_handle_freebsd.cc
>+@@ -16,7 +16,7 @@ namespace base {
>  
>  ProcessId GetParentProcessId(ProcessHandle process) {
>    struct kinfo_proc info;
>Index: www/chromium/files/patch-base_process_process__info__linux.cc
>===================================================================
>--- www/chromium/files/patch-base_process_process__info__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__info__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/process/process_info_linux.cc.orig	2016-03-25 13:04:44 UTC
>+--- base/process/process_info_linux.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/process/process_info_linux.cc
> @@ -11,10 +11,28 @@
>  #include "base/process/process_handle.h"
>Index: www/chromium/files/patch-base_process_process__iterator__freebsd.cc
>===================================================================
>--- www/chromium/files/patch-base_process_process__iterator__freebsd.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__iterator__freebsd.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- base/process/process_iterator_freebsd.cc.orig	2016-03-25 13:04:44 UTC
>+--- base/process/process_iterator_freebsd.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/process/process_iterator_freebsd.cc
> @@ -10,6 +10,10 @@
>  #include <sys/sysctl.h>
>Index: www/chromium/files/patch-base_process_process__metrics.h
>===================================================================
>--- www/chromium/files/patch-base_process_process__metrics.h	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__metrics.h	(working copy)
>@@ -1,5 +1,5 @@
>---- base/process/process_metrics.h.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/process/process_metrics.h	2016-10-13 12:58:13.818273000 +0300
>+--- base/process/process_metrics.h.orig	2016-12-09 05:04:13 UTC
>++++ base/process/process_metrics.h
> @@ -22,6 +22,12 @@
>  #include "base/values.h"
>  #include "build/build_config.h"
>@@ -13,7 +13,7 @@
>  #if defined(OS_MACOSX)
>  #include <mach/mach.h>
>  #include "base/process/port_provider_mac.h"
>-@@ -326,13 +332,17 @@
>+@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
>  // CPU-related ticks.  Returns -1 on parse error.
>  // Exposed for testing.
>  BASE_EXPORT int ParseProcStatCPU(const std::string& input);
>Index: www/chromium/files/patch-base_process_process__metrics__freebsd.cc
>===================================================================
>--- www/chromium/files/patch-base_process_process__metrics__freebsd.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__metrics__freebsd.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- base/process/process_metrics_freebsd.cc.orig	2016-03-25 13:04:44 UTC
>+--- base/process/process_metrics_freebsd.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/process/process_metrics_freebsd.cc
>-@@ -12,6 +12,9 @@
>- #include "base/macros.h"
>+@@ -13,6 +13,9 @@
>+ #include "base/memory/ptr_util.h"
>  #include "base/sys_info.h"
>  
> +#include <unistd.h> /* getpagesize() */
>@@ -10,7 +10,7 @@
>  namespace base {
>  
>  ProcessMetrics::ProcessMetrics(ProcessHandle process)
>-@@ -121,4 +124,23 @@ size_t GetSystemCommitCharge() {
>+@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() {
>    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
>  }
>  
>Index: www/chromium/files/patch-base_process_process__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_process_process__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_process_process__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/process/process_posix.cc.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/process/process_posix.cc	2016-09-11 02:18:36.481940000 +0300
>-@@ -20,8 +20,18 @@
>+--- base/process/process_posix.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/process/process_posix.cc
>+@@ -21,8 +21,18 @@
>  #include <sys/event.h>
>  #endif
>  
>@@ -19,7 +19,7 @@
>  #if !defined(OS_NACL_NONSFI)
>  
>  bool WaitpidWithTimeout(base::ProcessHandle handle,
>-@@ -183,13 +193,13 @@
>+@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
>    base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
>    base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
>    if (parent_pid != our_pid) {
>@@ -36,7 +36,7 @@
>    }
>  
>    int status;
>-@@ -256,12 +266,16 @@
>+@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro
>    return Process(handle);
>  }
>  
>@@ -55,7 +55,7 @@
>  
>  bool Process::IsValid() const {
>    return process_ != kNullProcessHandle;
>-@@ -361,15 +375,32 @@
>+@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim
>  bool Process::IsProcessBackgrounded() const {
>    // See SetProcessBackgrounded().
>    DCHECK(IsValid());
>Index: www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/profiler/stack_sampling_profiler_unittest.cc	2016-10-25 21:31:13.576230000 +0300
>+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/profiler/stack_sampling_profiler_unittest.cc
> @@ -30,7 +30,7 @@
>  #include <intrin.h>
>  #include <malloc.h>
>Index: www/chromium/files/patch-base_security__unittest.cc
>===================================================================
>--- www/chromium/files/patch-base_security__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-base_security__unittest.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/security_unittest.cc.orig	2016-05-11 19:02:11 UTC
>+--- base/security_unittest.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/security_unittest.cc
>-@@ -73,7 +73,7 @@ bool IsTcMallocBypassed() {
>+@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
>  // FAILS_ is too clunky.
>  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
>    if (!overflow_detected) {
>Index: www/chromium/files/patch-base_sys__info__freebsd.cc
>===================================================================
>--- www/chromium/files/patch-base_sys__info__freebsd.cc	(revision 432254)
>+++ www/chromium/files/patch-base_sys__info__freebsd.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- base/sys_info_freebsd.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/sys_info_freebsd.cc	2016-10-13 10:20:37.344204000 +0300
>+--- base/sys_info_freebsd.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/sys_info_freebsd.cc
> @@ -12,12 +12,34 @@
>  
>  namespace base {
>@@ -39,7 +39,7 @@
>      NOTREACHED();
>      return 0;
>    }
>-@@ -25,14 +47,24 @@
>+@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory(
>  }
>  
>  // static
>Index: www/chromium/files/patch-base_sys__info__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_sys__info__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_sys__info__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/sys_info_posix.cc.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/sys_info_posix.cc	2016-09-24 01:27:31.548122000 +0300
>-@@ -30,7 +30,7 @@
>+--- base/sys_info_posix.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/sys_info_posix.cc
>+@@ -35,7 +35,7 @@
>  
>  namespace {
>  
>@@ -9,7 +9,7 @@
>  int NumberOfProcessors() {
>    // sysconf returns the number of "logical" (not "physical") processors on both
>    // Mac and Linux.  So we get the number of max available "logical" processors.
>-@@ -77,7 +77,7 @@
>+@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa
>  
>  namespace base {
>  
>Index: www/chromium/files/patch-base_test_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-base_test_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-base_test_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- base/test/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/test/BUILD.gn	2016-09-02 23:56:39.647089000 +0300
>-@@ -249,7 +249,7 @@
>+--- base/test/BUILD.gn.orig	2016-12-09 05:04:13 UTC
>++++ base/test/BUILD.gn
>+@@ -301,7 +301,7 @@ static_library("run_all_base_unittests")
>    ]
>  }
>  
>Index: www/chromium/files/patch-base_test_launcher_test__launcher.cc
>===================================================================
>--- www/chromium/files/patch-base_test_launcher_test__launcher.cc	(revision 432254)
>+++ www/chromium/files/patch-base_test_launcher_test__launcher.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/test/launcher/test_launcher.cc.orig	2016-05-11 19:02:11 UTC
>+--- base/test/launcher/test_launcher.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/test/launcher/test_launcher.cc
>-@@ -52,6 +52,10 @@
>+@@ -59,6 +59,10 @@
>  #include "base/win/windows_version.h"
>  #endif
>  
>Index: www/chromium/files/patch-base_test_test__file__util__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_test_test__file__util__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_test_test__file__util__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/test/test_file_util_posix.cc.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ base/test/test_file_util_posix.cc	2016-10-25 21:44:27.287523000 +0300
>-@@ -79,7 +79,7 @@
>+--- base/test/test_file_util_posix.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/test/test_file_util_posix.cc
>+@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo
>    return DeleteFile(file, recurse);
>  }
>  
>Index: www/chromium/files/patch-base_third__party_libevent_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-base_third__party_libevent_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-base_third__party_libevent_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- base/third_party/libevent/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ base/third_party/libevent/BUILD.gn	2016-10-12 18:30:43.933710000 +0300
>-@@ -29,6 +29,9 @@
>+--- base/third_party/libevent/BUILD.gn.orig	2016-12-09 05:04:13 UTC
>++++ base/third_party/libevent/BUILD.gn
>+@@ -29,6 +29,9 @@ static_library("libevent") {
>    } else if (is_linux) {
>      sources += [ "epoll.c" ]
>      include_dirs = [ "linux" ]
>Index: www/chromium/files/patch-base_threading_platform__thread__posix.cc
>===================================================================
>--- www/chromium/files/patch-base_threading_platform__thread__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-base_threading_platform__thread__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/threading/platform_thread_posix.cc.orig	2016-05-11 19:02:11 UTC
>+--- base/threading/platform_thread_posix.cc.orig	2016-12-09 05:04:13 UTC
> +++ base/threading/platform_thread_posix.cc
>-@@ -53,7 +53,7 @@ void* ThreadFunc(void* params) {
>+@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
>      if (!thread_params->joinable)
>        base::ThreadRestrictions::SetSingletonAllowed(false);
>  
>Index: www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
>===================================================================
>--- www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc	(revision 432254)
>+++ www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/trace_event/malloc_dump_provider.cc.orig	2016-07-20 22:03:18.000000000 +0300
>-+++ base/trace_event/malloc_dump_provider.cc	2016-08-14 13:06:10.819247000 +0300
>-@@ -20,7 +20,7 @@
>+--- base/trace_event/malloc_dump_provider.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/trace_event/malloc_dump_provider.cc
>+@@ -21,7 +21,7 @@
>  #if defined(OS_MACOSX)
>  #include <malloc/malloc.h>
>  #else
>@@ -7,5 +7,5 @@
> -#include <malloc.h>
> +#include <stdlib.h>
>  #endif
>-
>- namespace base {
>+ #if defined(OS_WIN)
>+ #include <windows.h>
>Index: www/chromium/files/patch-base_trace__event_process__memory__dump.cc
>===================================================================
>--- www/chromium/files/patch-base_trace__event_process__memory__dump.cc	(revision 432254)
>+++ www/chromium/files/patch-base_trace__event_process__memory__dump.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- base/trace_event/process_memory_dump.cc.orig	2016-05-27 10:29:07.111255000 -0400
>-+++ base/trace_event/process_memory_dump.cc	2016-05-27 10:29:28.215964000 -0400
>-@@ -83,7 +83,7 @@
>+--- base/trace_event/process_memory_dump.cc.orig	2016-12-09 05:04:13 UTC
>++++ base/trace_event/process_memory_dump.cc
>+@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB
>    const size_t kMaxChunkSize = 8 * 1024 * 1024;
>    size_t max_vec_size =
>        GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
>Index: www/chromium/files/patch-breakpad_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-breakpad_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-breakpad_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- breakpad/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ breakpad/BUILD.gn	2016-09-03 00:07:22.742094000 +0300
>-@@ -420,7 +420,7 @@
>+--- breakpad/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ breakpad/BUILD.gn
>+@@ -468,7 +468,7 @@ if (is_mac) {
>    }
>  }
>  
>Index: www/chromium/files/patch-build_config_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/BUILD.gn.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/config/BUILD.gn	2016-10-13 04:42:48.294016000 +0300
>-@@ -297,7 +297,7 @@
>+--- build/config/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/BUILD.gn
>+@@ -289,7 +289,7 @@ config("debug") {
>        # builds, and we have to tell it to turn it off.
>        defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
>      }
>@@ -9,7 +9,7 @@
>      # Enable libstdc++ debugging facilities to help catch problems early, see
>      # http://crbug.com/65151 .
>      # TODO(phajdan.jr): Should we enable this for all of POSIX?
>-@@ -411,7 +411,7 @@
>+@@ -403,7 +403,7 @@ config("executable_config") {
>      ]
>    } else if (is_ios) {
>      configs += [ "//build/config/ios:ios_dynamic_flags" ]
>Index: www/chromium/files/patch-build_config_BUILDCONFIG.gn
>===================================================================
>--- www/chromium/files/patch-build_config_BUILDCONFIG.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_BUILDCONFIG.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/BUILDCONFIG.gn.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/config/BUILDCONFIG.gn	2016-10-13 04:48:31.029743000 +0300
>-@@ -134,12 +134,13 @@
>+--- build/config/BUILDCONFIG.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/BUILDCONFIG.gn
>+@@ -134,12 +134,13 @@ declare_args() {
>    is_debug = !is_official_build
>  
>    # Whether we're a traditional desktop unix.
>@@ -16,7 +16,7 @@
>  
>    # Allows the path to a custom target toolchain to be injected as a single
>    # argument, and set as the default toolchain.
>-@@ -183,8 +184,8 @@
>+@@ -183,8 +184,8 @@ if (host_toolchain == "") {
>    # TODO(dpranke): Add some sort of assert here that verifies that
>    # no toolchain omitted host_toolchain from its toolchain_args().
>  
>@@ -27,7 +27,7 @@
>        # TODO(dpranke) - is_clang normally applies only to the target
>        # build, and there is no way to indicate that you want to override
>        # it for both the target build *and* the host build. Do we need to
>-@@ -220,7 +221,7 @@
>+@@ -220,7 +221,7 @@ if (target_os == "android") {
>    } else {
>      _default_toolchain = "//build/toolchain/android:$target_cpu"
>    }
>@@ -36,7 +36,7 @@
>    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
>    if (is_clang) {
>      _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
>-@@ -340,8 +341,17 @@
>+@@ -340,8 +341,17 @@ if (current_os == "win" || current_os ==
>    is_nacl = false
>    is_posix = true
>    is_win = false
>@@ -55,7 +55,7 @@
>  # =============================================================================
>  # SOURCES FILTERS
>  # =============================================================================
>-@@ -410,7 +420,7 @@
>+@@ -410,7 +420,7 @@ if (!is_ios) {
>  if (!is_mac && !is_ios) {
>    sources_assignment_filter += [ "*.mm" ]
>  }
>Index: www/chromium/files/patch-build_config_allocator.gni
>===================================================================
>--- www/chromium/files/patch-build_config_allocator.gni	(revision 432254)
>+++ www/chromium/files/patch-build_config_allocator.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/allocator.gni.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/config/allocator.gni	2016-10-13 10:29:19.634367000 +0300
>-@@ -44,7 +44,7 @@
>+--- build/config/allocator.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/config/allocator.gni
>+@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al
>  assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
>  
>  assert(
>Index: www/chromium/files/patch-build_config_clang_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_clang_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_clang_BUILD.gn	(working copy)
>@@ -1,8 +1,8 @@
>---- build/config/clang/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/clang/BUILD.gn	2016-09-03 01:38:15.236274000 +0300
>-@@ -21,7 +21,7 @@
>-             "//third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
>-             root_build_dir),
>+--- build/config/clang/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/clang/BUILD.gn
>+@@ -20,7 +20,7 @@ config("find_bad_constructs") {
>+         rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
>+                     root_build_dir),
>        ]
> -    } else if (is_linux || is_android) {
> +    } else if (is_linux || is_bsd || is_android) {
>@@ -9,8 +9,8 @@
>        cflags += [
>          "-Xclang",
>          "-load",
>-@@ -51,7 +51,7 @@
>-       "check-implicit-copy-ctors",
>+@@ -37,7 +37,7 @@ config("find_bad_constructs") {
>+       "find-bad-constructs",
>      ]
>  
> -    if ((is_linux || is_android) && !is_chromecast) {
>Index: www/chromium/files/patch-build_config_compiler_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_compiler_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_compiler_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- build/config/compiler/BUILD.gn.orig	2016-12-01 23:02:05 UTC
>+--- build/config/compiler/BUILD.gn.orig	2016-12-09 05:04:14 UTC
> +++ build/config/compiler/BUILD.gn
> @@ -153,7 +153,7 @@ config("compiler") {
>      configs += [ "//build/config/win:compiler" ]
>Index: www/chromium/files/patch-build_config_crypto.gni
>===================================================================
>--- www/chromium/files/patch-build_config_crypto.gni	(revision 432254)
>+++ www/chromium/files/patch-build_config_crypto.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/crypto.gni.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/crypto.gni	2016-09-03 01:37:11.785915000 +0300
>-@@ -20,4 +20,4 @@
>+--- build/config/crypto.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/config/crypto.gni
>+@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac
>  
>  # True if NSS is used for certificate handling. It is possible to use OpenSSL
>  # for the crypto library, but NSS for the platform certificate library.
>Index: www/chromium/files/patch-build_config_features.gni
>===================================================================
>--- www/chromium/files/patch-build_config_features.gni	(revision 432254)
>+++ www/chromium/files/patch-build_config_features.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/features.gni.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/features.gni	2016-09-01 02:42:02.955488000 +0300
>-@@ -22,7 +22,7 @@
>+--- build/config/features.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/config/features.gni
>+@@ -22,7 +22,7 @@ if (is_android) {
>  
>  declare_args() {
>    # Multicast DNS.
>@@ -9,7 +9,7 @@
>  
>    enable_extensions = !is_android && !is_ios
>    enable_plugins = (!is_android && !is_ios) || is_chromecast
>-@@ -100,13 +100,13 @@
>+@@ -97,13 +97,13 @@ declare_args() {
>    # libudev usage. This currently only affects the content layer.
>    use_udev = is_linux && !is_chromecast
>  
>@@ -25,8 +25,8 @@
> +  use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast
>  
>    # Enable basic printing support and UI.
>-   enable_basic_printing = !is_chromeos && !is_chromecast && !is_ios
>-@@ -126,7 +126,7 @@
>+   enable_basic_printing = !is_chromecast && !is_ios
>+@@ -135,7 +135,7 @@ use_minikin_hyphenation = is_android
>  
>  # Enables the use of CDMs in pepper plugins.
>  enable_pepper_cdms =
>Index: www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- build/config/linux/gtk2/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/linux/gtk2/BUILD.gn	2016-09-02 22:54:36.628597000 +0300
>+--- build/config/linux/gtk2/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/linux/gtk2/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>  import("//build/config/linux/pkg_config.gni")
>Index: www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- build/config/linux/gtk3/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/linux/gtk3/BUILD.gn	2016-09-03 01:35:58.974361000 +0300
>+--- build/config/linux/gtk3/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/linux/gtk3/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>  import("//build/config/linux/pkg_config.gni")
>Index: www/chromium/files/patch-build_config_linux_pkg-config.py
>===================================================================
>--- www/chromium/files/patch-build_config_linux_pkg-config.py	(revision 432254)
>+++ www/chromium/files/patch-build_config_linux_pkg-config.py	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/linux/pkg-config.py.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/linux/pkg-config.py	2016-09-04 01:43:37.226981000 +0300
>-@@ -57,8 +57,12 @@
>+--- build/config/linux/pkg-config.py.orig	2016-12-09 05:04:14 UTC
>++++ build/config/linux/pkg-config.py
>+@@ -57,8 +57,12 @@ def SetConfigPath(options):
>      print "You must specify an architecture via -a if using a sysroot."
>      sys.exit(1)
>  
>@@ -15,7 +15,7 @@
>    os.environ['PKG_CONFIG_LIBDIR'] = libdir
>    return libdir
>  
>-@@ -107,7 +111,7 @@
>+@@ -107,7 +111,7 @@ def main():
>    # If this is run on non-Linux platforms, just return nothing and indicate
>    # success. This allows us to "kind of emulate" a Linux build from other
>    # platforms.
>Index: www/chromium/files/patch-build_config_sanitizers_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_config_sanitizers_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_config_sanitizers_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/sanitizers/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/config/sanitizers/BUILD.gn	2016-09-03 00:19:39.656881000 +0300
>-@@ -280,7 +280,7 @@
>+--- build/config/sanitizers/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/config/sanitizers/BUILD.gn
>+@@ -405,7 +405,7 @@ config("lsan_flags") {
>  
>  config("msan_flags") {
>    if (is_msan) {
>@@ -9,7 +9,7 @@
>      msan_blacklist_path =
>          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
>      cflags = [
>-@@ -293,7 +293,7 @@
>+@@ -418,7 +418,7 @@ config("msan_flags") {
>  
>  config("tsan_flags") {
>    if (is_tsan) {
>Index: www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
>===================================================================
>--- www/chromium/files/patch-build_config_sanitizers_sanitizers.gni	(revision 432254)
>+++ www/chromium/files/patch-build_config_sanitizers_sanitizers.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/sanitizers/sanitizers.gni.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/config/sanitizers/sanitizers.gni	2016-10-24 22:57:06.565590000 +0300
>-@@ -53,8 +53,8 @@
>+--- build/config/sanitizers/sanitizers.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/config/sanitizers/sanitizers.gni
>+@@ -53,8 +53,8 @@ declare_args() {
>    # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
>    #
>    # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
>Index: www/chromium/files/patch-build_config_ui.gni
>===================================================================
>--- www/chromium/files/patch-build_config_ui.gni	(revision 432254)
>+++ www/chromium/files/patch-build_config_ui.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/config/ui.gni.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/config/ui.gni	2016-10-13 05:04:25.545377000 +0300
>-@@ -31,7 +31,7 @@
>+--- build/config/ui.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/config/ui.gni
>+@@ -31,7 +31,7 @@ declare_args() {
>  
>    # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
>    # of a replacement for GDI or GTK.
>@@ -9,7 +9,7 @@
>  
>    # True means the UI is built using the "views" framework.
>    toolkit_views =
>-@@ -47,7 +47,7 @@
>+@@ -47,7 +47,7 @@ declare_args() {
>    use_xkbcommon = false
>  
>    # Whether we should use glib, a low level C utility library.
>@@ -18,7 +18,7 @@
>  
>    # Indicates if Wayland display server support is enabled.
>    enable_wayland_server = is_chromeos
>-@@ -65,19 +65,19 @@
>+@@ -65,19 +65,19 @@ declare_args() {
>  
>  # Use GPU accelerated cross process image transport by default on linux builds
>  # with the Aura window manager.
>Index: www/chromium/files/patch-build_linux_libpci_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_linux_libpci_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_linux_libpci_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- build/linux/libpci/BUILD.gn.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/linux/libpci/BUILD.gn	2016-10-29 18:17:51.990988000 +0300
>+--- build/linux/libpci/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/linux/libpci/BUILD.gn
> @@ -3,20 +3,36 @@
>  # found in the LICENSE file.
>  
>@@ -12,7 +12,10 @@
> -  output_h = "libpci.h"
> -  output_cc = "libpci_loader.cc"
> -  header = "<pci/pci.h>"
>--
>++declare_args() {
>++  use_system_libpci = is_bsd
>++}
>+ 
> -  functions = [
> -    "pci_alloc",
> -    "pci_init",
>@@ -21,10 +24,6 @@
> -    "pci_fill_info",
> -    "pci_lookup_name",
> -  ]
>-+declare_args() {
>-+  use_system_libpci = is_bsd
>-+}
>-+
> +if (use_system_libpci) {
> +  pkg_config("system_libpci") {
> +    packages = [ "libpci" ]
>Index: www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-build_secondary_third__party_nss_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- build/secondary/third_party/nss/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ build/secondary/third_party/nss/BUILD.gn	2016-09-03 00:19:12.999091000 +0300
>+--- build/secondary/third_party/nss/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ build/secondary/third_party/nss/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>  import("//build/config/linux/pkg_config.gni")
>Index: www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
>===================================================================
>--- www/chromium/files/patch-build_toolchain_gcc__toolchain.gni	(revision 432254)
>+++ www/chromium/files/patch-build_toolchain_gcc__toolchain.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- build/toolchain/gcc_toolchain.gni.orig	2016-12-09 05:04:14.000000000 +0000
>-+++ build/toolchain/gcc_toolchain.gni	2016-12-21 23:03:46.063519000 +0000
>-@@ -11,6 +11,11 @@
>+--- build/toolchain/gcc_toolchain.gni.orig	2016-12-09 05:04:14 UTC
>++++ build/toolchain/gcc_toolchain.gni
>+@@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni
>  import("//build/toolchain/goma.gni")
>  import("//build/toolchain/toolchain.gni")
>  
>@@ -12,7 +12,7 @@
>  # This template defines a toolchain for something that works like gcc
>  # (including clang).
>  #
>-@@ -482,14 +487,23 @@
>+@@ -482,14 +487,23 @@ template("clang_toolchain") {
>    }
>  
>    gcc_toolchain(target_name) {
>@@ -20,10 +20,6 @@
> -    cc = "$prefix/clang"
> -    cxx = "$prefix/clang++"
> -    ld = cxx
>--
>--    readelf = "${toolprefix}readelf"
>--    ar = "${toolprefix}ar"
>--    nm = "${toolprefix}nm"
> +    if (is_bsd) {
> +      cc = "${toolprefix}clang39"
> +      cxx = "${toolprefix}clang++39"
>@@ -36,7 +32,10 @@
> +      cc = "$prefix/clang"
> +      cxx = "$prefix/clang++"
> +      ld = cxx
>-+
>+ 
>+-    readelf = "${toolprefix}readelf"
>+-    ar = "${toolprefix}ar"
>+-    nm = "${toolprefix}nm"
> +      readelf = "${toolprefix}readelf"
> +      ar = "${toolprefix}ar"
> +      nm = "${toolprefix}nm"
>Index: www/chromium/files/patch-build_toolchain_get__concurrent__links.py
>===================================================================
>--- www/chromium/files/patch-build_toolchain_get__concurrent__links.py	(revision 432254)
>+++ www/chromium/files/patch-build_toolchain_get__concurrent__links.py	(working copy)
>@@ -1,6 +1,6 @@
>---- build/toolchain/get_concurrent_links.py.orig	2016-10-06 04:02:08.000000000 +0300
>-+++ build/toolchain/get_concurrent_links.py	2016-10-13 05:28:45.448027000 +0300
>-@@ -45,6 +45,14 @@
>+--- build/toolchain/get_concurrent_links.py.orig	2016-12-09 05:04:14 UTC
>++++ build/toolchain/get_concurrent_links.py
>+@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
>        return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
>      except Exception:
>        return 0
>Index: www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
>===================================================================
>--- www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc	(revision 432254)
>+++ www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- cc/layers/scrollbar_layer_impl_base.cc.orig	2016-03-25 13:04:44 UTC
>+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2016-12-09 05:04:14 UTC
> +++ cc/layers/scrollbar_layer_impl_base.cc
>-@@ -181,8 +181,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
>+@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
>    int thumb_offset = TrackStart();
>    if (maximum > 0) {
>      float ratio = clamped_current_pos / maximum;
>Index: www/chromium/files/patch-cc_trees_property__tree.cc
>===================================================================
>--- www/chromium/files/patch-cc_trees_property__tree.cc	(revision 432254)
>+++ www/chromium/files/patch-cc_trees_property__tree.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- cc/trees/property_tree.cc.orig	2016-05-27 18:17:35.339678000 -0400
>-+++ cc/trees/property_tree.cc	2016-05-27 18:29:09.640334000 -0400
>-@@ -1488,13 +1488,13 @@
>+--- cc/trees/property_tree.cc.orig	2016-12-09 05:04:14 UTC
>++++ cc/trees/property_tree.cc
>+@@ -1439,13 +1439,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
>  
>    gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
>  
>@@ -17,4 +17,4 @@
> +  return _max_offset;
>  }
>  
>- gfx::Size ScrollTree::scroll_clip_layer_bounds(int scroll_node_id) const {
>+ void ScrollTree::OnScrollOffsetAnimated(int layer_id,
>Index: www/chromium/files/patch-chrome_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/BUILD.gn.orig	2016-08-03 22:02:10.000000000 +0300
>-+++ chrome/BUILD.gn	2016-09-03 00:02:50.206193000 +0300
>-@@ -86,7 +86,7 @@
>+--- chrome/BUILD.gn.orig	2016-12-09 05:04:14 UTC
>++++ chrome/BUILD.gn
>+@@ -128,7 +128,7 @@ if (!is_android && !is_mac) {
>      data = [
>        "$root_out_dir/resources.pak",
>      ]
>@@ -9,7 +9,7 @@
>        data += [
>          "$root_out_dir/chrome_100_percent.pak",
>          "$root_out_dir/locales/en-US.pak",
>-@@ -160,7 +160,7 @@
>+@@ -204,7 +204,7 @@ if (!is_android && !is_mac) {
>        sources += [ "app/chrome_exe_main_aura.cc" ]
>      }
>  
>@@ -18,7 +18,7 @@
>        sources += [
>          "app/chrome_dll_resource.h",
>          "app/chrome_main.cc",
>-@@ -1461,7 +1461,7 @@
>+@@ -1492,7 +1492,7 @@ if (enable_resource_whitelist_generation
>    }
>  }
>  
>Index: www/chromium/files/patch-chrome_app_chrome__command__ids.h
>===================================================================
>--- www/chromium/files/patch-chrome_app_chrome__command__ids.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_chrome__command__ids.h	(working copy)
>@@ -1,5 +1,5 @@
>---- chrome/app/chrome_command_ids.h.orig	2016-10-06 04:02:10.000000000 +0300
>-+++ chrome/app/chrome_command_ids.h	2016-10-14 06:38:03.530973000 +0300
>+--- chrome/app/chrome_command_ids.h.orig	2016-12-09 05:04:14 UTC
>++++ chrome/app/chrome_command_ids.h
> @@ -75,7 +75,7 @@
>  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
>  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
>Index: www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
>===================================================================
>--- www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/app/chrome_main_delegate.cc.orig	2016-05-11 19:02:13 UTC
>+--- chrome/app/chrome_main_delegate.cc.orig	2016-12-09 05:04:14 UTC
> +++ chrome/app/chrome_main_delegate.cc
>-@@ -112,7 +112,7 @@
>- #include "ui/base/x/x11_util.h"
>+@@ -116,7 +116,7 @@
>+ #include "ui/base/x/x11_util.h"  // nogncheck
>  #endif
>  
> -#if defined(OS_POSIX) && !defined(OS_MACOSX)
>@@ -9,7 +9,7 @@
>  #include "components/crash/content/app/breakpad_linux.h"
>  #endif
>  
>-@@ -552,7 +552,7 @@ bool ChromeMainDelegate::BasicStartupCom
>+@@ -559,7 +559,7 @@ bool ChromeMainDelegate::BasicStartupCom
>        std::string format_str =
>            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
>        if (format_str == "machine") {
>@@ -18,7 +18,7 @@
>        } else if (format_str == "log") {
>          format = diagnostics::DiagnosticsWriter::LOG;
>        } else {
>-@@ -602,7 +602,7 @@ bool ChromeMainDelegate::BasicStartupCom
>+@@ -609,7 +609,7 @@ bool ChromeMainDelegate::BasicStartupCom
>        std::string format_str =
>            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
>        if (format_str == "machine") {
>@@ -27,7 +27,7 @@
>        } else if (format_str == "human") {
>          format = diagnostics::DiagnosticsWriter::HUMAN;
>        } else {
>-@@ -693,7 +693,7 @@ void ChromeMainDelegate::PreSandboxStart
>+@@ -721,7 +721,7 @@ void ChromeMainDelegate::PreSandboxStart
>    std::string process_type =
>        command_line.GetSwitchValueASCII(switches::kProcessType);
>  
>@@ -36,7 +36,7 @@
>    crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
>  #endif
>  
>-@@ -814,7 +814,7 @@ void ChromeMainDelegate::PreSandboxStart
>+@@ -851,7 +851,7 @@ void ChromeMainDelegate::PreSandboxStart
>    chrome::InitializePDF();
>  #endif
>  
>@@ -45,7 +45,7 @@
>    // Zygote needs to call InitCrashReporter() in RunZygote().
>    if (process_type != switches::kZygoteProcess) {
>  #if defined(OS_ANDROID)
>-@@ -832,7 +832,7 @@ void ChromeMainDelegate::PreSandboxStart
>+@@ -869,7 +869,7 @@ void ChromeMainDelegate::PreSandboxStart
>      breakpad::InitCrashReporter(process_type);
>  #endif  // defined(OS_ANDROID)
>    }
>@@ -54,7 +54,7 @@
>  
>    // After all the platform Breakpads have been initialized, store the command
>    // line for crash reporting.
>-@@ -942,7 +942,7 @@ bool ChromeMainDelegate::DelaySandboxIni
>+@@ -979,7 +979,7 @@ bool ChromeMainDelegate::DelaySandboxIni
>  #endif
>    return process_type == switches::kRelauncherProcess;
>  }
>Index: www/chromium/files/patch-chrome_app_chrome__main__delegate.h
>===================================================================
>--- www/chromium/files/patch-chrome_app_chrome__main__delegate.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_chrome__main__delegate.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/app/chrome_main_delegate.h.orig	2016-05-11 19:02:13 UTC
>+--- chrome/app/chrome_main_delegate.h.orig	2016-12-09 05:04:14 UTC
> +++ chrome/app/chrome_main_delegate.h
>-@@ -38,7 +38,7 @@ class ChromeMainDelegate : public conten
>+@@ -44,7 +44,7 @@ class ChromeMainDelegate : public conten
>        const std::string& process_type) override;
>    bool ShouldSendMachPort(const std::string& process_type) override;
>    bool DelaySandboxInitialization(const std::string& process_type) override;
>Index: www/chromium/files/patch-chrome_app_chromium__strings.grd
>===================================================================
>--- www/chromium/files/patch-chrome_app_chromium__strings.grd	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_chromium__strings.grd	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/app/chromium_strings.grd.orig	2016-05-11 19:02:13 UTC
>+--- chrome/app/chromium_strings.grd.orig	2016-12-09 05:04:14 UTC
> +++ chrome/app/chromium_strings.grd
>-@@ -948,7 +948,7 @@ Signing in anyway will merge Chromium in
>+@@ -936,7 +936,7 @@ Signing in anyway will merge Chromium in
>        </message>
>  
>        
>Index: www/chromium/files/patch-chrome_app_generated__resources.grd
>===================================================================
>--- www/chromium/files/patch-chrome_app_generated__resources.grd	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_generated__resources.grd	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/app/generated_resources.grd.orig	2016-10-06 04:02:10.000000000 +0300
>-+++ chrome/app/generated_resources.grd	2016-10-14 07:09:15.305398000 +0300
>-@@ -6841,7 +6841,7 @@
>+--- chrome/app/generated_resources.grd.orig	2016-12-09 05:04:14 UTC
>++++ chrome/app/generated_resources.grd
>+@@ -6843,7 +6843,7 @@ Keep your key file in a safe place. You 
>        <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
>            Right-to-left
>        </message>
>@@ -9,7 +9,7 @@
>          <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
>            Enable Input IME API
>          </message>
>-@@ -10134,7 +10134,7 @@
>+@@ -10212,7 +10212,7 @@ I don't think this site should be blocke
>        <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
>          Appearance
>        </message>
>@@ -18,7 +18,7 @@
>          <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
>            Themes
>          </message>
>-@@ -10142,7 +10142,7 @@
>+@@ -10220,7 +10220,7 @@ I don't think this site should be blocke
>        <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
>          Reset to default theme
>        </message>
>@@ -27,7 +27,7 @@
>          <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
>            Use GTK+ theme
>          </message>
>-@@ -11429,7 +11429,7 @@
>+@@ -11516,7 +11516,7 @@ Tell us what happened exactly before you
>          Set as default
>        </message>
>  
>Index: www/chromium/files/patch-chrome_app_resources_locale__settings.grd
>===================================================================
>--- www/chromium/files/patch-chrome_app_resources_locale__settings.grd	(revision 432254)
>+++ www/chromium/files/patch-chrome_app_resources_locale__settings.grd	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/app/resources/locale_settings.grd.orig	2016-05-11 19:02:13 UTC
>+--- chrome/app/resources/locale_settings.grd.orig	2016-12-09 05:04:15 UTC
> +++ chrome/app/resources/locale_settings.grd
>-@@ -156,7 +156,7 @@
>+@@ -151,7 +151,7 @@
>          55
>        </message>
>  
>Index: www/chromium/files/patch-chrome_browser_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_browser_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/BUILD.gn.orig	2016-12-01 23:02:06 UTC
>+--- chrome/browser/BUILD.gn.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/BUILD.gn
> @@ -2105,7 +2105,7 @@ split_static_library("browser") {
>      deps += [ "//device/udev_linux" ]
>Index: www/chromium/files/patch-chrome_browser_about__flags.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_about__flags.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_about__flags.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/about_flags.cc.orig	2016-12-01 23:02:06 UTC
>+--- chrome/browser/about_flags.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/about_flags.cc
> @@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = {
>       kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
>Index: www/chromium/files/patch-chrome_browser_browser__process__impl.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_browser__process__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_browser__process__impl.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/browser_process_impl.cc.orig	2016-10-06 04:02:11.000000000 +0300
>-+++ chrome/browser/browser_process_impl.cc	2016-10-16 22:35:35.925144000 +0300
>-@@ -161,7 +161,7 @@
>- #include "chrome/browser/media/webrtc_log_uploader.h"
>+--- chrome/browser/browser_process_impl.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/browser_process_impl.cc
>+@@ -163,7 +163,7 @@
>+ #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
>  #endif
>  
> -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/memory/tab_manager.h"
>  #endif
>  
>-@@ -765,7 +765,7 @@
>+@@ -768,7 +768,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
>  
>  memory::TabManager* BrowserProcessImpl::GetTabManager() {
>    DCHECK(CalledOnValidThread());
>Index: www/chromium/files/patch-chrome_browser_browser__process__impl.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_browser__process__impl.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_browser__process__impl.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/browser_process_impl.h.orig	2016-10-06 04:02:11.000000000 +0300
>-+++ chrome/browser/browser_process_impl.h	2016-10-16 22:37:41.017296000 +0300
>-@@ -336,7 +336,7 @@
>+--- chrome/browser/browser_process_impl.h.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/browser_process_impl.h
>+@@ -338,7 +338,7 @@ class BrowserProcessImpl : public Browse
>  
>    std::unique_ptr<ChromeDeviceClient> device_client_;
>  
>Index: www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_chrome__browser__main.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_chrome__browser__main.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/chrome_browser_main.cc.orig	2016-05-25 15:00:57.000000000 -0400
>-+++ chrome/browser/chrome_browser_main.cc	2016-05-27 09:43:16.154885000 -0400
>-@@ -173,7 +173,7 @@
>+--- chrome/browser/chrome_browser_main.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/chrome_browser_main.cc
>+@@ -183,7 +183,7 @@
>  #include "chrome/browser/feedback/feedback_profile_observer.h"
>  #endif  // defined(OS_ANDROID)
>  
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/first_run/upgrade_util_linux.h"
>  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
>  
>-@@ -1109,11 +1109,11 @@
>+@@ -1301,11 +1301,11 @@ int ChromeBrowserMainParts::PreCreateThr
>    }
>  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
>  
>Index: www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/chrome_browser_main_linux.cc.orig	2016-05-21 16:00:15 UTC
>+--- chrome/browser/chrome_browser_main_linux.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/chrome_browser_main_linux.cc
>-@@ -62,12 +62,14 @@ void ChromeBrowserMainPartsLinux::PrePro
>+@@ -75,12 +75,14 @@ void ChromeBrowserMainPartsLinux::PrePro
>  void ChromeBrowserMainPartsLinux::PostProfileInit() {
>    ChromeBrowserMainPartsPosix::PostProfileInit();
>  
>@@ -16,7 +16,7 @@
>    bluez::DBusThreadManagerLinux::Initialize();
>    bluez::BluezDBusManager::Initialize(
>        bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
>-@@ -77,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PostMa
>+@@ -90,7 +92,7 @@ void ChromeBrowserMainPartsLinux::PostMa
>  }
>  
>  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
>Index: www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/chrome_browser_main_posix.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/chrome_browser_main_posix.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/chrome_browser_main_posix.cc
>-@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMa
>+@@ -275,6 +275,11 @@ void ChromeBrowserMainPartsPosix::PostMa
>      g_pipe_pid = getpid();
>      g_shutdown_pipe_read_fd = pipefd[0];
>      g_shutdown_pipe_write_fd = pipefd[1];
>@@ -12,7 +12,7 @@
>  #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
>      const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
>  #else
>-@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMa
>+@@ -283,6 +288,7 @@ void ChromeBrowserMainPartsPosix::PostMa
>      // size to avoid hitting the guard page.
>      const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
>  #endif
>Index: www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/chrome_content_browser_client.cc.orig	2016-05-11 19:02:13 UTC
>+--- chrome/browser/chrome_content_browser_client.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/chrome_content_browser_client.cc
>-@@ -191,7 +191,7 @@
>- #include "chrome/browser/chromeos/system/input_device_settings.h"
>+@@ -219,7 +219,7 @@
>+ #include "chrome/browser/ui/browser_dialogs.h"
>  #include "chromeos/chromeos_switches.h"
>  #include "components/user_manager/user_manager.h"
> -#elif defined(OS_LINUX)
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/chrome_browser_main_linux.h"
>  #elif defined(OS_ANDROID)
>  #include "chrome/browser/chrome_browser_main_android.h"
>-@@ -204,7 +204,7 @@
>+@@ -231,7 +231,7 @@
>  #include "chrome/browser/chrome_browser_main_posix.h"
>  #endif
>  
>@@ -18,7 +18,7 @@
>  #include "base/debug/leak_annotations.h"
>  #include "components/crash/content/app/breakpad_linux.h"
>  #include "components/crash/content/browser/crash_handler_host_linux.h"
>-@@ -225,7 +225,7 @@
>+@@ -256,7 +256,7 @@
>  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
>  #endif
>  
>@@ -27,7 +27,7 @@
>  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
>  #endif
>  
>-@@ -502,7 +502,7 @@ bool CertMatchesFilter(const net::X509Ce
>+@@ -547,7 +547,7 @@ bool CertMatchesFilter(const net::X509Ce
>    return false;
>  }
>  
>@@ -36,7 +36,7 @@
>  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
>      const std::string& process_type) {
>    base::FilePath dumps_path;
>-@@ -782,7 +782,7 @@ content::BrowserMainParts* ChromeContent
>+@@ -875,7 +875,7 @@ content::BrowserMainParts* ChromeContent
>    main_parts = new ChromeBrowserMainPartsMac(parameters);
>  #elif defined(OS_CHROMEOS)
>    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
>@@ -45,7 +45,7 @@
>    main_parts = new ChromeBrowserMainPartsLinux(parameters);
>  #elif defined(OS_ANDROID)
>    main_parts = new ChromeBrowserMainPartsAndroid(parameters);
>-@@ -798,7 +798,7 @@ content::BrowserMainParts* ChromeContent
>+@@ -891,7 +891,7 @@ content::BrowserMainParts* ChromeContent
>    // Construct additional browser parts. Stages are called in the order in
>    // which they are added.
>  #if defined(TOOLKIT_VIEWS)
>@@ -54,7 +54,7 @@
>    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
>  #else
>    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
>-@@ -1428,7 +1428,7 @@ void ChromeContentBrowserClient::AppendE
>+@@ -1498,7 +1498,7 @@ void ChromeContentBrowserClient::AppendE
>      command_line->AppendSwitchASCII(switches::kMetricsClientID,
>                                      client_info->client_id);
>    }
>@@ -62,8 +62,8 @@
> +#elif defined(OS_POSIX) && !defined(OS_BSD)
>    if (breakpad::IsCrashReporterEnabled()) {
>      std::string switch_value;
>-     scoped_ptr<metrics::ClientInfo> client_info =
>-@@ -2637,7 +2637,7 @@ void ChromeContentBrowserClient::GetAddi
>+     std::unique_ptr<metrics::ClientInfo> client_info =
>+@@ -2807,7 +2807,7 @@ void ChromeContentBrowserClient::GetAddi
>    PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
>    DCHECK(!app_data_path.empty());
>  }
>Index: www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/chrome_content_browser_client.h.orig	2016-05-11 19:02:13 UTC
>+--- chrome/browser/chrome_content_browser_client.h.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/chrome_content_browser_client.h
>-@@ -272,7 +272,7 @@ class ChromeContentBrowserClient : publi
>+@@ -269,7 +269,7 @@ class ChromeContentBrowserClient : publi
>        int child_process_id,
>        content::FileDescriptorInfo* mappings,
>        std::map<int, base::MemoryMappedFile::Region>* regions) override;
>Index: www/chromium/files/patch-chrome_browser_defaults.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_defaults.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_defaults.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/defaults.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/defaults.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/defaults.cc
>-@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
>- const bool kShowOtherBrowsersInAboutMemory = true;
>+@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;
>+ const bool kSyncAutoStarts = false;
>  #endif
>  
> -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>Index: www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/diagnostics/diagnostics_writer.cc
> @@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
>        console_->SetColor(color);
>Index: www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/diagnostics/diagnostics_writer.h
>-@@ -18,7 +18,7 @@ class DiagnosticsWriter : public Diagnos
>+@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos
>   public:
>    // The type of formatting done by this writer.
>    enum FormatType {
>Index: www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/chrome_download_manager_delegate.cc
>-@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDo
>+@@ -772,7 +772,7 @@ void ChromeDownloadManagerDelegate::OnDo
>          target_info->is_filetype_handled_safely)
>        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
>  
>@@ -9,7 +9,7 @@
>      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
>        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
>  #endif
>-@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDo
>+@@ -787,7 +787,7 @@ void ChromeDownloadManagerDelegate::OnDo
>  
>  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
>      const base::FilePath& path) {
>Index: www/chromium/files/patch-chrome_browser_download_download__commands.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__commands.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__commands.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_commands.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/download/download_commands.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_commands.cc
>-@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked(
>+@@ -217,7 +217,7 @@ bool DownloadCommands::IsCommandChecked(
>        return download_item_->GetOpenWhenComplete() ||
>               download_crx_util::IsExtensionDownload(*download_item_);
>      case ALWAYS_OPEN_TYPE:
>@@ -9,7 +9,7 @@
>        if (CanOpenPdfInSystemViewer()) {
>          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
>              download_item_->GetBrowserContext());
>-@@ -254,7 +254,7 @@ void DownloadCommands::ExecuteCommand(Co
>+@@ -261,7 +261,7 @@ void DownloadCommands::ExecuteCommand(Co
>        bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
>        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
>            download_item_->GetBrowserContext());
>@@ -18,7 +18,7 @@
>        if (CanOpenPdfInSystemViewer()) {
>          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
>          DownloadItemModel(download_item_)
>-@@ -352,7 +352,7 @@ Browser* DownloadCommands::GetBrowser() 
>+@@ -374,7 +374,7 @@ Browser* DownloadCommands::GetBrowser() 
>    return browser_displayer.browser();
>  }
>  
>@@ -27,7 +27,7 @@
>  bool DownloadCommands::IsDownloadPdf() const {
>    base::FilePath path = download_item_->GetTargetFilePath();
>    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
>-@@ -369,7 +369,7 @@ bool DownloadCommands::CanOpenPdfInSyste
>+@@ -391,7 +391,7 @@ bool DownloadCommands::CanOpenPdfInSyste
>    return IsDownloadPdf() &&
>           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
>                                            : true);
>Index: www/chromium/files/patch-chrome_browser_download_download__commands.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__commands.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__commands.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_commands.h.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/download/download_commands.h.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_commands.h
>-@@ -42,7 +42,8 @@ class DownloadCommands {
>+@@ -43,7 +43,8 @@ class DownloadCommands {
>    void ExecuteCommand(Command command);
>  
>  #if defined(OS_WIN) || defined(OS_LINUX) || \
>Index: www/chromium/files/patch-chrome_browser_download_download__prefs.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__prefs.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__prefs.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_prefs.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/download/download_prefs.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_prefs.cc
>-@@ -55,7 +55,7 @@ namespace {
>+@@ -56,7 +56,7 @@ namespace {
>  // Consider downloads 'dangerous' if they go to the home directory on Linux and
>  // to the desktop on any platform.
>  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
>@@ -9,7 +9,7 @@
>    base::FilePath home_dir = base::GetHomeDir();
>    if (download_path == home_dir) {
>      return true;
>-@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
>+@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
>                   GetDefaultDownloadDirectoryForProfile()));
>  #endif  // defined(OS_CHROMEOS)
>  
>@@ -16,9 +16,9 @@
> -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
> +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>    should_open_pdf_in_system_reader_ =
>-       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
>- #endif
>-@@ -211,7 +211,7 @@ void DownloadPrefs::RegisterProfilePrefs
>+       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) ||
>+       prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
>+@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs
>                                   default_download_path);
>    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
>                                   default_download_path);
>@@ -27,7 +27,7 @@
>    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
>  #endif
>  }
>-@@ -288,7 +288,7 @@ bool DownloadPrefs::IsDownloadPathManage
>+@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage
>  }
>  
>  bool DownloadPrefs::IsAutoOpenUsed() const {
>@@ -36,7 +36,7 @@
>    if (ShouldOpenPdfInSystemReader())
>      return true;
>  #endif
>-@@ -302,7 +302,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
>+@@ -306,7 +306,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
>      return false;
>    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
>    extension.erase(0, 1);
>@@ -45,7 +45,7 @@
>    if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
>      return true;
>  #endif
>-@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBased
>+@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased
>    SaveAutoOpenState();
>  }
>  
>@@ -52,9 +52,9 @@
> -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
> +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
>-   if (should_open_pdf_in_system_reader_ == should_open)
>-     return;
>-@@ -356,7 +356,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
>+   should_open_pdf_in_system_reader_ = should_open ||
>+      profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
>+@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC
>  #endif
>  
>  void DownloadPrefs::ResetAutoOpen() {
>Index: www/chromium/files/patch-chrome_browser_download_download__prefs.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__prefs.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__prefs.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_prefs.h.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/download/download_prefs.h.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_prefs.h
>-@@ -79,7 +79,7 @@ class DownloadPrefs {
>+@@ -80,7 +80,7 @@ class DownloadPrefs {
>    // Disables auto-open based on file extension.
>    void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
>  
>@@ -9,7 +9,7 @@
>    // Store the user preference to disk. If |should_open| is true, also disable
>    // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
>    void SetShouldOpenPdfInSystemReader(bool should_open);
>-@@ -110,7 +110,7 @@ class DownloadPrefs {
>+@@ -115,7 +115,7 @@ class DownloadPrefs {
>                     AutoOpenCompareFunctor> AutoOpenSet;
>    AutoOpenSet auto_open_;
>  
>@@ -16,5 +16,5 @@
> -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
> +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>    bool should_open_pdf_in_system_reader_;
>+   bool disable_adobe_version_check_for_tests_;
>  #endif
>- 
>Index: www/chromium/files/patch-chrome_browser_download_download__query.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__query.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__query.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_query.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/download/download_query.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_query.cc
>-@@ -31,7 +31,11 @@
>+@@ -28,7 +28,11 @@
>  #include "components/url_formatter/url_formatter.h"
>  #include "content/public/browser/content_browser_client.h"
>  #include "content/public/browser/download_item.h"
>Index: www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/download/download_shelf_context_menu.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/download/download_shelf_context_menu.cc
>-@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu:
>+@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu:
>                     : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
>            break;
>          }
>Index: www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/extensions/BUILD.gn.orig	2016-10-06 04:02:11.000000000 +0300
>-+++ chrome/browser/extensions/BUILD.gn	2016-10-13 05:50:49.572236000 +0300
>-@@ -186,7 +186,7 @@
>+--- chrome/browser/extensions/BUILD.gn.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/extensions/BUILD.gn
>+@@ -1023,7 +1023,7 @@ static_library("extensions") {
>      sources -= [ "global_shortcut_listener_ozone.cc" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      deps += [ "//build/linux:fontconfig" ]
>  
>      if (use_dbus) {
>-@@ -252,6 +252,12 @@
>+@@ -1104,6 +1104,12 @@ static_library("extensions") {
>      defines += [ "ENABLE_HOTWORDING" ]
>    }
>  
>@@ -20,5 +20,5 @@
> +  }
> +
>    if (enable_service_discovery) {
>-     sources += rebase_path(
>-             gypi_values.chrome_browser_extensions_service_discovery_sources,
>+     sources += [
>+       "api/gcd_private/gcd_private_api.cc",
>Index: www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/extensions/activity_log/activity_log.cc
>-@@ -39,7 +39,11 @@
>- #include "extensions/browser/extensions_browser_client.h"
>+@@ -48,7 +48,11 @@
>  #include "extensions/common/extension.h"
>+ #include "extensions/common/extension_messages.h"
>  #include "extensions/common/one_shot_event.h"
> +#if defined(OS_BSD)
> +#include <re2/re2.h>
>Index: www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
> @@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe
>  }
>Index: www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/extensions/api/input_ime/input_ime_api.h
>-@@ -27,7 +27,7 @@
>+@@ -28,7 +28,7 @@
>  
>  #if defined(OS_CHROMEOS)
>  #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"
>Index: www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/extensions/api/messaging/message_service.cc.orig	2016-07-22 00:06:51.000000000 -0400
>-+++ chrome/browser/extensions/api/messaging/message_service.cc	2016-08-03 11:20:56.579570000 -0400
>-@@ -119,7 +119,7 @@
>+--- chrome/browser/extensions/api/messaging/message_service.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/extensions/api/messaging/message_service.cc
>+@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message
>  
>  const char kReceivingEndDoesntExistError[] =
>      "Could not establish connection. Receiving end does not exist.";
>@@ -9,7 +9,7 @@
>  const char kMissingPermissionError[] =
>      "Access to native messaging requires nativeMessaging permission.";
>  const char kProhibitedByPoliciesError[] =
>-@@ -415,7 +415,7 @@
>+@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative
>    if (!source)
>      return;
>  
>Index: www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
> @@ -4,6 +4,10 @@
>  
>Index: www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig	2016-12-16 03:22:03.040835000 +0000
>-+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc	2016-12-16 03:22:24.317714000 +0000
>-@@ -45,7 +45,7 @@
>+--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/extensions/api/omnibox/omnibox_api.cc
>+@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] =
>  // Pref key for omnibox.setDefaultSuggestion.
>  const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
>  
>Index: www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/extensions/bookmark_app_helper.cc.orig	2016-12-16 03:24:27.367808000 +0000
>-+++ chrome/browser/extensions/bookmark_app_helper.cc	2016-12-16 03:24:51.798418000 +0000
>-@@ -707,7 +707,7 @@
>+--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/extensions/bookmark_app_helper.cc
>+@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallati
>  #if !defined(OS_MACOSX)
>  #if !defined(USE_ASH)
>    web_app::ShortcutLocations creation_locations;
>Index: www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2016-12-01 23:02:07.000000000 +0000
>-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	2016-12-16 19:35:19.489404000 +0000
>+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
> @@ -62,7 +62,7 @@
>  #include "chrome/browser/chromeos/extensions/media_player_api.h"
>  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
>  #endif
>  
>-@@ -103,7 +103,7 @@
>+@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFac
>  #if defined(OS_CHROMEOS)
>    extensions::InputImeAPI::GetFactoryInstance();
>    extensions::InputMethodAPI::GetFactoryInstance();
>Index: www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/extensions/external_provider_impl.cc.orig	2016-12-01 23:02:07 UTC
>+--- chrome/browser/extensions/external_provider_impl.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/extensions/external_provider_impl.cc
> @@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
>          Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
>Index: www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/gpu/gl_string_manager.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/gpu/gl_string_manager.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/gpu/gl_string_manager.cc
>-@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() {
>+@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() {
>  
>  void GLStringManager::Initialize() {
>    // On MacOSX or Windows, preliminary GPUInfo is enough.
>Index: www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/gpu/gpu_feature_checker.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/gpu/gpu_feature_checker.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/gpu/gpu_feature_checker.cc
> @@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA
>    CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
>Index: www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/interstitials/chrome_controller_client.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/interstitials/chrome_controller_client.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/interstitials/chrome_controller_client.cc
>-@@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() {
>+@@ -56,7 +56,7 @@ void LaunchDateAndTimeSettingsOnFile() {
>    chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
>                                          sub_page);
>  
>@@ -9,7 +9,7 @@
>    struct ClockCommand {
>      const char* pathname;
>      const char* argument;
>-@@ -138,7 +138,7 @@ void ChromeControllerClient::set_interst
>+@@ -142,7 +142,7 @@ void ChromeControllerClient::set_interst
>  
>  bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
>  #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
>Index: www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
> @@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil
>      // Note that this initializes the delegate asynchronously, but since
>Index: www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/media_galleries/media_file_system_registry.cc
>-@@ -768,7 +768,10 @@ class MediaFileSystemRegistry::MediaFile
>+@@ -765,7 +765,10 @@ class MediaFileSystemRegistry::MediaFile
>  // Constructor in 'private' section because depends on private class definition.
>  MediaFileSystemRegistry::MediaFileSystemRegistry()
>      : file_system_context_(new MediaFileSystemContextImpl) {
>Index: www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2016-12-01 23:02:07 UTC
>+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
> @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
>    const char product[] = "Chrome_Android";
>Index: www/chromium/files/patch-chrome_browser_memory__details.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_memory__details.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_memory__details.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- chrome/browser/memory_details.cc.orig	2016-08-03 22:02:12.000000000 +0300
>-+++ chrome/browser/memory_details.cc	2016-09-30 22:07:01.106885000 +0300
>+--- chrome/browser/memory_details.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/memory_details.cc
> @@ -32,7 +32,7 @@
>  #include "content/public/common/content_constants.h"
>  #include "ui/base/l10n/l10n_util.h"
>@@ -9,7 +9,7 @@
>  #include "content/public/browser/zygote_host_linux.h"
>  #endif
>  
>-@@ -334,7 +334,7 @@
>+@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUI
>        process.titles.push_back(title);
>      }
>  
>Index: www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
>-@@ -38,12 +38,14 @@
>+@@ -42,12 +42,14 @@
>  
>  #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>  #include <gnu/libc-version.h>
>@@ -15,4 +15,4 @@
> +#endif
>  
>  #if defined(USE_OZONE) || defined(USE_X11)
>- #include "ui/events/devices/device_data_manager.h"
>+ #include "ui/events/devices/input_device_event_observer.h"
>Index: www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/net/async_dns_field_trial.cc.orig	2016-12-16 03:12:55.927001000 +0000
>-+++ chrome/browser/net/async_dns_field_trial.cc	2016-12-16 03:13:16.445410000 +0000
>-@@ -61,7 +61,7 @@
>+--- chrome/browser/net/async_dns_field_trial.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/net/async_dns_field_trial.cc
>+@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour
>  }  // namespace
>  
>  bool ConfigureAsyncDnsFieldTrial() {
>Index: www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/notifications/message_center_notification_manager.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/notifications/message_center_notification_manager.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/notifications/message_center_notification_manager.cc
>-@@ -75,7 +75,7 @@ MessageCenterNotificationManager::Messag
>-       new FullscreenNotificationBlocker(message_center)));
>+@@ -67,7 +67,7 @@ MessageCenterNotificationManager::Messag
>+       base::MakeUnique<FullscreenNotificationBlocker>(message_center));
>  
>  #if defined(OS_WIN) || defined(OS_MACOSX) \
> -  || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
>Index: www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/password_manager/chrome_password_manager_client.cc
>-@@ -56,7 +56,11 @@
>+@@ -57,7 +57,11 @@
>  #include "content/public/browser/web_contents.h"
>  #include "google_apis/gaia/gaia_urls.h"
>  #include "net/base/url_util.h"
>@@ -10,5 +10,5 @@
>  #include "third_party/re2/src/re2/re2.h"
> +#endif
>  
>- #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
>- #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
>+ #if BUILDFLAG(ANDROID_JAVA_UI)
>+ #include "chrome/browser/android/tab_android.h"
>Index: www/chromium/files/patch-chrome_browser_platform__util.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_platform__util.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_platform__util.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/platform_util.h.orig	2016-08-04 11:19:03.775212000 -0400
>-+++ chrome/browser/platform_util.h	2016-08-04 11:19:15.839097000 -0400
>-@@ -40,7 +40,7 @@
>+--- chrome/browser/platform_util.h.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/platform_util.h
>+@@ -40,7 +40,7 @@ enum OpenOperationResult {
>  enum OpenItemType {
>    OPEN_FILE,
>    OPEN_FOLDER,
>Index: www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/plugins/plugins_resource_service.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/plugins/plugins_resource_service.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/plugins/plugins_resource_service.cc
> @@ -31,7 +31,7 @@ GURL GetPluginsServerURL() {
>    std::string filename;
>Index: www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/policy/policy_prefs_browsertest.cc
>-@@ -174,6 +174,8 @@ class PolicyTestCase {
>+@@ -175,6 +175,8 @@ class PolicyTestCase {
>      const std::string os("chromeos");
>  #elif defined(OS_LINUX)
>      const std::string os("linux");
>Index: www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_process__singleton__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_process__singleton__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/process_singleton_posix.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/process_singleton_posix.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/process_singleton_posix.cc
>-@@ -87,11 +87,11 @@
>+@@ -90,11 +90,11 @@
>  #include "net/base/network_interfaces.h"
>  #include "ui/base/l10n/l10n_util.h"
>  
>@@ -14,7 +14,7 @@
>  #include "ui/views/linux_ui/linux_ui.h"
>  #endif
>  
>-@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base
>+@@ -318,7 +318,7 @@ bool DisplayProfileInUseError(const base
>    if (g_disable_prompt)
>      return false;
>  
>Index: www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/renderer_preferences_util.cc.orig	2016-05-11 19:02:14 UTC
>+--- chrome/browser/renderer_preferences_util.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/renderer_preferences_util.cc
>-@@ -15,7 +15,7 @@
>+@@ -18,7 +18,7 @@
>  #include "content/public/common/webrtc_ip_handling_policy.h"
>  #include "third_party/skia/include/core/SkColor.h"
>  
>@@ -9,8 +9,8 @@
>  #include "ui/gfx/font_render_params.h"
>  #endif
>  
>-@@ -27,7 +27,7 @@
>- #include "ui/views/controls/textfield/textfield.h"
>+@@ -30,7 +30,7 @@
>+ #include "ui/base/cocoa/defaults_utils.h"
>  #endif
>  
> -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
>@@ -18,8 +18,8 @@
>  #include "chrome/browser/themes/theme_service.h"
>  #include "chrome/browser/themes/theme_service_factory.h"
>  #include "ui/views/linux_ui/linux_ui.h"
>-@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::R
>-   prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
>+@@ -132,7 +132,7 @@ void UpdateFromSystemSettings(content::R
>+     prefs->caret_blink_interval = interval.InSecondsF();
>  #endif
>  
> -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
>@@ -27,7 +27,7 @@
>    views::LinuxUI* linux_ui = views::LinuxUI::instance();
>    if (linux_ui) {
>      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
>-@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::R
>+@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(content::R
>    }
>  #endif
>  
>Index: www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/resources/safe_browsing/BUILD.gn.orig	2016-08-03 22:02:13.000000000 +0300
>-+++ chrome/browser/resources/safe_browsing/BUILD.gn	2016-09-20 02:51:43.112078000 +0300
>-@@ -26,6 +26,8 @@
>+--- chrome/browser/resources/safe_browsing/BUILD.gn.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/resources/safe_browsing/BUILD.gn
>+@@ -29,6 +29,8 @@ action("make_file_types_protobuf") {
>      target_arch = "mac"
>    } else if (is_linux) {
>      target_arch = "linux"
>Index: www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
>===================================================================
>--- www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2016-08-03 22:02:13.000000000 +0300
>-+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py	2016-09-20 02:52:27.389763000 +0300
>-@@ -39,6 +39,7 @@
>+--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
>+@@ -41,6 +41,7 @@ def PlatformTypes():
>      "android": config_pb2.DownloadFileType.PLATFORM_ANDROID,
>      "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS,
>      "linux": config_pb2.DownloadFileType.PLATFORM_LINUX,
>@@ -8,8 +8,8 @@
>      "mac": config_pb2.DownloadFileType.PLATFORM_MAC,
>      "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS,
>    }
>-@@ -157,7 +158,7 @@
>-                      'fix for http://crbug.com/605592')
>+@@ -192,7 +193,7 @@ def main():
>+                     'Outfile must have a %d for version and %s for platform.')
>    parser.add_option('-t', '--type',
>                      help='The platform type. One of android, chromeos, ' +
> -                    'linux, mac, win')
>@@ -16,4 +16,4 @@
> +                    'linux, bsd, mac, win')
>    parser.add_option('-i', '--infile',
>                      help='The ASCII DownloadFileType-proto file to read.')
>-   parser.add_option('-o', '--outfile',
>+   parser.add_option('-d', '--outdir',
>Index: www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2016-03-25 13:04:45 UTC
>+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2016-12-09 05:04:15 UTC
> +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
> @@ -8,7 +8,12 @@
>  
>Index: www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/safe_browsing/permission_reporter.cc.orig	2016-10-06 04:02:12.000000000 +0300
>-+++ chrome/browser/safe_browsing/permission_reporter.cc	2016-10-14 06:15:01.051089000 +0300
>-@@ -190,7 +190,7 @@
>+--- chrome/browser/safe_browsing/permission_reporter.cc.orig	2016-12-09 05:04:15 UTC
>++++ chrome/browser/safe_browsing/permission_reporter.cc
>+@@ -192,7 +192,7 @@ bool PermissionReporter::BuildReport(con
>  #if defined(OS_ANDROID)
>    report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
>  #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
>Index: www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/search/local_files_ntp_source.cc.orig	2016-05-11 19:02:15 UTC
>+--- chrome/browser/search/local_files_ntp_source.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/search/local_files_ntp_source.cc
>-@@ -19,8 +19,13 @@
>+@@ -20,8 +20,13 @@
>  #include "chrome/common/url_constants.h"
>  #include "content/public/browser/browser_thread.h"
>  #include "content/public/browser/url_data_source.h"
>Index: www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/sync/chrome_sync_client.cc.orig	2016-05-11 19:02:15 UTC
>+--- chrome/browser/sync/chrome_sync_client.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/sync/chrome_sync_client.cc
>-@@ -554,7 +554,7 @@ void ChromeSyncClient::RegisterDesktopDa
>+@@ -577,7 +577,7 @@ void ChromeSyncClient::RegisterDesktopDa
>    }
>  #endif
>  
>@@ -8,4 +8,4 @@
> +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
>    // Dictionary sync is enabled by default.
>    if (!disabled_types.Has(syncer::DICTIONARY)) {
>-     sync_service->RegisterDataTypeController(new UIDataTypeController(
>+     sync_service->RegisterDataTypeController(
>Index: www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/tracing/crash_service_uploader.cc.orig	2016-05-11 19:02:15 UTC
>+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/tracing/crash_service_uploader.cc
>-@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUpload
>+@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUpload
>    const char product[] = "Chrome_Android";
>  #elif defined(OS_CHROMEOS)
>    const char product[] = "Chrome_ChromeOS";
>Index: www/chromium/files/patch-chrome_browser_ui_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/BUILD.gn.orig	2016-12-01 23:02:08 UTC
>+--- chrome/browser/ui/BUILD.gn.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/BUILD.gn
> @@ -3024,7 +3024,7 @@ split_static_library("ui") {
>        ]
>Index: www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/browser_command_controller.cc.orig	2016-10-06 04:02:13.000000000 +0300
>-+++ chrome/browser/ui/browser_command_controller.cc	2016-10-13 05:57:01.306342000 +0300
>-@@ -76,7 +76,7 @@
>+--- chrome/browser/ui/browser_command_controller.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/browser/ui/browser_command_controller.cc
>+@@ -80,7 +80,7 @@
>  #include "chrome/browser/ui/browser_commands_chromeos.h"
>  #endif
>  
>@@ -9,7 +9,7 @@
>  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
>  #endif
>  
>-@@ -216,7 +216,7 @@
>+@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve
>    if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
>      return true;
>  
>@@ -18,7 +18,7 @@
>    // If this key was registered by the user as a content editing hotkey, then
>    // it is not reserved.
>    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
>-@@ -419,7 +419,7 @@
>+@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo
>        break;
>  #endif
>  
>@@ -27,7 +27,7 @@
>      case IDC_USE_SYSTEM_TITLE_BAR: {
>        PrefService* prefs = browser_->profile()->GetPrefs();
>        prefs->SetBoolean(prefs::kUseCustomChromeFrame,
>-@@ -812,7 +812,7 @@
>+@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma
>    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
>    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
>  #endif
>Index: www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/browser_view_prefs.cc.orig	2016-12-01 23:02:08 UTC
>+--- chrome/browser/ui/browser_view_prefs.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/browser_view_prefs.cc
> @@ -10,7 +10,7 @@
>  #include "components/prefs/pref_registry_simple.h"
>Index: www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2016-04-08 16:02:07 UTC
>+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
>-@@ -19,7 +19,7 @@
>+@@ -16,7 +16,7 @@
>  
>  // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
>  // here.
>Index: www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/input_method/input_method_engine_base.cc
>-@@ -35,7 +35,7 @@
>+@@ -37,7 +37,7 @@
>  #elif defined(OS_WIN)
>  #include "ui/events/keycodes/dom/keycode_converter.h"
>  #include "ui/events/keycodes/keyboard_codes_win.h"
>Index: www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_libgtk2ui_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- chrome/browser/ui/libgtk2ui/BUILD.gn.orig	2016-08-03 22:02:13.000000000 +0300
>-+++ chrome/browser/ui/libgtk2ui/BUILD.gn	2016-09-03 00:03:44.741182000 +0300
>+--- chrome/browser/ui/libgtk2ui/BUILD.gn.orig	2016-12-09 05:04:16 UTC
>++++ chrome/browser/ui/libgtk2ui/BUILD.gn
> @@ -2,7 +2,7 @@
>  # Use of this source code is governed by a BSD-style license that can be
>  # found in the LICENSE file.
>Index: www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2016-12-01 23:02:08 UTC
>+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/startup/startup_browser_creator.cc
> @@ -91,7 +91,7 @@
>  #include "components/user_manager/user_manager.h"
>Index: www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/toolbar/app_menu_model.cc
>-@@ -709,7 +709,7 @@ bool AppMenuModel::IsCommandIdVisible(in
>+@@ -625,7 +625,7 @@ bool AppMenuModel::IsCommandIdVisible(in
>      case IDC_UPGRADE_DIALOG:
>        return browser_defaults::kShowUpgradeMenuItem &&
>            UpgradeDetector::GetInstance()->notify_upgrade();
>Index: www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
>-@@ -20,7 +20,7 @@
>+@@ -19,7 +19,7 @@
>  #include "ui/gfx/image/image_skia.h"
>  #include "ui/views/widget/widget.h"
>  
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/shell_integration_linux.h"
>  #endif
>  
>-@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB
>+@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnB
>      const AppWindow::CreateParams& create_params,
>      views::Widget::InitParams* init_params,
>      views::Widget* widget) {
>Index: www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/chrome_views_delegate.cc
>-@@ -48,7 +48,7 @@
>+@@ -57,7 +57,7 @@
>  #include "ui/views/widget/native_widget_aura.h"
>  #endif
>  
>@@ -9,7 +9,7 @@
>  #include "ui/views/linux_ui/linux_ui.h"
>  #endif
>  
>-@@ -295,7 +295,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
>+@@ -308,7 +308,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
>    return GetSmallAppIcon();
>  }
>  
>@@ -18,7 +18,7 @@
>  gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
>    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
>    return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
>-@@ -443,7 +443,7 @@ void ChromeViewsDelegate::OnBeforeWidget
>+@@ -447,7 +447,7 @@ void ChromeViewsDelegate::OnBeforeWidget
>  #endif
>  }
>  
>Index: www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/chrome_views_delegate.h
>-@@ -35,7 +35,7 @@ class ChromeViewsDelegate : public views
>+@@ -37,7 +37,7 @@ class ChromeViewsDelegate : public views
>  #if defined(OS_WIN)
>    HICON GetDefaultWindowIcon() const override;
>    HICON GetSmallWindowIcon() const override;
>@@ -9,7 +9,7 @@
>    gfx::ImageSkia* GetDefaultWindowIcon() const override;
>  #endif
>  
>-@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views
>+@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views
>    void OnBeforeWidgetInit(
>        views::Widget::InitParams* params,
>        views::internal::NativeWidgetDelegate* delegate) override;
>Index: www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/first_run_dialog.cc.orig	2016-10-06 04:02:13.000000000 +0300
>-+++ chrome/browser/ui/views/first_run_dialog.cc	2016-10-15 10:10:45.850050000 +0300
>-@@ -35,8 +35,10 @@
>+--- chrome/browser/ui/views/first_run_dialog.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/browser/ui/views/first_run_dialog.cc
>+@@ -40,8 +40,10 @@ using views::GridLayout;
>  namespace {
>  
>  void InitCrashReporterIfEnabled(bool enabled) {
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/browser_frame.cc
>-@@ -36,7 +36,7 @@
>- #include "ui/native_theme/native_theme_dark_aura.h"
>+@@ -38,7 +38,7 @@
>+ #include "ui/native_theme/native_theme_dark_aura.h"  // nogncheck
>  #endif
>  
> -#if defined(OS_LINUX)
>@@ -9,7 +9,7 @@
>  #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
>  #endif
>  
>-@@ -88,7 +88,7 @@ void BrowserFrame::InitBrowserFrame() {
>+@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
>      non_client_view()->set_context_menu_controller(this);
>    }
>  
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/browser/ui/views/frame/browser_view.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/browser_view.cc
>-@@ -187,7 +187,7 @@
>- #include "content/public/common/mojo_shell_connection.h"
>+@@ -179,7 +179,7 @@
>+ #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
>  #endif
>  
> -#if defined(OS_LINUX)
>@@ -9,7 +9,7 @@
>  #include "ui/native_theme/native_theme_dark_aura.h"
>  #endif
>  
>-@@ -2017,7 +2017,7 @@ void BrowserView::OnThemeChanged() {
>+@@ -1975,7 +1975,7 @@ void BrowserView::OnThemeChanged() {
>  #if defined(OS_WIN)
>      ui::NativeThemeDarkWin::instance()->NotifyObservers();
>      ui::NativeThemeWin::instance()->NotifyObservers();
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
>-@@ -53,7 +53,7 @@
>+@@ -38,7 +38,7 @@
>  #include "ui/views/window/frame_background.h"
>  #include "ui/views/window/window_shape.h"
>  
>@@ -9,7 +9,7 @@
>  #include "ui/views/controls/menu/menu_runner.h"
>  #endif
>  
>-@@ -311,7 +311,7 @@ void OpaqueBrowserFrameView::ButtonPress
>+@@ -293,7 +293,7 @@ void OpaqueBrowserFrameView::ButtonPress
>  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
>                                                   const gfx::Point& point,
>                                                   const ui::Event* event) {
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
> @@ -20,7 +20,7 @@ namespace {
>  
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2016-04-08 16:02:08 UTC
>+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
> @@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci
>    return false;
>Index: www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
>-@@ -88,7 +88,7 @@ void SystemMenuModelBuilder::BuildSystem
>+@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystem
>      model->AddSeparator(ui::NORMAL_SEPARATOR);
>      model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
>    }
>@@ -9,7 +9,7 @@
>    model->AddSeparator(ui::NORMAL_SEPARATOR);
>    model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
>                                    IDS_SHOW_WINDOW_DECORATIONS_MENU);
>-@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystem
>+@@ -119,7 +119,7 @@ void SystemMenuModelBuilder::BuildSystem
>      model->AddSeparator(ui::NORMAL_SEPARATOR);
>      model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
>    }
>Index: www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/message_center/message_center_frame_view.cc
> @@ -15,7 +15,7 @@
>  namespace message_center {
>Index: www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
>-@@ -268,7 +268,7 @@ void TabDragController::Init(
>+@@ -281,7 +281,7 @@ void TabDragController::Init(
>    //     synchronous on desktop Linux, so use that.
>    // - Ash
>    //     Releasing capture on Ash cancels gestures so avoid it.
>@@ -9,7 +9,7 @@
>    can_release_capture_ = false;
>  #endif
>    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
>-@@ -618,7 +618,7 @@ TabDragController::DragBrowserToNewTabSt
>+@@ -631,7 +631,7 @@ TabDragController::DragBrowserToNewTabSt
>      // that to effect the position of any windows.
>      SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
>  
>@@ -18,7 +18,7 @@
>      // EndMoveLoop is going to snap the window back to its original location.
>      // Hide it so users don't see this. Hiding a window in Linux aura causes
>      // it to lose capture so skip it.
>-@@ -1791,7 +1791,7 @@ gfx::NativeWindow TabDragController::Get
>+@@ -1830,7 +1830,7 @@ TabDragController::Liveness TabDragContr
>      if (dragged_window)
>        exclude.insert(dragged_window);
>    }
>Index: www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2016-06-06 21:05:14.000000000 +0200
>-+++ chrome/browser/ui/views/tabs/tab_strip.cc	2016-06-13 22:03:03.000000000 +0200
>-@@ -331,7 +331,7 @@
>+--- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/browser/ui/views/tabs/tab_strip.cc
>+@@ -322,7 +322,7 @@ NewTabButton::NewTabButton(TabStrip* tab
>      : views::ImageButton(listener),
>        tab_strip_(tab_strip),
>        destroyed_(NULL) {
>Index: www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc	(working copy)
>@@ -1,56 +1,56 @@
>---- chrome/browser/ui/webui/about_ui.cc.orig	2016-07-20 22:03:21.000000000 +0300
>-+++ chrome/browser/ui/webui/about_ui.cc	2016-08-10 15:53:44.885419000 +0300
>-@@ -73,7 +73,7 @@
>+--- chrome/browser/ui/webui/about_ui.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/browser/ui/webui/about_ui.cc
>+@@ -75,7 +75,7 @@
>  #include "chrome/browser/ui/webui/theme_source.h"
>  #endif
>-
>+ 
> -#if defined(OS_LINUX) || defined(OS_OPENBSD)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  #include "content/public/browser/zygote_host_linux.h"
>  #include "content/public/common/sandbox_linux.h"
>  #endif
>-@@ -642,7 +642,7 @@
>+@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref
>    DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);
>  };
>-
>+ 
> -#if defined(OS_LINUX) || defined(OS_OPENBSD)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  std::string AboutLinuxProxyConfig() {
>    std::string data;
>    AppendHeader(&data, 0,
>-@@ -658,6 +658,7 @@
>+@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() {
>    return data;
>  }
>-
>+ 
> +#if !defined(OS_BSD)
>  void AboutSandboxRow(std::string* data, int name_id, bool good) {
>    data->append("<tr><td>");
>    data->append(l10n_util::GetStringUTF8(name_id));
>-@@ -672,6 +673,7 @@
>+@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data, 
>    }
>    data->append("</td></tr>");
>  }
> +#endif
>-
>+ 
>  std::string AboutSandbox() {
>    std::string data;
>-@@ -681,6 +683,7 @@
>+@@ -683,6 +685,7 @@ std::string AboutSandbox() {
>    data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
>    data.append("</h1>");
>-
>+ 
> +#if !defined(OS_BSD)
>    // Get expected sandboxing status of renderers.
>    const int status =
>        content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
>-@@ -721,6 +724,7 @@
>+@@ -723,6 +726,7 @@ std::string AboutSandbox() {
>      data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
>    }
>    data.append("</p>");
> +#endif
>-
>+ 
>    AppendFooter(&data);
>    return data;
>-@@ -769,7 +773,7 @@
>+@@ -787,7 +791,7 @@ void AboutUIHTMLSource::StartDataRequest
>    } else if (source_name_ == chrome::kChromeUIDNSHost) {
>      AboutDnsHandler::Start(profile(), callback);
>      return;
>@@ -59,7 +59,7 @@
>    } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
>      response = AboutLinuxProxyConfig();
>  #endif
>-@@ -778,7 +782,7 @@
>+@@ -796,7 +800,7 @@ void AboutUIHTMLSource::StartDataRequest
>      ChromeOSCreditsHandler::Start(path, callback);
>      return;
>  #endif
>Index: www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
>-@@ -275,7 +275,7 @@ bool IsAboutUI(const GURL& url) {
>+@@ -300,7 +300,7 @@ bool IsAboutUI(const GURL& url) {
>  #if !defined(OS_ANDROID)
>            || url.host() == chrome::kChromeUITermsHost
>  #endif
>Index: www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2016-05-11 19:02:16 UTC
>+--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc
>-@@ -25,7 +25,11 @@
>+@@ -27,7 +27,11 @@
>  #include "extensions/common/constants.h"
>  #include "extensions/common/extension.h"
>  #include "extensions/common/manifest_constants.h"
>Index: www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/webui/options/browser_options_handler.cc
>-@@ -491,13 +491,13 @@ void BrowserOptionsHandler::GetLocalized
>+@@ -541,13 +541,13 @@ void BrowserOptionsHandler::GetLocalized
>      { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
>  #endif  // defined(OS_CHROMEOS)
>  
>@@ -16,7 +16,7 @@
>  
>  #if defined(OS_CHROMEOS) && defined(USE_ASH)
>      { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
>-@@ -738,7 +738,7 @@ void BrowserOptionsHandler::RegisterMess
>+@@ -790,7 +790,7 @@ void BrowserOptionsHandler::RegisterMess
>        "requestProfilesInfo",
>        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
>                   base::Unretained(this)));
>@@ -25,7 +25,7 @@
>    web_ui()->RegisterMessageCallback(
>        "themesSetNative",
>        base::Bind(&BrowserOptionsHandler::ThemesSetNative,
>-@@ -1366,7 +1366,7 @@ void BrowserOptionsHandler::ObserveTheme
>+@@ -1436,7 +1436,7 @@ void BrowserOptionsHandler::ObserveTheme
>    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
>    bool is_system_theme = false;
>  
>@@ -34,7 +34,7 @@
>    bool profile_is_supervised = profile->IsSupervised();
>    is_system_theme = theme_service->UsingSystemTheme();
>    base::FundamentalValue native_theme_enabled(!is_system_theme &&
>-@@ -1388,7 +1388,7 @@ void BrowserOptionsHandler::ThemesReset(
>+@@ -1458,7 +1458,7 @@ void BrowserOptionsHandler::ThemesReset(
>    ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
>  }
>  
>Index: www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/ui/webui/options/browser_options_handler.h
>-@@ -204,7 +204,7 @@ class BrowserOptionsHandler
>+@@ -206,7 +206,7 @@ class BrowserOptionsHandler
>  
>    void ObserveThemeChanged();
>    void ThemesReset(const base::ListValue* args);
>Index: www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
>===================================================================
>--- www/chromium/files/patch-chrome_browser_web__applications_web__app.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_web__applications_web__app.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/web_applications/web_app.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/browser/web_applications/web_app.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/web_applications/web_app.cc
>-@@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationIn
>+@@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationIn
>  }
>  #endif
>  
>Index: www/chromium/files/patch-chrome_browser_web__applications_web__app.h
>===================================================================
>--- www/chromium/files/patch-chrome_browser_web__applications_web__app.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_browser_web__applications_web__app.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/browser/web_applications/web_app.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/browser/web_applications/web_app.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/browser/web_applications/web_app.h
>-@@ -227,7 +227,7 @@ typedef std::vector<WebApplicationInfo::
>+@@ -224,7 +224,7 @@ typedef std::vector<WebApplicationInfo::
>  void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
>  #endif
>  
>Index: www/chromium/files/patch-chrome_common_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_common_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_BUILD.gn	(working copy)
>@@ -1,7 +1,7 @@
>---- chrome/common/BUILD.gn.orig	2016-08-03 22:02:14.000000000 +0300
>-+++ chrome/common/BUILD.gn	2016-09-27 19:17:20.410265000 +0300
>-@@ -156,6 +156,13 @@
>-     ]
>+--- chrome/common/BUILD.gn.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/BUILD.gn
>+@@ -233,6 +233,13 @@ static_library("common") {
>+     public_deps += [ "//ppapi/shared_impl" ]
>    }
>  
> +  if (is_bsd) {
>@@ -12,5 +12,5 @@
> +  }
> +
>    if (enable_extensions) {
>-     sources += rebase_path(gypi_values.chrome_common_extensions_sources,
>-                            ".",
>+     sources += [
>+       "cast_messages.cc",
>Index: www/chromium/files/patch-chrome_common_chrome__paths.cc
>===================================================================
>--- www/chromium/files/patch-chrome_common_chrome__paths.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_chrome__paths.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/chrome_paths.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/common/chrome_paths.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/common/chrome_paths.cc
>-@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePat
>+@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
>          return false;
>        break;
>      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
>@@ -9,7 +9,7 @@
>        if (!GetUserDownloadsDirectorySafe(&cur))
>          return false;
>        break;
>-@@ -470,10 +470,12 @@ bool PathProvider(int key, base::FilePat
>+@@ -472,10 +472,12 @@ bool PathProvider(int key, base::FilePat
>        if (!base::PathExists(cur))  // We don't want to create this
>          return false;
>        break;
>@@ -23,7 +23,7 @@
>  #else
>        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
>  #endif
>-@@ -540,7 +542,7 @@ bool PathProvider(int key, base::FilePat
>+@@ -526,7 +528,7 @@ bool PathProvider(int key, base::FilePat
>  #endif
>        break;
>  
>@@ -32,7 +32,7 @@
>      case chrome::DIR_NATIVE_MESSAGING:
>  #if defined(OS_MACOSX)
>  #if defined(GOOGLE_CHROME_BUILD)
>-@@ -554,6 +556,9 @@ bool PathProvider(int key, base::FilePat
>+@@ -540,6 +542,9 @@ bool PathProvider(int key, base::FilePat
>  #if defined(GOOGLE_CHROME_BUILD)
>        cur = base::FilePath(FILE_PATH_LITERAL(
>            "/etc/opt/chrome/native-messaging-hosts"));
>@@ -42,7 +42,7 @@
>  #else
>        cur = base::FilePath(FILE_PATH_LITERAL(
>            "/etc/chromium/native-messaging-hosts"));
>-@@ -566,7 +571,7 @@ bool PathProvider(int key, base::FilePat
>+@@ -552,7 +557,7 @@ bool PathProvider(int key, base::FilePat
>          return false;
>        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
>        break;
>Index: www/chromium/files/patch-chrome_common_chrome__paths.h
>===================================================================
>--- www/chromium/files/patch-chrome_common_chrome__paths.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_chrome__paths.h	(working copy)
>@@ -1,8 +1,8 @@
>---- chrome/common/chrome_paths.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/common/chrome_paths.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/common/chrome_paths.h
>-@@ -50,7 +50,7 @@ enum {
>-   DIR_USER_APPLICATIONS,        // ~/Applications
>-   DIR_USER_LIBRARY,             // ~/Library
>+@@ -48,7 +48,7 @@ enum {
>+                                 // to set policies for chrome. This directory
>+                                 // contains subdirectories.
>  #endif
> -#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
> +#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \
>@@ -9,7 +9,7 @@
>      defined(OS_MACOSX)
>    DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
>                                   // on Chrome Mac and Chromium Linux.
>-@@ -59,7 +59,7 @@ enum {
>+@@ -57,7 +57,7 @@ enum {
>                                   // create it.
>  #endif
>  
>@@ -18,7 +18,7 @@
>    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
>                                         // definition manifest files that
>                                         // describe extensions which are to be
>-@@ -117,7 +117,7 @@ enum {
>+@@ -111,7 +111,7 @@ enum {
>    DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
>                                               // supervised user whitelists are
>                                               // installed.
>Index: www/chromium/files/patch-chrome_common_chrome__paths__internal.h
>===================================================================
>--- www/chromium/files/patch-chrome_common_chrome__paths__internal.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_chrome__paths__internal.h	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/common/chrome_paths_internal.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/common/chrome_paths_internal.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/common/chrome_paths_internal.h
> @@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F
>  // Get the path to the user's documents directory.
>Index: www/chromium/files/patch-chrome_common_chrome__switches.cc
>===================================================================
>--- www/chromium/files/patch-chrome_common_chrome__switches.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_chrome__switches.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/chrome_switches.cc.orig	2016-10-06 04:02:14.000000000 +0300
>-+++ chrome/common/chrome_switches.cc	2016-10-13 06:11:21.058074000 +0300
>-@@ -1277,7 +1277,7 @@
>+--- chrome/common/chrome_switches.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/chrome_switches.cc
>+@@ -1288,7 +1288,7 @@ const char kAllowNaClSocketAPI[]        
>  const char kEnableWaylandServer[] = "enable-wayland-server";
>  #endif
>  
>Index: www/chromium/files/patch-chrome_common_chrome__switches.h
>===================================================================
>--- www/chromium/files/patch-chrome_common_chrome__switches.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_chrome__switches.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/chrome_switches.h.orig	2016-10-06 04:02:14.000000000 +0300
>-+++ chrome/common/chrome_switches.h	2016-10-13 06:13:55.604411000 +0300
>-@@ -378,7 +378,7 @@
>+--- chrome/common/chrome_switches.h.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/chrome_switches.h
>+@@ -390,7 +390,7 @@ extern const char kAllowNaClSocketAPI[];
>  extern const char kEnableWaylandServer[];
>  #endif
>  
>Index: www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
>===================================================================
>--- www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/extensions/chrome_extensions_client.cc.orig	2016-12-16 03:27:01.063936000 +0000
>-+++ chrome/common/extensions/chrome_extensions_client.cc	2016-12-16 03:29:25.710522000 +0000
>-@@ -103,7 +103,10 @@
>+--- chrome/common/extensions/chrome_extensions_client.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/extensions/chrome_extensions_client.cc
>+@@ -103,7 +103,10 @@ ChromeChannelForHistogram GetChromeChann
>  static base::LazyInstance<ChromeExtensionsClient> g_client =
>      LAZY_INSTANCE_INITIALIZER;
>  
>Index: www/chromium/files/patch-chrome_common_extensions_command.cc
>===================================================================
>--- www/chromium/files/patch-chrome_common_extensions_command.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_extensions_command.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/extensions/command.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/common/extensions/command.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/common/extensions/command.cc
>-@@ -306,7 +306,7 @@ std::string Command::CommandPlatform() {
>+@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() {
>    return values::kKeybindingPlatformMac;
>  #elif defined(OS_CHROMEOS)
>    return values::kKeybindingPlatformChromeOs;
>Index: www/chromium/files/patch-chrome_common_features.gni
>===================================================================
>--- www/chromium/files/patch-chrome_common_features.gni	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_features.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/features.gni.orig	2016-10-06 04:02:14.000000000 +0300
>-+++ chrome/common/features.gni	2016-10-13 06:19:10.348914000 +0300
>-@@ -21,7 +21,7 @@
>+--- chrome/common/features.gni.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/features.gni
>+@@ -19,7 +19,7 @@ declare_args() {
>    enable_background = !is_ios && !is_android && !is_chromecast
>  
>    enable_one_click_signin =
>Index: www/chromium/files/patch-chrome_common_pref__names.cc
>===================================================================
>--- www/chromium/files/patch-chrome_common_pref__names.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_pref__names.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/common/pref_names.cc.orig	2016-10-06 04:02:14.000000000 +0300
>-+++ chrome/common/pref_names.cc	2016-10-14 06:57:51.856679000 +0300
>-@@ -952,7 +952,7 @@
>+--- chrome/common/pref_names.cc.orig	2016-12-09 05:04:16 UTC
>++++ chrome/common/pref_names.cc
>+@@ -940,7 +940,7 @@ const char kForceSessionSync[] = "settin
>  // only using an account that belongs to one of the domains from this pref.
>  const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
>  
>@@ -9,7 +9,7 @@
>  // Linux specific preference on whether we should match the system theme.
>  const char kUsesSystemTheme[] = "extensions.theme.use_system";
>  #endif
>-@@ -1035,7 +1035,7 @@
>+@@ -1027,7 +1027,7 @@ const char kShowUpdatePromotionInfoBar[]
>      "browser.show_update_promotion_info_bar";
>  #endif
>  
>@@ -18,7 +18,7 @@
>  // Boolean that is false if we should show window manager decorations.  If
>  // true, we draw a custom chrome frame (thicker title bar and blue border).
>  const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
>-@@ -1408,7 +1408,7 @@
>+@@ -1400,7 +1400,7 @@ const char kDownloadDefaultDirectory[] =
>  // upgrade a unsafe location to a safe location.
>  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
>  
>Index: www/chromium/files/patch-chrome_common_pref__names.h
>===================================================================
>--- www/chromium/files/patch-chrome_common_pref__names.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_common_pref__names.h	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/common/pref_names.h.orig	2016-12-01 23:02:09 UTC
>+--- chrome/common/pref_names.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/common/pref_names.h
> @@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch
>  extern const char kForceYouTubeRestrict[];
>Index: www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
>===================================================================
>--- www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
> @@ -14,7 +14,7 @@
>  #include "ppapi/proxy/ppapi_messages.h"
>@@ -19,8 +19,8 @@
>        description.face,
>        description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
> @@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont
>-   skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault());
>-   typeface_ = skia::AdoptRef(
>+   sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
>+   typeface_ = sk_sp<SkTypeface>(
>        font_mgr->matchFamilyStyle(description.face.c_str(), style));
> -#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>Index: www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
>===================================================================
>--- www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/renderer/pepper/pepper_flash_font_file_host.h
> @@ -14,7 +14,7 @@
>  #include "ppapi/c/private/pp_private_font_charset.h"
>@@ -8,7 +8,7 @@
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  #include "base/files/scoped_file.h"
>  #elif defined(OS_WIN)
>- #include "skia/ext/refptr.h"
>+ #include "third_party/skia/include/core/SkRefCnt.h"
> @@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p
>                           uint32_t table);
>    bool GetFontData(uint32_t table, void* buffer, size_t* length);
>@@ -17,4 +17,4 @@
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    base::ScopedFD fd_;
>  #elif defined(OS_WIN)
>-   skia::RefPtr<SkTypeface> typeface_;
>+   sk_sp<SkTypeface> typeface_;
>Index: www/chromium/files/patch-chrome_test_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chrome_test_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chrome_test_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/test/BUILD.gn.orig	2016-12-01 23:02:09 UTC
>+--- chrome/test/BUILD.gn.orig	2016-12-09 05:04:16 UTC
> +++ chrome/test/BUILD.gn
> @@ -179,7 +179,7 @@ static_library("test_support") {
>      ]
>Index: www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
>===================================================================
>--- www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/test/base/in_process_browser_test.cc.orig	2016-05-11 19:02:17 UTC
>+--- chrome/test/base/in_process_browser_test.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/test/base/in_process_browser_test.cc
>-@@ -90,6 +90,10 @@
>+@@ -92,6 +92,10 @@
>  
>  namespace {
>  
>Index: www/chromium/files/patch-chrome_test_base_testing__browser__process.h
>===================================================================
>--- www/chromium/files/patch-chrome_test_base_testing__browser__process.h	(revision 432254)
>+++ www/chromium/files/patch-chrome_test_base_testing__browser__process.h	(working copy)
>@@ -1,6 +1,6 @@
>---- chrome/test/base/testing_browser_process.h.orig	2016-05-11 19:02:17 UTC
>+--- chrome/test/base/testing_browser_process.h.orig	2016-12-09 05:04:16 UTC
> +++ chrome/test/base/testing_browser_process.h
>-@@ -104,8 +104,8 @@ class TestingBrowserProcess : public Bro
>+@@ -105,8 +105,8 @@ class TestingBrowserProcess : public Bro
>    DownloadStatusUpdater* download_status_updater() override;
>    DownloadRequestLimiter* download_request_limiter() override;
>  
>Index: www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
>===================================================================
>--- www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc	(revision 432254)
>+++ www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2016-03-25 13:04:46 UTC
>+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2016-12-09 05:04:16 UTC
> +++ chrome/test/chromedriver/chrome/chrome_finder.cc
> @@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base
>          installation_locations[i].Append(L"Chromium\\Application"));
>Index: www/chromium/files/patch-chromecast_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chromecast_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chromecast_BUILD.gn	(working copy)
>@@ -1,8 +1,8 @@
>---- chromecast/BUILD.gn.orig	2016-08-03 22:02:15.000000000 +0300
>-+++ chromecast/BUILD.gn	2016-09-03 01:38:51.775473000 +0300
>-@@ -44,7 +44,7 @@
>-     "//ui/base:ui_base_unittests",
>-   ]
>+--- chromecast/BUILD.gn.orig	2016-12-09 05:04:17 UTC
>++++ chromecast/BUILD.gn
>+@@ -50,7 +50,7 @@ cast_test_group("cast_tests") {
>+     tests += [ "//gpu:gpu_unittests" ]
>+   }
>  
> -  if (is_linux) {
> +  if (is_linux || is_bsd) {
>Index: www/chromium/files/patch-chromecast_browser_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chromecast_browser_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chromecast_browser_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chromecast/browser/BUILD.gn.orig	2016-08-03 22:02:15.000000000 +0300
>-+++ chromecast/browser/BUILD.gn	2016-09-03 01:39:34.973425000 +0300
>-@@ -114,7 +114,7 @@
>+--- chromecast/browser/BUILD.gn.orig	2016-12-09 05:04:17 UTC
>++++ chromecast/browser/BUILD.gn
>+@@ -120,7 +120,7 @@ source_set("browser") {
>      "//ui/gl",
>    ]
>  
>Index: www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chromecast/browser/metrics/BUILD.gn.orig	2016-08-03 22:02:15.000000000 +0300
>-+++ chromecast/browser/metrics/BUILD.gn	2016-09-03 01:39:05.920888000 +0300
>-@@ -26,7 +26,7 @@
>+--- chromecast/browser/metrics/BUILD.gn.orig	2016-12-09 05:04:17 UTC
>++++ chromecast/browser/metrics/BUILD.gn
>+@@ -26,7 +26,7 @@ source_set("metrics") {
>      "//content/public/common",
>    ]
>  
>Index: www/chromium/files/patch-chromecast_crash_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-chromecast_crash_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-chromecast_crash_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- chromecast/crash/BUILD.gn.orig	2016-08-03 22:02:15.000000000 +0300
>-+++ chromecast/crash/BUILD.gn	2016-09-03 01:38:37.198322000 +0300
>-@@ -48,7 +48,7 @@
>+--- chromecast/crash/BUILD.gn.orig	2016-12-09 05:04:17 UTC
>++++ chromecast/crash/BUILD.gn
>+@@ -78,7 +78,7 @@ source_set("test_support") {
>    ]
>  }
>  
>Index: www/chromium/files/patch-components_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- components/BUILD.gn.orig	2016-12-01 23:02:10 UTC
>+--- components/BUILD.gn.orig	2016-12-09 05:04:17 UTC
> +++ components/BUILD.gn
> @@ -174,8 +174,8 @@ test("components_unittests") {
>        "//components/certificate_reporting:unit_tests",
>Index: www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
>===================================================================
>--- www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc	(revision 432254)
>+++ www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2016-05-11 19:02:18 UTC
>+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2016-12-09 05:04:17 UTC
> +++ components/autofill/content/renderer/password_form_conversion_utils.cc
>-@@ -26,7 +26,11 @@
>+@@ -25,7 +25,11 @@
>  #include "third_party/WebKit/public/web/WebFormControlElement.h"
>  #include "third_party/WebKit/public/web/WebFrame.h"
>  #include "third_party/WebKit/public/web/WebInputElement.h"
>Index: www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
>===================================================================
>--- www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc	(revision 432254)
>+++ www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/content_settings/core/browser/website_settings_registry.cc.orig	2016-10-06 04:02:16.000000000 +0300
>-+++ components/content_settings/core/browser/website_settings_registry.cc	2016-10-13 13:04:35.828985000 +0300
>-@@ -88,6 +88,9 @@
>+--- components/content_settings/core/browser/website_settings_registry.cc.orig	2016-12-09 05:04:18 UTC
>++++ components/content_settings/core/browser/website_settings_registry.cc
>+@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin
>    // doesn't allow the settings to be managed in the same way. See
>    // crbug.com/642184.
>    sync_status = WebsiteSettingsInfo::UNSYNCABLE;
>Index: www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h
>===================================================================
>--- www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h	(revision 432254)
>+++ www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.h	(working copy)
>@@ -1,6 +1,6 @@
>---- components/content_settings/core/browser/website_settings_registry.h.orig	2016-10-06 04:02:16.000000000 +0300
>-+++ components/content_settings/core/browser/website_settings_registry.h	2016-10-13 13:24:49.647706000 +0300
>-@@ -36,10 +36,11 @@
>+--- components/content_settings/core/browser/website_settings_registry.h.orig	2016-12-09 05:04:18 UTC
>++++ components/content_settings/core/browser/website_settings_registry.h
>+@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry {
>      PLATFORM_MAC = 1 << 3,
>      PLATFORM_ANDROID = 1 << 4,
>      PLATFORM_IOS = 1 << 5,
>Index: www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
>===================================================================
>--- www/chromium/files/patch-components_cookie__config_cookie__store__util.cc	(revision 432254)
>+++ www/chromium/files/patch-components_cookie__config_cookie__store__util.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/cookie_config/cookie_store_util.cc.orig	2016-03-25 13:04:47 UTC
>+--- components/cookie_config/cookie_store_util.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/cookie_config/cookie_store_util.cc
> @@ -11,7 +11,7 @@
>  
>Index: www/chromium/files/patch-components_crash_content_app_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_crash_content_app_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_crash_content_app_BUILD.gn	(working copy)
>@@ -1,8 +1,8 @@
>---- components/crash/content/app/BUILD.gn.orig	2016-08-03 22:02:16.000000000 +0300
>-+++ components/crash/content/app/BUILD.gn	2016-09-18 01:39:59.921593000 +0300
>-@@ -141,7 +141,7 @@
>- 
>-       #'../breakpad/breakpad.gyp:breakpad_sender',  TODO(GYP)
>+--- components/crash/content/app/BUILD.gn.orig	2016-12-09 05:04:18 UTC
>++++ components/crash/content/app/BUILD.gn
>+@@ -145,7 +145,7 @@ source_set("app_non_mac_win") {
>+       "//breakpad:breakpad_handler",
>+       "//sandbox",
>      ]
> -  } else if (is_posix && !is_ios) {
> +  } else if (is_posix && !is_ios && !is_bsd) {
>Index: www/chromium/files/patch-components_crash_content_browser_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_crash_content_browser_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_crash_content_browser_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- components/crash/content/browser/BUILD.gn.orig	2016-08-03 22:02:16.000000000 +0300
>-+++ components/crash/content/browser/BUILD.gn	2016-09-13 13:38:48.133784000 +0300
>-@@ -16,7 +16,7 @@
>+--- components/crash/content/browser/BUILD.gn.orig	2016-12-09 05:04:18 UTC
>++++ components/crash/content/browser/BUILD.gn
>+@@ -16,7 +16,7 @@ source_set("browser") {
>  
>    deps = [
>      "//base",
>@@ -9,7 +9,7 @@
>      "//components/crash/content/app",
>      "//content/public/browser",
>      "//content/public/common",
>-@@ -39,7 +39,7 @@
>+@@ -39,7 +39,7 @@ source_set("browser") {
>    # This is not in the GYP build but this target includes breakpad client
>    # headers, so add the dependency here.
>    if (is_posix && !is_ios) {
>Index: www/chromium/files/patch-components_drive_drive__api__util.cc
>===================================================================
>--- www/chromium/files/patch-components_drive_drive__api__util.cc	(revision 432254)
>+++ www/chromium/files/patch-components_drive_drive__api__util.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/drive/drive_api_util.cc.orig	2016-05-11 19:02:18 UTC
>+--- components/drive/drive_api_util.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/drive/drive_api_util.cc
> @@ -22,7 +22,11 @@
>  #include "google_apis/drive/drive_api_parser.h"
>Index: www/chromium/files/patch-components_feedback_anonymizer__tool.cc
>===================================================================
>--- www/chromium/files/patch-components_feedback_anonymizer__tool.cc	(revision 432254)
>+++ www/chromium/files/patch-components_feedback_anonymizer__tool.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/feedback/anonymizer_tool.cc.orig	2016-05-11 19:02:18 UTC
>+--- components/feedback/anonymizer_tool.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/feedback/anonymizer_tool.cc
>-@@ -9,7 +9,11 @@
>+@@ -10,7 +10,11 @@
>  #include "base/strings/string_number_conversions.h"
>  #include "base/strings/string_util.h"
>  #include "base/strings/stringprintf.h"
>Index: www/chromium/files/patch-components_flags__ui_flags__state.cc
>===================================================================
>--- www/chromium/files/patch-components_flags__ui_flags__state.cc	(revision 432254)
>+++ www/chromium/files/patch-components_flags__ui_flags__state.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/flags_ui/flags_state.cc.orig	2016-03-25 13:04:47 UTC
>+--- components/flags_ui/flags_state.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/flags_ui/flags_state.cc
>-@@ -450,7 +450,7 @@ int FlagsState::GetCurrentPlatform() {
>+@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() {
>    return kOsWin;
>  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
>    return kOsCrOS;
>Index: www/chromium/files/patch-components_gcm__driver_gcm__client.h
>===================================================================
>--- www/chromium/files/patch-components_gcm__driver_gcm__client.h	(revision 432254)
>+++ www/chromium/files/patch-components_gcm__driver_gcm__client.h	(working copy)
>@@ -1,6 +1,6 @@
>---- components/gcm_driver/gcm_client.h.orig	2016-10-06 04:02:16.000000000 +0300
>-+++ components/gcm_driver/gcm_client.h	2016-10-13 13:05:38.414560000 +0300
>-@@ -80,6 +80,7 @@
>+--- components/gcm_driver/gcm_client.h.orig	2016-12-09 05:04:18 UTC
>++++ components/gcm_driver/gcm_client.h
>+@@ -80,6 +80,7 @@ class GCMClient {
>      PLATFORM_CROS,
>      PLATFORM_IOS,
>      PLATFORM_ANDROID,
>Index: www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
>===================================================================
>--- www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/gcm_driver/gcm_client_impl.cc.orig	2016-10-06 04:02:16.000000000 +0300
>-+++ components/gcm_driver/gcm_client_impl.cc	2016-10-13 13:07:14.340338000 +0300
>-@@ -137,6 +137,9 @@
>+--- components/gcm_driver/gcm_client_impl.cc.orig	2016-12-09 05:04:18 UTC
>++++ components/gcm_driver/gcm_client_impl.cc
>+@@ -135,6 +135,9 @@ void ToCheckinProtoVersion(
>      case GCMClient::PLATFORM_CROS:
>        platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;
>        break;
>Index: www/chromium/files/patch-components_json__schema_json__schema__validator.cc
>===================================================================
>--- www/chromium/files/patch-components_json__schema_json__schema__validator.cc	(revision 432254)
>+++ www/chromium/files/patch-components_json__schema_json__schema__validator.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/json_schema/json_schema_validator.cc.orig	2016-05-11 19:02:18 UTC
>+--- components/json_schema/json_schema_validator.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/json_schema/json_schema_validator.cc
>-@@ -20,7 +20,11 @@
>+@@ -21,7 +21,11 @@
>  #include "base/strings/stringprintf.h"
>  #include "base/values.h"
>  #include "components/json_schema/json_schema_constants.h"
>Index: www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
>===================================================================
>--- www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/keyed_service/core/dependency_graph_unittest.cc.orig	2016-03-25 13:04:47 UTC
>+--- components/keyed_service/core/dependency_graph_unittest.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/keyed_service/core/dependency_graph_unittest.cc
> @@ -9,7 +9,11 @@
>  #include "components/keyed_service/core/dependency_graph.h"
>Index: www/chromium/files/patch-components_metrics_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_metrics_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_metrics_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- components/metrics/BUILD.gn.orig	2016-12-12 20:38:32 UTC
>+--- components/metrics/BUILD.gn.orig	2016-12-09 05:04:18 UTC
> +++ components/metrics/BUILD.gn
> @@ -107,6 +107,13 @@ static_library("metrics") {
>    if (is_win) {
>Index: www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
>===================================================================
>--- www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/metrics/drive_metrics_provider_linux.cc.orig	2016-03-25 13:04:47 UTC
>+--- components/metrics/drive_metrics_provider_linux.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/metrics/drive_metrics_provider_linux.cc
> @@ -4,7 +4,13 @@
>  
>Index: www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
>===================================================================
>--- www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/metrics/system_memory_stats_recorder_linux.cc.orig	2016-03-25 13:04:47 UTC
>+--- components/metrics/system_memory_stats_recorder_linux.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/metrics/system_memory_stats_recorder_linux.cc
> @@ -30,6 +30,7 @@ namespace metrics {
>    UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
>Index: www/chromium/files/patch-components_neterror_resources_neterror.js
>===================================================================
>--- www/chromium/files/patch-components_neterror_resources_neterror.js	(revision 432254)
>+++ www/chromium/files/patch-components_neterror_resources_neterror.js	(working copy)
>@@ -1,6 +1,6 @@
>---- components/neterror/resources/neterror.js.orig	2016-05-11 19:02:18 UTC
>+--- components/neterror/resources/neterror.js.orig	2016-12-09 05:04:18 UTC
> +++ components/neterror/resources/neterror.js
>-@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings
>+@@ -147,7 +147,7 @@ function setUpCachedButton(buttonStrings
>  }
>  
>  var primaryControlOnLeft = true;
>Index: www/chromium/files/patch-components_os__crypt_os__crypt.h
>===================================================================
>--- www/chromium/files/patch-components_os__crypt_os__crypt.h	(revision 432254)
>+++ www/chromium/files/patch-components_os__crypt_os__crypt.h	(working copy)
>@@ -1,5 +1,5 @@
>---- components/os_crypt/os_crypt.h.orig	2016-10-06 04:02:17.000000000 +0300
>-+++ components/os_crypt/os_crypt.h	2016-10-13 11:41:26.429931000 +0300
>+--- components/os_crypt/os_crypt.h.orig	2016-12-09 05:04:18 UTC
>++++ components/os_crypt/os_crypt.h
> @@ -13,7 +13,7 @@
>  #include "base/strings/string16.h"
>  #include "build/build_config.h"
>Index: www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc
>===================================================================
>--- www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc	(revision 432254)
>+++ www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/password_manager/core/browser/import/csv_reader.cc.orig	2016-03-25 13:04:48 UTC
>+--- components/password_manager/core/browser/import/csv_reader.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/password_manager/core/browser/import/csv_reader.cc
> @@ -9,7 +9,11 @@
>  #include "base/logging.h"
>Index: www/chromium/files/patch-components_plugins_renderer_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_plugins_renderer_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_plugins_renderer_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- components/plugins/renderer/BUILD.gn.orig	2016-08-03 22:02:16.000000000 +0300
>-+++ components/plugins/renderer/BUILD.gn	2016-09-26 06:14:10.664010000 +0300
>-@@ -25,6 +25,7 @@
>+--- components/plugins/renderer/BUILD.gn.orig	2016-12-09 05:04:18 UTC
>++++ components/plugins/renderer/BUILD.gn
>+@@ -25,6 +25,7 @@ static_library("renderer") {
>    }
>  
>    deps = [
>@@ -8,7 +8,7 @@
>      "//content/public/child",
>      "//content/public/common",
>      "//content/public/renderer",
>-@@ -33,6 +34,5 @@
>+@@ -33,6 +34,5 @@ static_library("renderer") {
>      "//third_party/WebKit/public:blink",
>      "//third_party/re2",
>      "//ui/base",
>Index: www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
>===================================================================
>--- www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc	(revision 432254)
>+++ www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/plugins/renderer/plugin_placeholder.cc.orig	2016-03-25 13:04:48 UTC
>+--- components/plugins/renderer/plugin_placeholder.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/plugins/renderer/plugin_placeholder.cc
> @@ -11,7 +11,11 @@
>  #include "gin/object_template_builder.h"
>Index: www/chromium/files/patch-components_policy_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_policy_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_policy_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- components/policy/BUILD.gn.orig	2016-08-03 22:02:16.000000000 +0300
>-+++ components/policy/BUILD.gn	2016-09-03 01:58:22.866259000 +0300
>-@@ -141,7 +141,7 @@
>+--- components/policy/BUILD.gn.orig	2016-12-09 05:04:18 UTC
>++++ components/policy/BUILD.gn
>+@@ -109,7 +109,7 @@ if (enable_configuration_policy) {
>      if (is_android) {
>        outputs += policy_templates_android_outputs
>      }
>Index: www/chromium/files/patch-components_policy_core_common_schema.cc
>===================================================================
>--- www/chromium/files/patch-components_policy_core_common_schema.cc	(revision 432254)
>+++ www/chromium/files/patch-components_policy_core_common_schema.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/policy/core/common/schema.cc.orig	2016-05-11 19:02:18 UTC
>+--- components/policy/core/common/schema.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/policy/core/common/schema.cc
> @@ -21,7 +21,11 @@
>  #include "components/json_schema/json_schema_constants.h"
>Index: www/chromium/files/patch-components_policy_resources_policy__templates.json
>===================================================================
>--- www/chromium/files/patch-components_policy_resources_policy__templates.json	(revision 432254)
>+++ www/chromium/files/patch-components_policy_resources_policy__templates.json	(working copy)
>@@ -1,6 +1,6 @@
>---- components/policy/resources/policy_templates.json.orig	2016-10-06 04:02:17.000000000 +0300
>-+++ components/policy/resources/policy_templates.json	2016-10-17 00:01:03.979810000 +0300
>-@@ -909,7 +909,7 @@
>+--- components/policy/resources/policy_templates.json.orig	2016-12-09 05:04:18 UTC
>++++ components/policy/resources/policy_templates.json
>+@@ -932,7 +932,7 @@
>            'name': 'RemoteAccessHostMatchUsername',
>            'type': 'main',
>            'schema': { 'type': 'boolean' },
>@@ -9,7 +9,7 @@
>            'features': {
>              'dynamic_refresh': True,
>              'per_profile': False,
>-@@ -1930,7 +1930,7 @@
>+@@ -2056,7 +2056,7 @@
>            'name': 'GSSAPILibraryName',
>            'type': 'string',
>            'schema': { 'type': 'string' },
>@@ -18,7 +18,7 @@
>            'features': {
>              'dynamic_refresh': False,
>              'per_profile': False,
>-@@ -4601,7 +4601,7 @@
>+@@ -4733,7 +4733,7 @@
>        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
>        'type': 'main',
>        'schema': { 'type': 'boolean' },
>@@ -27,7 +27,7 @@
>        'features': {
>          'dynamic_refresh': True,
>          'per_profile': False,
>-@@ -5449,7 +5449,7 @@
>+@@ -5618,7 +5618,7 @@
>        'name': 'BackgroundModeEnabled',
>        'type': 'main',
>        'schema': { 'type': 'boolean' },
>@@ -36,7 +36,7 @@
>        'features': {
>          'can_be_recommended': True,
>          'dynamic_refresh': True,
>-@@ -5974,7 +5974,7 @@
>+@@ -6141,7 +6141,7 @@
>        'name': 'FullscreenAllowed',
>        'type': 'main',
>        'schema': { 'type': 'boolean' },
>Index: www/chromium/files/patch-components_policy_tools_generate__policy__source.py
>===================================================================
>--- www/chromium/files/patch-components_policy_tools_generate__policy__source.py	(revision 432254)
>+++ www/chromium/files/patch-components_policy_tools_generate__policy__source.py	(working copy)
>@@ -1,6 +1,6 @@
>---- components/policy/tools/generate_policy_source.py.orig	2016-08-03 22:02:16.000000000 +0300
>-+++ components/policy/tools/generate_policy_source.py	2016-09-20 17:13:04.971596000 +0300
>-@@ -102,7 +102,7 @@
>+--- components/policy/tools/generate_policy_source.py.orig	2016-12-09 05:04:18 UTC
>++++ components/policy/tools/generate_policy_source.py
>+@@ -102,7 +102,7 @@ class PolicyDetails:
>        if platform.startswith('chrome.'):
>          platform_sub = platform[7:]
>          if platform_sub == '*':
>Index: www/chromium/files/patch-components_storage__monitor_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-components_storage__monitor_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-components_storage__monitor_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- components/storage_monitor/BUILD.gn.orig	2016-12-01 23:02:12 UTC
>+--- components/storage_monitor/BUILD.gn.orig	2016-12-09 05:04:18 UTC
> +++ components/storage_monitor/BUILD.gn
> @@ -65,6 +65,21 @@ static_library("storage_monitor") {
>      ]
>Index: www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
>===================================================================
>--- www/chromium/files/patch-components_storage__monitor_storage__monitor.cc	(revision 432254)
>+++ www/chromium/files/patch-components_storage__monitor_storage__monitor.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/storage_monitor/storage_monitor.cc.orig	2016-12-01 23:02:12 UTC
>+--- components/storage_monitor/storage_monitor.cc.orig	2016-12-09 05:04:18 UTC
> +++ components/storage_monitor/storage_monitor.cc
> @@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
>  
>Index: www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
>===================================================================
>--- www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc	(revision 432254)
>+++ www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/storage_monitor/storage_monitor_freebsd.cc.orig	2016-05-20 17:18:26 UTC
>+--- components/storage_monitor/storage_monitor_freebsd.cc.orig	2017-01-24 00:07:06 UTC
> +++ components/storage_monitor/storage_monitor_freebsd.cc
> @@ -0,0 +1,101 @@
> +// Copyright 2014 The Chromium Authors. All rights reserved.
>Index: www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
>===================================================================
>--- www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h	(revision 432254)
>+++ www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h	(working copy)
>@@ -1,5 +1,5 @@
>---- components/storage_monitor/storage_monitor_freebsd.h.orig	2016-08-04 10:46:30.556442000 -0400
>-+++ components/storage_monitor/storage_monitor_freebsd.h	2016-08-04 14:57:59.255434000 -0400
>+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2017-01-24 00:07:06 UTC
>++++ components/storage_monitor/storage_monitor_freebsd.h
> @@ -0,0 +1,45 @@
> +// Copyright 2014 The Chromium Authors. All rights reserved.
> +// Use of this source code is governed by a BSD-style license that can be
>Index: www/chromium/files/patch-components_sync_base_get__session__name__linux.cc
>===================================================================
>--- www/chromium/files/patch-components_sync_base_get__session__name__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-components_sync_base_get__session__name__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- components/sync/base/get_session_name_linux.cc.orig	2016-10-06 04:02:17.000000000 +0300
>-+++ components/sync/base/get_session_name_linux.cc	2016-10-13 13:40:16.075193000 +0300
>+--- components/sync/base/get_session_name_linux.cc.orig	2016-12-09 05:04:18 UTC
>++++ components/sync/base/get_session_name_linux.cc
> @@ -4,7 +4,7 @@
>  
>  #include "components/sync/base/get_session_name_linux.h"
>@@ -9,7 +9,7 @@
>  #include <unistd.h>  // for gethostname()
>  
>  #include "base/linux_util.h"
>-@@ -13,8 +13,8 @@
>+@@ -13,8 +13,8 @@ namespace syncer {
>  namespace internal {
>  
>  std::string GetHostname() {
>Index: www/chromium/files/patch-components_update__client_update__query__params.cc
>===================================================================
>--- www/chromium/files/patch-components_update__client_update__query__params.cc	(revision 432254)
>+++ www/chromium/files/patch-components_update__client_update__query__params.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/update_client/update_query_params.cc.orig	2016-05-11 19:02:20 UTC
>+--- components/update_client/update_query_params.cc.orig	2016-12-09 05:04:19 UTC
> +++ components/update_client/update_query_params.cc
> @@ -31,6 +31,8 @@ const char kOs[] =
>      "linux";
>Index: www/chromium/files/patch-components_url__formatter_url__formatter.cc
>===================================================================
>--- www/chromium/files/patch-components_url__formatter_url__formatter.cc	(revision 432254)
>+++ www/chromium/files/patch-components_url__formatter_url__formatter.cc	(working copy)
>@@ -1,8 +1,8 @@
> https://chromium.googlesource.com/chromium/src.git/+/424584b4984bde7c831f42e9fb47f1ad583a1c46%5E%21/
> 
>---- components/url_formatter/url_formatter.cc.orig	2016-08-03 19:02:17 UTC
>+--- components/url_formatter/url_formatter.cc.orig	2016-12-09 05:04:19 UTC
> +++ components/url_formatter/url_formatter.cc
>-@@ -429,9 +429,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS
>+@@ -428,9 +428,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS
>    // section at
>    // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are
>    // are added to the allowed set. The list has to be updated when a new
>@@ -15,7 +15,7 @@
>    const icu::UnicodeSet aspirational_scripts(
>        icu::UnicodeString(
>            // Unified Canadian Syllabics
>-@@ -445,13 +445,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS
>+@@ -444,13 +444,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS
>            // Yi
>            "\\uA000-\\uA48C"
>            // Miao
>Index: www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
>===================================================================
>--- www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc	(revision 432254)
>+++ www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- components/url_matcher/regex_set_matcher.cc.orig	2016-03-25 13:04:48 UTC
>+--- components/url_matcher/regex_set_matcher.cc.orig	2016-12-09 05:04:19 UTC
> +++ components/url_matcher/regex_set_matcher.cc
> @@ -10,8 +10,13 @@
>  #include "base/stl_util.h"
>Index: www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
>===================================================================
>--- www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/url_matcher/url_matcher_factory.cc.orig	2016-05-11 19:02:20 UTC
>+--- components/url_matcher/url_matcher_factory.cc.orig	2016-12-09 05:04:19 UTC
> +++ components/url_matcher/url_matcher_factory.cc
>-@@ -15,7 +15,11 @@
>+@@ -16,7 +16,11 @@
>  #include "base/values.h"
>  #include "components/url_matcher/url_matcher_constants.h"
>  #include "components/url_matcher/url_matcher_helpers.h"
>Index: www/chromium/files/patch-components_variations_proto_study.proto
>===================================================================
>--- www/chromium/files/patch-components_variations_proto_study.proto	(revision 432254)
>+++ www/chromium/files/patch-components_variations_proto_study.proto	(working copy)
>@@ -1,6 +1,6 @@
>---- components/variations/proto/study.proto.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ components/variations/proto/study.proto	2016-10-13 13:02:20.586397000 +0300
>-@@ -189,6 +189,7 @@
>+--- components/variations/proto/study.proto.orig	2016-12-09 05:04:19 UTC
>++++ components/variations/proto/study.proto
>+@@ -189,6 +189,7 @@ message Study {
>      PLATFORM_CHROMEOS = 3;
>      PLATFORM_ANDROID  = 4;
>      PLATFORM_IOS      = 5;
>Index: www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
>===================================================================
>--- www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc	(revision 432254)
>+++ www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- components/webcrypto/algorithms/test_helpers.cc.orig	2016-05-11 19:02:20 UTC
>+--- components/webcrypto/algorithms/test_helpers.cc.orig	2016-12-09 05:04:19 UTC
> +++ components/webcrypto/algorithms/test_helpers.cc
>-@@ -26,7 +26,11 @@
>+@@ -25,7 +25,11 @@
>  #include "components/webcrypto/status.h"
>  #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
>  #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
>Index: www/chromium/files/patch-content_app_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_app_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_app_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- content/app/BUILD.gn.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ content/app/BUILD.gn	2016-10-13 06:35:58.585406000 +0300
>-@@ -66,7 +66,7 @@
>+--- content/app/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ content/app/BUILD.gn
>+@@ -68,7 +68,7 @@ template("implement_content_app") {
>      ]
>    }
>  
>Index: www/chromium/files/patch-content_app_content__main__runner.cc
>===================================================================
>--- www/chromium/files/patch-content_app_content__main__runner.cc	(revision 432254)
>+++ www/chromium/files/patch-content_app_content__main__runner.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/app/content_main_runner.cc.orig	2016-05-11 19:02:20 UTC
>+--- content/app/content_main_runner.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/app/content_main_runner.cc
>-@@ -98,10 +98,10 @@
>+@@ -96,10 +96,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
>  
>-@@ -273,7 +273,7 @@ struct MainFunction {
>+@@ -293,7 +293,7 @@ struct MainFunction {
>    int (*function)(const MainFunctionParams&);
>  };
>  
>@@ -22,7 +22,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().
>-@@ -322,7 +322,7 @@ int RunZygote(const MainFunctionParams& 
>+@@ -345,7 +345,7 @@ int RunZygote(const MainFunctionParams& 
>    NOTREACHED() << "Unknown zygote process type: " << process_type;
>    return 1;
>  }
>@@ -29,9 +29,9 @@
> -#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
> +#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
>  
>- #if !defined(OS_IOS)
>  static void RegisterMainThreadFactories() {
>-@@ -396,7 +396,7 @@ int RunNamedProcessTypeMain(
>+ #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
>+@@ -412,7 +412,7 @@ int RunNamedProcessTypeMain(
>      }
>    }
>  
>Index: www/chromium/files/patch-content_browser_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_browser_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_browser_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/BUILD.gn.orig	2016-12-01 23:02:12.000000000 +0000
>-+++ content/browser/BUILD.gn	2016-12-14 14:34:21.739126000 +0000
>-@@ -1399,6 +1399,12 @@
>+--- content/browser/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/BUILD.gn
>+@@ -1399,6 +1399,12 @@ source_set("browser") {
>      ]
>    }
>  
>@@ -13,7 +13,7 @@
>    if (!is_win) {
>      sources += [
>        "file_descriptor_info_impl.cc",
>-@@ -1462,7 +1468,7 @@
>+@@ -1462,7 +1468,7 @@ source_set("browser") {
>      if (!is_ios) {
>        defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
>      }
>@@ -22,7 +22,7 @@
>        sources += [
>          "media/capture/desktop_capture_device.cc",
>          "media/capture/desktop_capture_device.h",
>-@@ -1629,7 +1635,7 @@
>+@@ -1629,7 +1635,7 @@ source_set("browser") {
>      }
>    }
>  
>@@ -31,7 +31,7 @@
>      deps += [ "//build/linux:fontconfig" ]
>    }
>  
>-@@ -1782,6 +1788,17 @@
>+@@ -1782,6 +1788,17 @@ source_set("browser") {
>        "//chromeos",
>        "//chromeos:power_manager_proto",
>      ]
>@@ -49,7 +49,7 @@
>    }
>  
>    if (use_aura) {
>-@@ -1899,11 +1916,11 @@
>+@@ -1899,11 +1916,11 @@ source_set("browser") {
>      deps += [ "//third_party/flac" ]
>    }
>  
>Index: www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h
>===================================================================
>--- www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h	(revision 432254)
>+++ www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h	(working copy)
>@@ -1,5 +1,5 @@
>---- content/browser/accessibility/browser_accessibility.h.orig	2016-05-25 15:01:01.000000000 -0400
>-+++ content/browser/accessibility/browser_accessibility.h	2016-05-27 10:16:53.216804000 -0400
>+--- content/browser/accessibility/browser_accessibility.h.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/accessibility/browser_accessibility.h
> @@ -38,7 +38,7 @@
>  #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
>  #endif
>@@ -9,7 +9,7 @@
>  #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
>  #endif
>  
>-@@ -50,7 +50,7 @@
>+@@ -50,7 +50,7 @@ namespace content {
>  class BrowserAccessibilityManager;
>  #if defined(OS_WIN)
>  class BrowserAccessibilityWin;
>Index: www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
>===================================================================
>--- www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h	(revision 432254)
>+++ www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/accessibility/browser_accessibility_manager.h.orig	2016-05-21 11:59:58 UTC
>+--- content/browser/accessibility/browser_accessibility_manager.h.orig	2016-12-09 05:04:19 UTC
> +++ content/browser/accessibility/browser_accessibility_manager.h
>-@@ -31,7 +31,7 @@ class BrowserAccessibilityManager;
>+@@ -33,7 +33,7 @@ class BrowserAccessibilityManager;
>  class BrowserAccessibilityManagerAndroid;
>  #elif defined(OS_WIN)
>  class BrowserAccessibilityManagerWin;
>@@ -7,9 +7,9 @@
> -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
> +#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
>  class BrowserAccessibilityManagerAuraLinux;
>- #endif
>- 
>-@@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit
>+ #elif defined(OS_MACOSX)
>+ class BrowserAccessibilityManagerMac;
>+@@ -268,7 +268,7 @@ class CONTENT_EXPORT BrowserAccessibilit
>    BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
>  #endif
>  
>Index: www/chromium/files/patch-content_browser_browser__main__loop.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_browser__main__loop.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_browser__main__loop.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- content/browser/browser_main_loop.cc.orig	2016-12-15 13:00:14.708308000 +0000
>-+++ content/browser/browser_main_loop.cc	2016-12-15 13:05:18.516426000 +0000
>+--- content/browser/browser_main_loop.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/browser_main_loop.cc
> @@ -196,6 +196,10 @@
>  #include "gpu/vulkan/vulkan_implementation.h"
>  #endif
>@@ -20,7 +20,7 @@
>  void SetupSandbox(const base::CommandLine& parsed_command_line) {
>    TRACE_EVENT0("startup", "SetupSandbox");
>    if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
>-@@ -475,10 +479,15 @@
>+@@ -475,10 +479,15 @@ void BrowserMainLoop::Init() {
>  void BrowserMainLoop::EarlyInitialization() {
>    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
>  
>Index: www/chromium/files/patch-content_browser_child__process__launcher.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_child__process__launcher.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_child__process__launcher.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/browser/child_process_launcher.cc.orig	2016-12-12 21:01:52 UTC
>+--- content/browser/child_process_launcher.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/browser/child_process_launcher.cc
> @@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const Notify
>    // We need to close the client end of the IPC channel to reliably detect
>Index: www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h
>===================================================================
>--- www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h	(revision 432254)
>+++ www/chromium/files/patch-content_browser_device__sensors_data__fetcher__shared__memory.h	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/device_sensors/data_fetcher_shared_memory.h.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ content/browser/device_sensors/data_fetcher_shared_memory.h	2016-10-14 15:15:34.071484000 +0300
>-@@ -45,7 +45,7 @@
>+--- content/browser/device_sensors/data_fetcher_shared_memory.h.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/device_sensors/data_fetcher_shared_memory.h
>+@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMe
>    bool Start(ConsumerType consumer_type, void* buffer) override;
>    bool Stop(ConsumerType consumer_type) override;
>  
>Index: www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/devtools/protocol/color_picker.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/devtools/protocol/color_picker.cc	2016-08-18 02:35:16.268652000 +0300
>-@@ -151,7 +151,7 @@
>+--- content/browser/devtools/protocol/color_picker.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/devtools/protocol/color_picker.cc
>+@@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() {
>    // magnified projection only with centered hotspot.
>    // Mac Retina requires cursor to be > 120px in order to render smoothly.
>  
>Index: www/chromium/files/patch-content_browser_download_base__file.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_download_base__file.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_download_base__file.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/browser/download/base_file.cc.orig	2016-12-12 21:09:50 UTC
>+--- content/browser/download/base_file.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/browser/download/base_file.cc
> @@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt
>    return reason;
>Index: www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ content/browser/gpu/gpu_data_manager_impl_private.cc	2016-10-14 17:58:04.977933000 +0300
>-@@ -363,7 +363,7 @@
>+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/gpu/gpu_data_manager_impl_private.cc
>+@@ -358,7 +358,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
>      // strings even if all features are blacklisted. If all GPU features are
>      // disabled, the GPU process will only initialize GL bindings, create a GL
>      // context, and collect full GPU info.
>@@ -9,7 +9,7 @@
>      if (reason) {
>        *reason = "All GPU features are blacklisted.";
>      }
>-@@ -486,8 +486,10 @@
>+@@ -475,8 +475,10 @@ void GpuDataManagerImplPrivate::SetGLStr
>    gpu_info.gl_renderer = gl_renderer;
>    gpu_info.gl_version = gl_version;
>  
>@@ -20,7 +20,7 @@
>  
>    UpdateGpuInfo(gpu_info);
>    UpdateGpuSwitchingManager(gpu_info);
>-@@ -542,10 +544,12 @@
>+@@ -531,10 +533,12 @@ void GpuDataManagerImplPrivate::Initiali
>      // Skip collecting the basic driver info if SetGpuInfo() is already called.
>      if (IsCompleteGpuInfoAvailable()) {
>        gpu_info = gpu_info_;
>@@ -33,7 +33,7 @@
>      }
>  
>      if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
>-@@ -657,7 +661,9 @@
>+@@ -646,7 +650,9 @@ void GpuDataManagerImplPrivate::UpdateGp
>      return;
>  
>    bool was_info_available = IsCompleteGpuInfoAvailable();
>Index: www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
>===================================================================
>--- www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h	(revision 432254)
>+++ www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/gpu/gpu_data_manager_impl_private.h	2016-08-18 02:42:16.971805000 +0300
>-@@ -154,7 +154,7 @@
>+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/gpu/gpu_data_manager_impl_private.h
>+@@ -154,7 +154,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
>                             UnblockOtherDomainFrom3DAPIs);
>    FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
>                             UnblockThisDomainFrom3DAPIs);
>Index: www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- content/browser/gpu/gpu_internals_ui.cc.orig	2016-07-22 00:06:54.000000000 -0400
>-+++ content/browser/gpu/gpu_internals_ui.cc	2016-08-03 12:29:59.399353000 -0400
>-@@ -39,7 +39,7 @@
>- #include "third_party/angle/src/common/version.h"
>+--- content/browser/gpu/gpu_internals_ui.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/gpu/gpu_internals_ui.cc
>+@@ -42,7 +42,7 @@
>+ #include "third_party/skia/include/core/SkMilestone.h"
>  #include "ui/gl/gpu_switching_manager.h"
>  
> -#if defined(OS_LINUX) && defined(USE_X11)
>@@ -9,7 +9,7 @@
>  #include <X11/Xlib.h>
>  #endif
>  #if defined(OS_WIN)
>-@@ -47,7 +47,7 @@
>+@@ -50,7 +50,7 @@
>  #include "ui/gfx/win/physical_size.h"
>  #endif
>  
>@@ -18,7 +18,7 @@
>  #include "ui/base/x/x11_util.h"       // nogncheck
>  #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
>  #endif
>-@@ -200,7 +200,7 @@
>+@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona
>                                               gpu_info.gl_ws_version));
>    basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
>                                               gpu_info.gl_ws_extensions));
>Index: www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/gpu/gpu_process_host.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/gpu/gpu_process_host.cc	2016-08-18 02:45:06.533983000 +0300
>-@@ -968,7 +968,7 @@
>+--- content/browser/gpu/gpu_process_host.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/gpu/gpu_process_host.cc
>+@@ -980,7 +980,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
>    base::CommandLine* cmd_line =
>        new base::CommandLine(base::CommandLine::NO_PROGRAM);
>  #else
>Index: www/chromium/files/patch-content_browser_media_media__internals.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_media_media__internals.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_media_media__internals.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/media/media_internals.cc.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ content/browser/media/media_internals.cc	2016-10-13 06:53:50.938946000 +0300
>-@@ -724,7 +724,7 @@
>+--- content/browser/media/media_internals.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/media/media_internals.cc
>+@@ -724,7 +724,7 @@ void MediaInternals::UpdateVideoCaptureD
>      device_dict->SetString("name", descriptor.GetNameAndModel());
>      device_dict->Set("formats", format_list);
>  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
>Index: www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/ppapi_plugin_process_host.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/ppapi_plugin_process_host.cc	2016-08-18 02:36:09.470007000 +0300
>-@@ -49,7 +49,7 @@
>+--- content/browser/ppapi_plugin_process_host.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/ppapi_plugin_process_host.cc
>+@@ -52,7 +52,7 @@
>  
>  namespace content {
>  
>@@ -9,7 +9,7 @@
>  ZygoteHandle g_ppapi_zygote;
>  #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
>  
>-@@ -114,7 +114,7 @@
>+@@ -119,7 +119,7 @@ class PpapiPluginSandboxedProcessLaunche
>    }
>  
>  #elif defined(OS_POSIX)
>@@ -18,7 +18,7 @@
>    ZygoteHandle* GetZygote() override {
>      const base::CommandLine& browser_command_line =
>          *base::CommandLine::ForCurrentProcess();
>-@@ -214,7 +214,7 @@
>+@@ -222,7 +222,7 @@ PpapiPluginProcessHost* PpapiPluginProce
>    return NULL;
>  }
>  
>@@ -27,7 +27,7 @@
>  // static
>  void PpapiPluginProcessHost::EarlyZygoteLaunch() {
>    DCHECK(!g_ppapi_zygote);
>-@@ -377,7 +377,7 @@
>+@@ -380,7 +380,7 @@ bool PpapiPluginProcessHost::Init(const 
>    base::CommandLine::StringType plugin_launcher =
>        browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
>  
>Index: www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- content/browser/renderer_host/render_process_host_impl.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/renderer_host/render_process_host_impl.cc	2016-08-18 02:32:43.439813000 +0300
>-@@ -359,7 +359,7 @@
>-   return map;
>- }
>+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/renderer_host/render_process_host_impl.cc
>+@@ -381,7 +381,7 @@ class AssociatedInterfaceHolder : public
>+   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfaceHolder);
>+ };
>  
> -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
> +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
>@@ -9,7 +9,7 @@
>  // This static member variable holds the zygote communication information for
>  // the renderer.
>  ZygoteHandle g_render_zygote;
>-@@ -392,7 +392,7 @@
>+@@ -414,7 +414,7 @@ class RendererSandboxedProcessLauncherDe
>    }
>  
>  #elif defined(OS_POSIX)
>@@ -18,7 +18,7 @@
>    ZygoteHandle* GetZygote() override {
>      const base::CommandLine& browser_command_line =
>          *base::CommandLine::ForCurrentProcess();
>-@@ -514,7 +514,7 @@
>+@@ -661,7 +661,7 @@ void RenderProcessHost::SetMaxRendererPr
>    g_max_renderer_count_override = count;
>  }
>  
>@@ -27,7 +27,7 @@
>  // static
>  void RenderProcessHostImpl::EarlyZygoteLaunch() {
>    DCHECK(!g_render_zygote);
>-@@ -684,7 +684,7 @@
>+@@ -859,7 +859,7 @@ bool RenderProcessHostImpl::Init() {
>    renderer_prefix =
>        browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
>  
>Index: www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-10-06 04:02:18.000000000 +0300
>-+++ content/browser/renderer_host/render_widget_host_view_aura.cc	2016-10-13 07:01:47.728403000 +0300
>+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/renderer_host/render_widget_host_view_aura.cc
> @@ -106,7 +106,7 @@
>  #include "ui/gfx/gdi_util.h"
>  #endif
>@@ -9,7 +9,7 @@
>  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
>  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
>  #endif
>-@@ -2479,7 +2479,7 @@
>+@@ -2504,7 +2504,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
>  }
>  
>  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
>@@ -18,7 +18,7 @@
>    return NeedsInputGrab();
>  #endif
>    return false;
>-@@ -2711,7 +2711,7 @@
>+@@ -2735,7 +2735,7 @@ void RenderWidgetHostViewAura::ForwardKe
>    if (!target_host)
>      return;
>  
>Index: www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_tracing_tracing__controller__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/browser/tracing/tracing_controller_impl.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/tracing/tracing_controller_impl.cc	2016-08-18 02:46:09.991782000 +0300
>-@@ -496,7 +496,7 @@
>+--- content/browser/tracing/tracing_controller_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/tracing/tracing_controller_impl.cc
>+@@ -515,7 +515,7 @@ void TracingControllerImpl::AddTraceMess
>      return;
>    }
>  
>Index: www/chromium/files/patch-content_browser_utility__process__host__impl.cc
>===================================================================
>--- www/chromium/files/patch-content_browser_utility__process__host__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-content_browser_utility__process__host__impl.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- content/browser/utility_process_host_impl.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/browser/utility_process_host_impl.cc	2016-08-18 02:26:27.996136000 +0300
>-@@ -38,7 +38,7 @@
>- #include "ipc/ipc_switches.h"
>+--- content/browser/utility_process_host_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/browser/utility_process_host_impl.cc
>+@@ -43,7 +43,7 @@
>+ #include "services/shell/public/cpp/interface_provider.h"
>  #include "ui/base/ui_base_switches.h"
>  
> -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
>@@ -9,7 +9,7 @@
>  #include "content/public/browser/zygote_handle_linux.h"
>  #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
>  
>-@@ -49,7 +49,7 @@
>+@@ -54,7 +54,7 @@
>  
>  namespace content {
>  
>@@ -18,7 +18,7 @@
>  namespace {
>  ZygoteHandle g_utility_zygote;
>  }  // namespace
>-@@ -69,7 +69,7 @@
>+@@ -74,7 +74,7 @@ class UtilitySandboxedProcessLauncherDel
>          launch_elevated_(launch_elevated)
>  #elif defined(OS_POSIX)
>          env_(env),
>@@ -27,7 +27,7 @@
>          no_sandbox_(no_sandbox),
>  #endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID)
>          ipc_fd_(host->TakeClientFileDescriptor())
>-@@ -101,7 +101,7 @@
>+@@ -106,7 +106,7 @@ class UtilitySandboxedProcessLauncherDel
>  
>  #elif defined(OS_POSIX)
>  
>@@ -36,7 +36,7 @@
>    ZygoteHandle* GetZygote() override {
>      if (no_sandbox_ || !exposed_dir_.empty())
>        return nullptr;
>-@@ -123,7 +123,7 @@
>+@@ -128,7 +128,7 @@ class UtilitySandboxedProcessLauncherDel
>    bool launch_elevated_;
>  #elif defined(OS_POSIX)
>    base::EnvironmentMap env_;
>@@ -45,7 +45,7 @@
>    bool no_sandbox_;
>  #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
>    base::ScopedFD ipc_fd_;
>-@@ -151,7 +151,7 @@
>+@@ -156,7 +156,7 @@ UtilityProcessHostImpl::UtilityProcessHo
>        is_batch_mode_(false),
>        no_sandbox_(false),
>        run_elevated_(false),
>@@ -54,7 +54,7 @@
>        child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
>  #else
>        child_flags_(ChildProcessHost::CHILD_NORMAL),
>-@@ -232,7 +232,7 @@
>+@@ -237,7 +237,7 @@ void UtilityProcessHostImpl::SetName(con
>    name_ = name;
>  }
>  
>Index: www/chromium/files/patch-content_common_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_common_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_common_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- content/common/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ content/common/BUILD.gn	2016-10-09 05:21:51.439131000 +0300
>-@@ -179,7 +179,7 @@
>+--- content/common/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ content/common/BUILD.gn
>+@@ -503,7 +503,7 @@ source_set("common") {
>    if (use_seccomp_bpf) {
>      defines += [ "USE_SECCOMP_BPF" ]
>    } else {
>@@ -9,7 +9,7 @@
>        sources -= [
>          "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
>          "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
>-@@ -193,6 +193,15 @@
>+@@ -517,6 +517,15 @@ source_set("common") {
>          "sandbox_linux/bpf_utility_policy_linux.h",
>          "sandbox_linux/sandbox_bpf_base_policy_linux.cc",
>          "sandbox_linux/sandbox_bpf_base_policy_linux.h",
>Index: www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
>===================================================================
>--- www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig	2016-03-25 13:04:48 UTC
>+--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc
> @@ -7,7 +7,9 @@
>  #include <errno.h>
>Index: www/chromium/files/patch-content_common_set__process__title__linux.cc
>===================================================================
>--- www/chromium/files/patch-content_common_set__process__title__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-content_common_set__process__title__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/common/set_process_title_linux.cc.orig	2016-03-25 13:04:48 UTC
>+--- content/common/set_process_title_linux.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/common/set_process_title_linux.cc
> @@ -49,6 +49,8 @@
>  extern char** environ;
>Index: www/chromium/files/patch-content_common_set__process__title__linux.h
>===================================================================
>--- www/chromium/files/patch-content_common_set__process__title__linux.h	(revision 432254)
>+++ www/chromium/files/patch-content_common_set__process__title__linux.h	(working copy)
>@@ -1,4 +1,4 @@
>---- content/common/set_process_title_linux.h.orig	2016-03-25 13:04:48 UTC
>+--- content/common/set_process_title_linux.h.orig	2016-12-09 05:04:19 UTC
> +++ content/common/set_process_title_linux.h
> @@ -5,6 +5,9 @@
>  #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
>Index: www/chromium/files/patch-content_gpu_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_gpu_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_gpu_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- content/gpu/BUILD.gn.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ content/gpu/BUILD.gn	2016-10-15 10:05:38.417673000 +0300
>-@@ -98,6 +98,7 @@
>+--- content/gpu/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ content/gpu/BUILD.gn
>+@@ -97,6 +97,7 @@ target(link_target_type, "gpu_sources") 
>  
>    if (use_x11) {
>      deps += [ "//ui/events/platform/x11" ]
>Index: www/chromium/files/patch-content_gpu_gpu__child__thread.cc
>===================================================================
>--- www/chromium/files/patch-content_gpu_gpu__child__thread.cc	(revision 432254)
>+++ www/chromium/files/patch-content_gpu_gpu__child__thread.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/gpu/gpu_child_thread.cc.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ content/gpu/gpu_child_thread.cc	2016-10-14 15:27:34.081648000 +0300
>-@@ -419,6 +419,7 @@
>+--- content/gpu/gpu_child_thread.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/gpu/gpu_child_thread.cc
>+@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn
>    if (dead_on_arrival_)
>      return;
>  
>@@ -8,7 +8,7 @@
>  #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.
>-@@ -461,6 +462,7 @@
>+@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn
>      base::MessageLoop::current()->QuitWhenIdle();
>    }
>  #endif  // OS_WIN
>Index: www/chromium/files/patch-content_gpu_gpu__main.cc
>===================================================================
>--- www/chromium/files/patch-content_gpu_gpu__main.cc	(revision 432254)
>+++ www/chromium/files/patch-content_gpu_gpu__main.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/gpu/gpu_main.cc.orig	2016-12-01 23:02:13.000000000 +0000
>-+++ content/gpu/gpu_main.cc	2016-12-13 17:52:18.210016000 +0000
>-@@ -92,7 +92,7 @@
>+--- content/gpu/gpu_main.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/gpu/gpu_main.cc
>+@@ -92,7 +92,7 @@ namespace content {
>  
>  namespace {
>  
>@@ -9,7 +9,7 @@
>  bool StartSandboxLinux(gpu::GpuWatchdogThread*);
>  #elif defined(OS_WIN)
>  bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
>-@@ -145,7 +145,7 @@
>+@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu:
>  
>    bool EnsureSandboxInitialized(
>        gpu::GpuWatchdogThread* watchdog_thread) override {
>@@ -18,7 +18,7 @@
>      return StartSandboxLinux(watchdog_thread);
>  #elif defined(OS_WIN)
>      return StartSandboxWindows(sandbox_info_);
>-@@ -292,7 +292,7 @@
>+@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa
>  
>  namespace {
>  
>Index: www/chromium/files/patch-content_public_common_child__process__host.h
>===================================================================
>--- www/chromium/files/patch-content_public_common_child__process__host.h	(revision 432254)
>+++ www/chromium/files/patch-content_public_common_child__process__host.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ./content/public/common/child_process_host.h.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ ./content/public/common/child_process_host.h	2016-08-18 02:52:30.173927000 +0300
>-@@ -50,7 +50,7 @@
>+--- content/public/common/child_process_host.h.orig	2016-12-09 05:04:19 UTC
>++++ content/public/common/child_process_host.h
>+@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : 
>      // No special behavior requested.
>      CHILD_NORMAL = 0,
>  
>@@ -9,7 +9,7 @@
>      // Indicates that the child execed after forking may be execced from
>      // /proc/self/exe rather than using the "real" app path. This prevents
>      // autoupdate from confusing us if it changes the file out from under us.
>-@@ -59,7 +59,7 @@
>+@@ -63,7 +63,7 @@ class CONTENT_EXPORT ChildProcessHost : 
>      // gdb). In this case, you'd use GetChildPath to get the real executable
>      // file name, and then prepend the GDB command to the command line.
>      CHILD_ALLOW_SELF = 1 << 0,
>Index: www/chromium/files/patch-content_public_common_content__switches.cc
>===================================================================
>--- www/chromium/files/patch-content_public_common_content__switches.cc	(revision 432254)
>+++ www/chromium/files/patch-content_public_common_content__switches.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/public/common/content_switches.cc.orig	2016-05-11 19:02:21 UTC
>+--- content/public/common/content_switches.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/public/common/content_switches.cc
>-@@ -978,7 +978,7 @@ const char kDisableVaapiAcceleratedVideo
>+@@ -991,7 +991,7 @@ const char kDisableVaapiAcceleratedVideo
>      "disable-vaapi-accelerated-video-encode";
>  #endif
>  
>Index: www/chromium/files/patch-content_public_common_content__switches.h
>===================================================================
>--- www/chromium/files/patch-content_public_common_content__switches.h	(revision 432254)
>+++ www/chromium/files/patch-content_public_common_content__switches.h	(working copy)
>@@ -1,6 +1,6 @@
>---- content/public/common/content_switches.h.orig	2016-05-11 19:02:21 UTC
>+--- content/public/common/content_switches.h.orig	2016-12-09 05:04:19 UTC
> +++ content/public/common/content_switches.h
>-@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kDisabl
>+@@ -291,7 +291,7 @@ CONTENT_EXPORT extern const char kDisabl
>  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
>  #endif
>  
>Index: www/chromium/files/patch-content_public_test_browser__test__base.cc
>===================================================================
>--- www/chromium/files/patch-content_public_test_browser__test__base.cc	(revision 432254)
>+++ www/chromium/files/patch-content_public_test_browser__test__base.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/public/test/browser_test_base.cc.orig	2016-05-11 19:02:21 UTC
>+--- content/public/test/browser_test_base.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/public/test/browser_test_base.cc
> @@ -6,6 +6,10 @@
>  
>Index: www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc
>===================================================================
>--- www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/renderer/media/webrtc/processed_local_audio_source.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/renderer/media/webrtc/processed_local_audio_source.cc	2016-08-01 03:25:27.013281000 +0300
>-@@ -269,8 +269,8 @@
>+--- content/renderer/media/webrtc/processed_local_audio_source.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/renderer/media/webrtc/processed_local_audio_source.cc
>+@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture(
>                                          bool key_pressed) {
>  #if defined(OS_WIN) || defined(OS_MACOSX)
>    DCHECK_LE(volume, 1.0);
>Index: www/chromium/files/patch-content_renderer_render__thread__impl.cc
>===================================================================
>--- www/chromium/files/patch-content_renderer_render__thread__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_render__thread__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/renderer/render_thread_impl.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/renderer/render_thread_impl.cc	2016-08-01 04:09:35.329085000 +0300
>-@@ -1424,7 +1424,7 @@
>+--- content/renderer/render_thread_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/renderer/render_thread_impl.cc
>+@@ -1492,7 +1492,7 @@ media::GpuVideoAcceleratorFactories* Ren
>    const bool enable_video_accelerator =
>        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
>    const bool enable_gpu_memory_buffer_video_frames =
>Index: www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
>===================================================================
>--- www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/renderer/renderer_blink_platform_impl.cc.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ content/renderer/renderer_blink_platform_impl.cc	2016-10-13 07:15:18.714150000 +0300
>-@@ -114,7 +114,7 @@
>+--- content/renderer/renderer_blink_platform_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/renderer/renderer_blink_platform_impl.cc
>+@@ -113,7 +113,7 @@
>  
>  #if defined(OS_POSIX)
>  #include "base/file_descriptor_posix.h"
>@@ -9,7 +9,7 @@
>  #include <map>
>  #include <string>
>  
>-@@ -219,7 +219,7 @@
>+@@ -219,7 +219,7 @@ class RendererBlinkPlatformImpl::FileUti
>    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
>  };
>  
>@@ -18,7 +18,7 @@
>  class RendererBlinkPlatformImpl::SandboxSupport
>      : public blink::WebSandboxSupport {
>   public:
>-@@ -266,7 +266,7 @@
>+@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::RendererBlink
>        renderer_scheduler_(renderer_scheduler),
>        blink_interface_provider_(
>            new BlinkInterfaceProviderImpl(remote_interfaces)) {
>@@ -27,7 +27,7 @@
>    if (g_sandbox_enabled && sandboxEnabled()) {
>      sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
>    } else {
>-@@ -297,7 +297,7 @@
>+@@ -300,7 +300,7 @@ RendererBlinkPlatformImpl::~RendererBlin
>  }
>  
>  void RendererBlinkPlatformImpl::Shutdown() {
>@@ -36,7 +36,7 @@
>    // SandboxSupport contains a map of WebFontFamily objects, which hold
>    // WebCStrings, which become invalidated when blink is shut down. Hence, we
>    // need to clear that map now, just before blink::shutdown() is called.
>-@@ -349,7 +349,7 @@
>+@@ -352,7 +352,7 @@ blink::WebFileUtilities* RendererBlinkPl
>  }
>  
>  blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
>@@ -45,7 +45,7 @@
>    // These platforms do not require sandbox support.
>    return NULL;
>  #else
>-@@ -602,7 +602,7 @@
>+@@ -601,7 +601,7 @@ bool RendererBlinkPlatformImpl::SandboxS
>    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
>  }
>  
>Index: www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
>===================================================================
>--- www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h	(working copy)
>@@ -1,11 +1,11 @@
>---- content/renderer/renderer_blink_platform_impl.h.orig	2016-05-11 19:02:22 UTC
>+--- content/renderer/renderer_blink_platform_impl.h.orig	2016-12-09 05:04:19 UTC
> +++ content/renderer/renderer_blink_platform_impl.h
>-@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
>+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
>    class MimeRegistry;
>-   scoped_ptr<MimeRegistry> mime_registry_;
>+   std::unique_ptr<MimeRegistry> mime_registry_;
>  
> -#if !defined(OS_ANDROID) && !defined(OS_WIN)
> +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
>    class SandboxSupport;
>-   scoped_ptr<SandboxSupport> sandbox_support_;
>+   std::unique_ptr<SandboxSupport> sandbox_support_;
>  #endif
>Index: www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
>===================================================================
>--- www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2016-04-08 16:02:09 UTC
>+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/renderer/renderer_main_platform_delegate_linux.cc
> @@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf
>  }
>Index: www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc
>===================================================================
>--- www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc	(revision 432254)
>+++ www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc	2016-10-13 07:18:08.506709000 +0300
>-@@ -14,7 +14,7 @@
>+--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
>+@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen
>        blink::WebPointerProperties::Button mouseButton,
>        bool shiftKeyPressed,
>        bool altKeyPressed) {
>@@ -9,7 +9,7 @@
>    if (mouseButton == blink::WebPointerProperties::Button::Middle)
>      return true;
>  #endif
>-@@ -50,7 +50,7 @@
>+@@ -50,7 +50,7 @@ bool WebScrollbarBehaviorImpl::shouldSna
>    // On most platforms, we should snap iff the event is outside our calculated
>    // rect.  On Linux, however, we should not snap for events off the ends, but
>    // not the sides, of the rect.
>Index: www/chromium/files/patch-content_shell_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_shell_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_shell_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- content/shell/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ content/shell/BUILD.gn	2016-09-18 01:45:17.587900000 +0300
>-@@ -275,7 +275,7 @@
>+--- content/shell/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ content/shell/BUILD.gn
>+@@ -287,7 +287,7 @@ static_library("content_shell_lib") {
>      ]
>    }
>  
>@@ -9,7 +9,7 @@
>      deps += [
>        "//build/linux:fontconfig",
>        "//ui/gfx:test_support",
>-@@ -296,7 +296,7 @@
>+@@ -308,7 +308,7 @@ static_library("content_shell_lib") {
>      deps += [ "//content/shell/android:content_shell_jni_headers" ]
>    }
>  
>@@ -18,7 +18,7 @@
>      deps += [
>        "//components/crash/content/app",
>        "//components/crash/content/browser",
>-@@ -338,7 +338,7 @@
>+@@ -356,7 +356,7 @@ static_library("content_shell_lib") {
>      ]
>    }
>  
>@@ -27,7 +27,7 @@
>      deps += [ "//third_party/freetype2" ]
>    }
>  
>-@@ -496,7 +496,7 @@
>+@@ -520,7 +520,7 @@ if (is_android) {
>        }
>      }
>  
>Index: www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
>===================================================================
>--- www/chromium/files/patch-content_shell_browser_shell__browser__context.cc	(revision 432254)
>+++ www/chromium/files/patch-content_shell_browser_shell__browser__context.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- content/shell/browser/shell_browser_context.cc.orig	2016-07-20 22:03:24.000000000 +0300
>-+++ content/shell/browser/shell_browser_context.cc	2016-08-01 04:13:15.131738000 +0300
>+--- content/shell/browser/shell_browser_context.cc.orig	2016-12-09 05:04:19 UTC
>++++ content/shell/browser/shell_browser_context.cc
> @@ -24,7 +24,7 @@
>  
>  #if defined(OS_WIN)
>@@ -9,7 +9,7 @@
>  #include "base/nix/xdg_util.h"
>  #elif defined(OS_MACOSX)
>  #include "base/base_paths_mac.h"
>-@@ -80,7 +80,7 @@
>+@@ -92,7 +92,7 @@ void ShellBrowserContext::InitWhileIOAll
>  #if defined(OS_WIN)
>    CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
>    path_ = path_.Append(std::wstring(L"content_shell"));
>Index: www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
>===================================================================
>--- www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc	(revision 432254)
>+++ www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- content/shell/browser/shell_browser_main_parts.cc.orig	2016-05-11 19:02:22 UTC
>+--- content/shell/browser/shell_browser_main_parts.cc.orig	2016-12-09 05:04:19 UTC
> +++ content/shell/browser/shell_browser_main_parts.cc
>-@@ -40,7 +40,7 @@
>+@@ -44,7 +44,7 @@
>  #if defined(USE_AURA) && defined(USE_X11)
>- #include "ui/events/devices/x11/touch_factory_x11.h"
>+ #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
>  #endif
> -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
> +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
>@@ -9,7 +9,7 @@
>  #include "ui/base/ime/input_method_initializer.h"
>  #endif
>  #if defined(OS_CHROMEOS)
>-@@ -124,7 +124,7 @@ void ShellBrowserMainParts::PostMainMess
>+@@ -140,7 +140,7 @@ void ShellBrowserMainParts::PostMainMess
>  }
>  
>  void ShellBrowserMainParts::PreEarlyInitialization() {
>Index: www/chromium/files/patch-content_test_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-content_test_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-content_test_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- content/test/BUILD.gn.orig	2016-12-01 23:02:13 UTC
>+--- content/test/BUILD.gn.orig	2016-12-09 05:04:19 UTC
> +++ content/test/BUILD.gn
> @@ -661,7 +661,7 @@ test("content_browsertests") {
>      "../test/webui_resource_browsertest.cc",
>Index: www/chromium/files/patch-crypto_nss__util.cc
>===================================================================
>--- www/chromium/files/patch-crypto_nss__util.cc	(revision 432254)
>+++ www/chromium/files/patch-crypto_nss__util.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- crypto/nss_util.cc.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ crypto/nss_util.cc	2016-10-13 07:19:30.151634000 +0300
>+--- crypto/nss_util.cc.orig	2016-12-09 05:04:19 UTC
>++++ crypto/nss_util.cc
> @@ -20,7 +20,7 @@
>  #include "base/threading/thread_task_runner_handle.h"
>  #include "crypto/nss_util_internal.h"
>@@ -9,7 +9,7 @@
>  #include <sys/mount.h>
>  #include <sys/param.h>
>  #endif
>-@@ -150,10 +150,10 @@
>+@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con
>    base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
>    if (base::GetFileSystemType(database_dir, &fs_type))
>      db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
>Index: www/chromium/files/patch-device_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-device_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-device_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- device/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ device/BUILD.gn	2016-09-03 02:02:55.005651000 +0300
>-@@ -162,7 +162,7 @@
>+--- device/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ device/BUILD.gn
>+@@ -176,7 +176,7 @@ test("device_unittests") {
>      ]
>    }
>  
>Index: www/chromium/files/patch-device_battery_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-device_battery_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-device_battery_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- device/battery/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ device/battery/BUILD.gn	2016-09-03 02:03:11.489591000 +0300
>-@@ -47,7 +47,7 @@
>+--- device/battery/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ device/battery/BUILD.gn
>+@@ -47,7 +47,7 @@ if (!is_android) {
>        ]
>      }
>  
>Index: www/chromium/files/patch-device_geolocation_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-device_geolocation_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-device_geolocation_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- device/geolocation/BUILD.gn.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ device/geolocation/BUILD.gn	2016-10-13 13:27:05.983826000 +0300
>-@@ -93,7 +93,7 @@
>+--- device/geolocation/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ device/geolocation/BUILD.gn
>+@@ -90,7 +90,7 @@ component("geolocation") {
>    if (is_android) {
>      sources -= [ "wifi_data_provider_common.cc" ]
>    }
>Index: www/chromium/files/patch-device_geolocation_location__arbitrator.cc
>===================================================================
>--- www/chromium/files/patch-device_geolocation_location__arbitrator.cc	(revision 432254)
>+++ www/chromium/files/patch-device_geolocation_location__arbitrator.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/geolocation/location_arbitrator.cc.orig	2016-12-12 22:00:04 UTC
>+--- device/geolocation/location_arbitrator.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/geolocation/location_arbitrator.cc
> @@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr
>  
>Index: www/chromium/files/patch-device_hid_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-device_hid_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-device_hid_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- device/hid/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ device/hid/BUILD.gn	2016-09-24 04:03:54.837948000 +0300
>-@@ -57,6 +57,13 @@
>+--- device/hid/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ device/hid/BUILD.gn
>+@@ -56,6 +56,13 @@ source_set("hid") {
>      deps += [ "//device/udev_linux" ]
>    }
>  
>Index: www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h
>===================================================================
>--- www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h	(revision 432254)
>+++ www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h	(working copy)
>@@ -1,5 +1,5 @@
>---- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig	2016-07-17 14:17:13.836047000 +0300
>-+++ device/media_transfer_protocol/media_transfer_protocol_manager.h	2016-07-17 14:16:48.004323000 +0300
>+--- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig	2016-12-09 05:04:19 UTC
>++++ device/media_transfer_protocol/media_transfer_protocol_manager.h
> @@ -15,7 +15,7 @@
>  #include "base/memory/ref_counted.h"
>  #include "build/build_config.h"
>Index: www/chromium/files/patch-device_serial_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-device_serial_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-device_serial_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- device/serial/BUILD.gn.orig	2016-08-03 22:02:18.000000000 +0300
>-+++ device/serial/BUILD.gn	2016-09-24 04:10:00.137337000 +0300
>-@@ -6,7 +6,7 @@
>+--- device/serial/BUILD.gn.orig	2016-12-09 05:04:19 UTC
>++++ device/serial/BUILD.gn
>+@@ -6,7 +6,7 @@ import("//build/config/features.gni")
>  import("//mojo/public/tools/bindings/mojom.gni")
>  
>  # Library works only on desktop platforms.
>@@ -9,7 +9,7 @@
>  
>  config("platform_support") {
>    visibility = [ ":serial" ]
>-@@ -70,6 +70,12 @@
>+@@ -69,6 +69,12 @@ static_library("serial") {
>    if (use_udev) {
>      deps += [ "//device/udev_linux" ]
>    }
>Index: www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
>===================================================================
>--- www/chromium/files/patch-device_serial_serial__io__handler__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-device_serial_serial__io__handler__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- device/serial/serial_io_handler_posix.cc.orig	2016-04-08 16:02:09 UTC
>+--- device/serial/serial_io_handler_posix.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/serial/serial_io_handler_posix.cc
>-@@ -60,7 +60,7 @@ bool BitrateToSpeedConstant(int bitrate,
>+@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate,
>      BITRATE_TO_SPEED_CASE(9600)
>      BITRATE_TO_SPEED_CASE(19200)
>      BITRATE_TO_SPEED_CASE(38400)
>Index: www/chromium/files/patch-device_serial_serial__service__impl.cc
>===================================================================
>--- www/chromium/files/patch-device_serial_serial__service__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-device_serial_serial__service__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- device/serial/serial_service_impl.cc.orig	2016-05-11 19:02:22 UTC
>+--- device/serial/serial_service_impl.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/serial/serial_service_impl.cc
>-@@ -74,9 +74,14 @@ void SerialServiceImpl::Connect(
>+@@ -71,9 +71,14 @@ void SerialServiceImpl::Connect(
>  }
>  
>  SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {
>Index: www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc
>===================================================================
>--- www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc	(revision 432254)
>+++ www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/time_zone_monitor/time_zone_monitor.cc.orig	2016-12-12 21:25:46 UTC
>+--- device/time_zone_monitor/time_zone_monitor.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/time_zone_monitor/time_zone_monitor.cc
> @@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() {
>    std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
>Index: www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc
>===================================================================
>--- www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2016-12-12 21:26:07 UTC
>+--- device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/time_zone_monitor/time_zone_monitor_linux.cc
> @@ -58,6 +58,9 @@ class TimeZoneMonitorLinuxImpl
>          main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
>Index: www/chromium/files/patch-device_usb_usb__context.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__context.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__context.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/usb/usb_context.cc.orig	2016-03-25 13:04:49 UTC
>+--- device/usb/usb_context.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_context.cc
> @@ -9,8 +9,13 @@
>  #include "base/macros.h"
>Index: www/chromium/files/patch-device_usb_usb__context__unittest.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__context__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__context__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/usb/usb_context_unittest.cc.orig	2016-03-25 13:04:49 UTC
>+--- device/usb/usb_context_unittest.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_context_unittest.cc
> @@ -7,7 +7,11 @@
>  #include "build/build_config.h"
>Index: www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__device__handle__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__device__handle__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- device/usb/usb_device_handle_impl.cc.orig	2016-05-11 19:02:22 UTC
>+--- device/usb/usb_device_handle_impl.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_device_handle_impl.cc
>-@@ -24,7 +24,11 @@
>+@@ -25,7 +25,11 @@
>  #include "device/usb/usb_error.h"
>  #include "device/usb/usb_service.h"
>  #include "net/base/io_buffer.h"
>Index: www/chromium/files/patch-device_usb_usb__device__handle__impl.h
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__device__handle__impl.h	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__device__handle__impl.h	(working copy)
>@@ -1,6 +1,6 @@
>---- device/usb/usb_device_handle_impl.h.orig	2016-05-11 19:02:22 UTC
>+--- device/usb/usb_device_handle_impl.h.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_device_handle_impl.h
>-@@ -17,7 +17,12 @@
>+@@ -18,7 +18,12 @@
>  #include "base/memory/ref_counted.h"
>  #include "base/threading/thread_checker.h"
>  #include "device/usb/usb_device_handle.h"
>Index: www/chromium/files/patch-device_usb_usb__device__impl.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__device__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__device__impl.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- device/usb/usb_device_impl.cc.orig	2016-05-11 19:02:22 UTC
>+--- device/usb/usb_device_impl.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_device_impl.cc
>-@@ -20,7 +20,11 @@
>+@@ -22,7 +22,11 @@
>  #include "device/usb/usb_descriptors.h"
>  #include "device/usb/usb_device_handle_impl.h"
>  #include "device/usb/usb_error.h"
>@@ -10,5 +10,5 @@
>  #include "third_party/libusb/src/libusb/libusb.h"
> +#endif
>  
>- #if defined(OS_CHROMEOS)
>- #include "chromeos/dbus/dbus_thread_manager.h"
>+ namespace device {
>+ 
>Index: www/chromium/files/patch-device_usb_usb__error.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__error.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__error.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- device/usb/usb_error.cc.orig	2016-03-25 13:04:49 UTC
>+--- device/usb/usb_error.cc.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_error.cc
> @@ -4,7 +4,11 @@
>  
>Index: www/chromium/files/patch-device_usb_usb__service__impl.cc
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__service__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__service__impl.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- device/usb/usb_service_impl.cc.orig	2016-10-06 04:02:19.000000000 +0300
>-+++ device/usb/usb_service_impl.cc	2016-10-13 07:29:44.662206000 +0300
>+--- device/usb/usb_service_impl.cc.orig	2016-12-09 05:04:19 UTC
>++++ device/usb/usb_service_impl.cc
> @@ -26,7 +26,11 @@
>  #include "device/usb/usb_error.h"
>  #include "device/usb/webusb_descriptors.h"
>@@ -13,7 +13,7 @@
>  
>  #if defined(OS_WIN)
>  #include <setupapi.h>
>-@@ -213,6 +217,7 @@
>+@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl(
>    }
>    context_ = new UsbContext(platform_context);
>  
>@@ -21,7 +21,7 @@
>    rv = libusb_hotplug_register_callback(
>        context_->context(),
>        static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
>-@@ -225,6 +230,8 @@
>+@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl(
>    }
>  
>    RefreshDevices();
>@@ -30,7 +30,7 @@
>  #if defined(OS_WIN)
>    DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
>    if (device_monitor) {
>-@@ -234,8 +241,10 @@
>+@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl(
>  }
>  
>  UsbServiceImpl::~UsbServiceImpl() {
>@@ -41,7 +41,7 @@
>    for (auto* platform_device : ignored_devices_)
>      libusb_unref_device(platform_device);
>  }
>-@@ -477,6 +486,7 @@
>+@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped
>    device->OnDisconnect();
>  }
>  
>@@ -49,7 +49,7 @@
>  // static
>  int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
>                                                  PlatformUsbDevice device,
>-@@ -514,6 +524,7 @@
>+@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
>  
>    return 0;
>  }
>Index: www/chromium/files/patch-device_usb_usb__service__impl.h
>===================================================================
>--- www/chromium/files/patch-device_usb_usb__service__impl.h	(revision 432254)
>+++ www/chromium/files/patch-device_usb_usb__service__impl.h	(working copy)
>@@ -1,4 +1,4 @@
>---- device/usb/usb_service_impl.h.orig	2016-05-11 19:02:22 UTC
>+--- device/usb/usb_service_impl.h.orig	2016-12-09 05:04:19 UTC
> +++ device/usb/usb_service_impl.h
> @@ -15,7 +15,13 @@
>  #include "build/build_config.h"
>@@ -14,7 +14,7 @@
>  
>  #if defined(OS_WIN)
>  #include "base/scoped_observer.h"
>-@@ -71,11 +77,13 @@ class UsbServiceImpl :
>+@@ -70,11 +76,13 @@ class UsbServiceImpl :
>                   scoped_refptr<UsbDeviceImpl> device);
>    void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
>  
>@@ -28,7 +28,7 @@
>    // These functions release a reference to the provided platform device.
>    void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
>    void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
>-@@ -88,7 +96,9 @@ class UsbServiceImpl :
>+@@ -90,7 +98,9 @@ class UsbServiceImpl :
>    // connected instead of only when a full enumeration is requested.
>    // TODO(reillyg): Support this on all platforms. crbug.com/411715
>    bool hotplug_enabled_ = false;
>Index: www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
>===================================================================
>--- www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc	(revision 432254)
>+++ www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2016-05-11 19:02:22 UTC
>+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2016-12-09 05:04:20 UTC
> +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
> @@ -28,7 +28,11 @@
>  #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
>Index: www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
>===================================================================
>--- www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc	(revision 432254)
>+++ www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- extensions/browser/api/serial/serial_api.cc.orig	2016-08-12 04:05:07.712438000 +0300
>-+++ extensions/browser/api/serial/serial_api.cc	2016-08-12 04:06:56.974572000 +0300
>-@@ -85,12 +85,13 @@
>+--- extensions/browser/api/serial/serial_api.cc.orig	2016-12-09 05:04:20 UTC
>++++ extensions/browser/api/serial/serial_api.cc
>+@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare()
>  
>  void SerialGetDevicesFunction::Work() {
>    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
>Index: www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
>===================================================================
>--- www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc	(revision 432254)
>+++ www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- extensions/browser/api/web_request/form_data_parser.cc.orig	2016-05-11 19:02:22 UTC
>+--- extensions/browser/api/web_request/form_data_parser.cc.orig	2016-12-09 05:04:20 UTC
> +++ extensions/browser/api/web_request/form_data_parser.cc
> @@ -15,7 +15,11 @@
>  #include "base/values.h"
>Index: www/chromium/files/patch-extensions_common_image__util.cc
>===================================================================
>--- www/chromium/files/patch-extensions_common_image__util.cc	(revision 432254)
>+++ www/chromium/files/patch-extensions_common_image__util.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- extensions/common/image_util.cc.orig	2016-05-11 19:02:22 UTC
>+--- extensions/common/image_util.cc.orig	2016-12-09 05:04:20 UTC
> +++ extensions/common/image_util.cc
> @@ -11,7 +11,11 @@
>  #include "base/strings/string_number_conversions.h"
>@@ -10,5 +10,5 @@
>  #include "third_party/re2/src/re2/re2.h"
> +#endif
>  #include "third_party/skia/include/core/SkColor.h"
>+ #include "third_party/skia/include/utils/SkParse.h"
>  #include "ui/gfx/color_utils.h"
>- 
>Index: www/chromium/files/patch-extensions_common_stack__frame.cc
>===================================================================
>--- www/chromium/files/patch-extensions_common_stack__frame.cc	(revision 432254)
>+++ www/chromium/files/patch-extensions_common_stack__frame.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- extensions/common/stack_frame.cc.orig	2016-05-11 19:02:22 UTC
>+--- extensions/common/stack_frame.cc.orig	2016-12-09 05:04:20 UTC
> +++ extensions/common/stack_frame.cc
> @@ -7,7 +7,11 @@
>  #include <string>
>Index: www/chromium/files/patch-gpu_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ gpu/BUILD.gn	2016-09-02 23:58:15.934039000 +0300
>-@@ -122,7 +122,7 @@
>+--- gpu/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/BUILD.gn
>+@@ -92,7 +92,7 @@ test("command_buffer_gles2_tests") {
>      libs += [ "android" ]
>      deps += [ "//ui/android:ui_java" ]
>    }
>Index: www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
>===================================================================
>--- www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc	(revision 432254)
>+++ www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- gpu/command_buffer/service/program_manager.cc.orig	2016-05-11 19:02:23 UTC
>+--- gpu/command_buffer/service/program_manager.cc.orig	2016-12-09 05:04:20 UTC
> +++ gpu/command_buffer/service/program_manager.cc
>-@@ -29,7 +29,11 @@
>- #include "gpu/command_buffer/service/gpu_switches.h"
>+@@ -30,7 +30,11 @@
>  #include "gpu/command_buffer/service/program_cache.h"
>+ #include "gpu/command_buffer/service/progress_reporter.h"
>  #include "gpu/command_buffer/service/shader_manager.h"
> +#if defined(OS_BSD)
> +#include <re2/re2.h>
>Index: www/chromium/files/patch-gpu_config_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_config_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_config_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/config/BUILD.gn.orig	2016-10-06 04:02:20.000000000 +0300
>-+++ gpu/config/BUILD.gn	2016-10-29 18:18:32.848959000 +0300
>-@@ -8,7 +8,8 @@
>+--- gpu/config/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/config/BUILD.gn
>+@@ -8,7 +8,8 @@ import("//build/config/ui.gni")
>  
>  declare_args() {
>    # Use the PCI lib to collect GPU information on Linux.
>@@ -10,7 +10,7 @@
>                 (use_x11 || use_ozone)
>  }
>  
>-@@ -97,6 +98,14 @@
>+@@ -97,6 +98,14 @@ source_set("config_sources") {
>        ]
>      }
>    }
>Index: www/chromium/files/patch-gpu_config_gpu__control__list.cc
>===================================================================
>--- www/chromium/files/patch-gpu_config_gpu__control__list.cc	(revision 432254)
>+++ www/chromium/files/patch-gpu_config_gpu__control__list.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/config/gpu_control_list.cc.orig	2016-07-20 22:03:25.000000000 +0300
>-+++ gpu/config/gpu_control_list.cc	2016-08-11 00:15:11.700069000 +0300
>-@@ -17,7 +17,11 @@
>+--- gpu/config/gpu_control_list.cc.orig	2016-12-09 05:04:20 UTC
>++++ gpu/config/gpu_control_list.cc
>+@@ -19,7 +19,11 @@
>  #include "base/sys_info.h"
>  #include "gpu/config/gpu_info.h"
>  #include "gpu/config/gpu_util.h"
>@@ -9,10 +9,10 @@
> +#else
>  #include "third_party/re2/src/re2/re2.h"
> +#endif
>-
>+ 
>  namespace gpu {
>  namespace {
>-@@ -1137,7 +1141,7 @@
>+@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT
>  GpuControlList::GpuControlListEntry::GetDefaultGLType() {
>  #if defined(OS_CHROMEOS)
>    return kGLTypeGL;
>@@ -21,7 +21,7 @@
>    return kGLTypeGL;
>  #elif defined(OS_MACOSX)
>    return kGLTypeGL;
>-@@ -1575,7 +1579,7 @@
>+@@ -1595,7 +1599,7 @@ GpuControlList::OsType GpuControlList::G
>    return kOsWin;
>  #elif defined(OS_ANDROID)
>    return kOsAndroid;
>Index: www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
>===================================================================
>--- www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- gpu/config/gpu_control_list_unittest.cc.orig	2016-05-11 19:02:23 UTC
>+--- gpu/config/gpu_control_list_unittest.cc.orig	2016-12-09 05:04:20 UTC
> +++ gpu/config/gpu_control_list_unittest.cc
> @@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs
>    features = control_list->MakeDecision(
>Index: www/chromium/files/patch-gpu_config_gpu__info__collector.cc
>===================================================================
>--- www/chromium/files/patch-gpu_config_gpu__info__collector.cc	(revision 432254)
>+++ www/chromium/files/patch-gpu_config_gpu__info__collector.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/config/gpu_info_collector.cc.orig	2016-05-11 19:02:23 UTC
>+--- gpu/config/gpu_info_collector.cc.orig	2016-12-09 05:04:20 UTC
> +++ gpu/config/gpu_info_collector.cc
>-@@ -167,8 +167,10 @@ CollectInfoResult CollectGraphicsInfoGL(
>+@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL(
>    gpu_info->pixel_shader_version = glsl_version;
>    gpu_info->vertex_shader_version = glsl_version;
>  
>Index: www/chromium/files/patch-gpu_config_gpu__test__config.cc
>===================================================================
>--- www/chromium/files/patch-gpu_config_gpu__test__config.cc	(revision 432254)
>+++ www/chromium/files/patch-gpu_config_gpu__test__config.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/config/gpu_test_config.cc.orig	2016-05-11 19:02:23 UTC
>+--- gpu/config/gpu_test_config.cc.orig	2016-12-09 05:04:20 UTC
> +++ gpu/config/gpu_test_config.cc
>-@@ -26,7 +26,7 @@ namespace {
>+@@ -24,7 +24,7 @@ namespace {
>  GPUTestConfig::OS GetCurrentOS() {
>  #if defined(OS_CHROMEOS)
>    return GPUTestConfig::kOsChromeOS;
>@@ -9,7 +9,7 @@
>    return GPUTestConfig::kOsLinux;
>  #elif defined(OS_WIN)
>    int32_t major_version = 0;
>-@@ -252,6 +252,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
>+@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
>    bool rt;
>    if (gpu_info == NULL) {
>      GPUInfo my_gpu_info;
>@@ -20,7 +20,7 @@
>      CollectInfoResult result = CollectGpuID(
>          &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
>      if (result != kCollectInfoSuccess) {
>-@@ -261,6 +265,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
>+@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
>      } else {
>        rt = SetGPUInfo(my_gpu_info);
>      }
>Index: www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/gles2_conform_support/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ gpu/gles2_conform_support/BUILD.gn	2016-09-02 23:59:14.071065000 +0300
>-@@ -62,7 +62,7 @@
>+--- gpu/gles2_conform_support/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/gles2_conform_support/BUILD.gn
>+@@ -60,7 +60,7 @@ executable("gles2_conform_support") {
>      "//gpu/gles2_conform_support/egl",
>      "//ui/gl",
>    ]
>@@ -9,7 +9,7 @@
>      sources += [
>        "native/egl_native_aura.cc",
>        "native/egl_native_x11.cc",
>-@@ -132,7 +132,7 @@
>+@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) {
>        # Must be done this way for warning flags to be ordered correctly.
>        ":gles2_conform_test_warnings",
>      ]
>Index: www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_gles2__conform__support_native_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/gles2_conform_support/native/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ gpu/gles2_conform_support/native/BUILD.gn	2016-09-02 23:58:43.787930000 +0300
>-@@ -21,7 +21,7 @@
>+--- gpu/gles2_conform_support/native/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/gles2_conform_support/native/BUILD.gn
>+@@ -20,7 +20,7 @@ source_set("native") {
>      "//gpu/gles2_conform_support/egl",
>      "//ui/gl",
>    ]
>Index: www/chromium/files/patch-gpu_ipc_client_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_ipc_client_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_ipc_client_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/ipc/client/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ gpu/ipc/client/BUILD.gn	2016-10-10 14:54:17.518422000 +0300
>-@@ -53,6 +53,7 @@
>+--- gpu/ipc/client/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/ipc/client/BUILD.gn
>+@@ -51,6 +51,7 @@ source_set("ipc_client_sources") {
>    configs += [
>      "//build/config/compiler:no_size_t_to_int_warning",
>      "//gpu:gpu_implementation",
>Index: www/chromium/files/patch-gpu_ipc_service_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_ipc_service_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_ipc_service_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- gpu/ipc/service/BUILD.gn.orig	2016-12-13 11:53:02 UTC
>+--- gpu/ipc/service/BUILD.gn.orig	2016-12-09 05:04:20 UTC
> +++ gpu/ipc/service/BUILD.gn
> @@ -102,11 +102,12 @@ target(link_target_type, "ipc_service_so
>      ]
>Index: www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- gpu/tools/compositor_model_bench/BUILD.gn.orig	2016-12-12 22:09:19 UTC
>+--- gpu/tools/compositor_model_bench/BUILD.gn.orig	2016-12-09 05:04:20 UTC
> +++ gpu/tools/compositor_model_bench/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>Index: www/chromium/files/patch-gpu_vulkan_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-gpu_vulkan_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-gpu_vulkan_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- gpu/vulkan/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ gpu/vulkan/BUILD.gn	2016-09-02 23:57:07.910753000 +0300
>-@@ -13,7 +13,7 @@
>+--- gpu/vulkan/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ gpu/vulkan/BUILD.gn
>+@@ -13,7 +13,7 @@ if (enable_vulkan) {
>    component("vulkan") {
>      output_name = "vulkan_wrapper"
>  
>Index: www/chromium/files/patch-ipc_ipc__channel.h
>===================================================================
>--- www/chromium/files/patch-ipc_ipc__channel.h	(revision 432254)
>+++ www/chromium/files/patch-ipc_ipc__channel.h	(working copy)
>@@ -1,9 +1,9 @@
>---- ipc/ipc_channel.h.orig	2016-08-13 00:25:04.291611000 +0300
>-+++ ipc/ipc_channel.h	2016-08-13 00:09:06.758895000 +0300
>-@@ -223,7 +223,7 @@
>-   static std::string GenerateVerifiedChannelID(const std::string& prefix);
>- #endif
>-
>+--- ipc/ipc_channel.h.orig	2016-12-09 05:04:20 UTC
>++++ ipc/ipc_channel.h
>+@@ -308,7 +308,7 @@ class IPC_EXPORT Channel : public Endpoi
>+       IPC::ChannelHandle* handle0,
>+       IPC::ChannelHandle* handle1);
>+ 
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    // Sandboxed processes live in a PID namespace, so when sending the IPC hello
>Index: www/chromium/files/patch-ipc_ipc__channel__posix.cc
>===================================================================
>--- www/chromium/files/patch-ipc_ipc__channel__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-ipc_ipc__channel__posix.cc	(working copy)
>@@ -1,36 +1,36 @@
>---- ipc/ipc_channel_posix.cc.orig	2016-07-20 22:03:25.000000000 +0300
>-+++ ipc/ipc_channel_posix.cc	2016-08-13 00:06:40.205716000 +0300
>-@@ -183,9 +183,9 @@
>-
>+--- ipc/ipc_channel_posix.cc.orig	2016-12-09 05:04:20 UTC
>++++ ipc/ipc_channel_posix.cc
>+@@ -182,9 +182,9 @@ void Channel::NotifyProcessForkedForTest
>+ 
>  //------------------------------------------------------------------------------
>-
>+ 
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  int ChannelPosix::global_pid_ = 0;
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || defined(OS_BSD)
>-
>+ 
>  ChannelPosix::ChannelPosix(const IPC::ChannelHandle& channel_handle,
>                             Mode mode,
>-@@ -613,7 +613,7 @@
>+@@ -612,7 +612,7 @@ bool ChannelPosix::IsNamedServerInitiali
>    return base::PathExists(base::FilePath(channel_id));
>  }
>-
>+ 
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  // static
>  void ChannelPosix::SetGlobalPid(int pid) {
>    global_pid_ = pid;
>-@@ -622,7 +622,7 @@
>+@@ -621,7 +621,7 @@ void ChannelPosix::SetGlobalPid(int pid)
>  int ChannelPosix::GetGlobalPid() {
>    return global_pid_;
>  }
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || defined(OS_BSD)
>-
>+ 
>  // Called by libevent when we can read from the pipe without blocking.
>  void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) {
>-@@ -813,12 +813,12 @@
>+@@ -810,12 +810,12 @@ int ChannelPosix::GetHelloMessageProcId(
>    return -1;
>  #else
>    int pid = base::GetCurrentProcId();
>@@ -45,20 +45,20 @@
>    return pid;
>  #endif  // defined(OS_NACL_NONSFI)
>  }
>-@@ -1135,7 +1135,7 @@
>+@@ -1132,7 +1132,7 @@ bool Channel::IsNamedServerInitialized(
>    return ChannelPosix::IsNamedServerInitialized(channel_id);
>  }
>-
>+ 
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>  // static
>  void Channel::SetGlobalPid(int pid) {
>    ChannelPosix::SetGlobalPid(pid);
>-@@ -1143,6 +1143,6 @@
>+@@ -1140,6 +1140,6 @@ void Channel::SetGlobalPid(int pid) {
>  int Channel::GetGlobalPid() {
>    return ChannelPosix::GetGlobalPid();
>  }
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || defined(OS_BSD)
>-
>+ 
>  }  // namespace IPC
>Index: www/chromium/files/patch-ipc_ipc__channel__posix.h
>===================================================================
>--- www/chromium/files/patch-ipc_ipc__channel__posix.h	(revision 432254)
>+++ www/chromium/files/patch-ipc_ipc__channel__posix.h	(working copy)
>@@ -1,8 +1,8 @@
>---- ipc/ipc_channel_posix.h.orig	2016-08-13 00:22:20.959322000 +0300
>-+++ ipc/ipc_channel_posix.h	2016-08-13 00:07:29.393338000 +0300
>-@@ -63,10 +63,10 @@
>+--- ipc/ipc_channel_posix.h.orig	2016-12-09 05:04:20 UTC
>++++ ipc/ipc_channel_posix.h
>+@@ -63,10 +63,10 @@ class IPC_EXPORT ChannelPosix : public C
>    void CloseClientFileDescriptor();
>-
>+ 
>    static bool IsNamedServerInitialized(const std::string& channel_id);
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>@@ -10,13 +10,13 @@
>    static int GetGlobalPid();
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || defined(OS_BSD)
>-
>+ 
>   private:
>    bool CreatePipe(const IPC::ChannelHandle& channel_handle);
>-@@ -209,10 +209,10 @@
>+@@ -209,10 +209,10 @@ class IPC_EXPORT ChannelPosix : public C
>    // True if we are responsible for unlinking the unix domain socket file.
>    bool must_unlink_;
>-
>+ 
> -#if defined(OS_LINUX)
> +#if defined(OS_LINUX) || defined(OS_BSD)
>    // If non-zero, overrides the process ID sent in the hello message.
>@@ -23,6 +23,6 @@
>    static int global_pid_;
> -#endif  // OS_LINUX
> +#endif  // OS_LINUX || defined(OS_BSD)
>-
>+ 
>    DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelPosix);
>  };
>Index: www/chromium/files/patch-ipc_ipc__message__utils.cc
>===================================================================
>--- www/chromium/files/patch-ipc_ipc__message__utils.cc	(revision 432254)
>+++ www/chromium/files/patch-ipc_ipc__message__utils.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ipc/ipc_message_utils.cc.orig	2016-05-20 21:47:31 UTC
>+--- ipc/ipc_message_utils.cc.orig	2016-12-09 05:04:20 UTC
> +++ ipc/ipc_message_utils.cc
>-@@ -414,7 +414,7 @@ void ParamTraits<unsigned int>::Log(cons
>+@@ -424,7 +424,7 @@ void ParamTraits<unsigned int>::Log(cons
>    l->append(base::UintToString(p));
>  }
>  
>Index: www/chromium/files/patch-ipc_ipc__message__utils.h
>===================================================================
>--- www/chromium/files/patch-ipc_ipc__message__utils.h	(revision 432254)
>+++ www/chromium/files/patch-ipc_ipc__message__utils.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ipc/ipc_message_utils.h.orig	2016-05-20 21:46:12 UTC
>+--- ipc/ipc_message_utils.h.orig	2016-12-09 05:04:20 UTC
> +++ ipc/ipc_message_utils.h
>-@@ -193,7 +193,7 @@ struct ParamTraits<unsigned int> {
>+@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {
>  //   3) Android 64 bit also has int64_t typedef'd to long.
>  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
>  // these traits for 32 bit ARM then that'll catch any errors.
>Index: www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
>===================================================================
>--- www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc	(revision 432254)
>+++ www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/audio/alsa/audio_manager_alsa.cc.orig	2016-04-07 19:01:10 UTC
>+--- media/audio/alsa/audio_manager_alsa.cc.orig	2016-12-09 05:04:20 UTC
> +++ media/audio/alsa/audio_manager_alsa.cc
>-@@ -128,7 +128,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>+@@ -135,7 +135,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>    int card = -1;
>  
>    // Loop through the sound cards to get ALSA device hints.
>@@ -10,7 +10,7 @@
>      void** hints = NULL;
>      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
>      if (!error) {
>-@@ -140,7 +142,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>+@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
>        DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
>                      << wrapper_->StrError(error);
>      }
>@@ -20,7 +20,7 @@
>  }
>  
>  void AudioManagerAlsa::GetAlsaDevicesInfo(
>-@@ -226,7 +230,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
>+@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
>      // goes through software conversion if needed (e.g. incompatible
>      // sample rate).
>      // TODO(joi): Should we prefer "hw" instead?
>@@ -32,7 +32,7 @@
>      return strncmp(kDeviceTypeDesired,
>                     device_name,
>                     arraysize(kDeviceTypeDesired) - 1) == 0;
>-@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>+@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>    // Loop through the sound cards.
>    // Don't use snd_device_name_hint(-1,..) since there is a access violation
>    // inside this ALSA API with libasound.so.2.0.0.
>@@ -42,7 +42,7 @@
>      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
>      if (!error) {
>        for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
>-@@ -274,7 +284,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>+@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
>        DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
>                      << wrapper_->StrError(error);
>      }
>Index: www/chromium/files/patch-media_audio_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-media_audio_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-media_audio_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- media/audio/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ media/audio/BUILD.gn	2016-09-25 15:11:18.731892000 +0300
>-@@ -202,7 +202,7 @@
>+--- media/audio/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ media/audio/BUILD.gn
>+@@ -206,7 +206,7 @@ source_set("audio") {
>      deps += [ "//media/base/android:media_jni_headers" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      sources += [ "linux/audio_manager_linux.cc" ]
>    }
>  
>-@@ -251,10 +251,12 @@
>+@@ -255,10 +255,12 @@ source_set("audio") {
>        configs += [ ":libpulse" ]
>      } else {
>        # TODO(ajwong): Technically, this dl should go in the action.
>Index: www/chromium/files/patch-media_audio_audio__manager.cc
>===================================================================
>--- www/chromium/files/patch-media_audio_audio__manager.cc	(revision 432254)
>+++ www/chromium/files/patch-media_audio_audio__manager.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/audio/audio_manager.cc.orig	2016-07-20 22:03:25.000000000 +0300
>-+++ media/audio/audio_manager.cc	2016-08-01 04:22:25.372043000 +0300
>-@@ -92,7 +92,7 @@
>+--- media/audio/audio_manager.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/audio/audio_manager.cc
>+@@ -95,7 +95,7 @@ class AudioManagerHelper : public base::
>    }
>  #endif
>  
>@@ -9,7 +9,7 @@
>    void set_app_name(const std::string& app_name) { app_name_ = app_name; }
>    const std::string& app_name() const { return app_name_; }
>  #endif
>-@@ -250,7 +250,7 @@
>+@@ -253,7 +253,7 @@ class AudioManagerHelper : public base::
>    std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
>  #endif
>  
>@@ -18,7 +18,7 @@
>    std::string app_name_;
>  #endif
>  
>-@@ -359,7 +359,7 @@
>+@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging
>    g_helper.Pointer()->enable_crash_key_logging();
>  }
>  
>Index: www/chromium/files/patch-media_audio_audio__manager.h
>===================================================================
>--- www/chromium/files/patch-media_audio_audio__manager.h	(revision 432254)
>+++ www/chromium/files/patch-media_audio_audio__manager.h	(working copy)
>@@ -1,6 +1,6 @@
>---- media/audio/audio_manager.h.orig	2016-05-11 19:02:23 UTC
>+--- media/audio/audio_manager.h.orig	2016-12-09 05:04:20 UTC
> +++ media/audio/audio_manager.h
>-@@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager {
>+@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager {
>    // See http://crbug.com/422522
>    static void EnableCrashKeyLoggingForAudioThreadHangs();
>  
>Index: www/chromium/files/patch-media_base_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-media_base_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-media_base_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- media/base/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
>-+++ media/base/BUILD.gn	2016-09-03 01:53:50.754526000 +0300
>-@@ -281,7 +281,7 @@
>+--- media/base/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ media/base/BUILD.gn
>+@@ -296,7 +296,7 @@ target(link_target_type, "base") {
>      allow_circular_includes_from += [ "//media/base/android" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      configs += [
>        "//build/config/linux:x11",
>        "//build/config/linux:xext",
>-@@ -317,7 +317,7 @@
>+@@ -332,7 +332,7 @@ target(link_target_type, "base") {
>      deps += [ ":media_yasm" ]
>    }
>  
>Index: www/chromium/files/patch-media_capture_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-media_capture_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-media_capture_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- media/capture/BUILD.gn.orig	2016-08-03 22:02:20.000000000 +0300
>-+++ media/capture/BUILD.gn	2016-10-10 16:10:21.736539000 +0300
>-@@ -114,6 +114,16 @@
>+--- media/capture/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ media/capture/BUILD.gn
>+@@ -123,6 +123,16 @@ component("capture") {
>      ]
>    }
>  
>@@ -15,5 +15,5 @@
> +  }
> +
>    if (is_win) {
>-     public_deps += [ "//media/base/win" ]
>-     libs = [
>+     deps += [
>+       "//media/base",  # For media_switches.
>Index: www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
>===================================================================
>--- www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/capture/video/fake_video_capture_device_factory.cc.orig	2016-10-06 04:02:21.000000000 +0300
>-+++ media/capture/video/fake_video_capture_device_factory.cc	2016-10-13 07:39:17.908794000 +0300
>-@@ -49,7 +49,7 @@
>+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/capture/video/fake_video_capture_device_factory.cc
>+@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetD
>    for (int n = 0; n < number_of_devices_; ++n) {
>      device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n),
>                                       base::StringPrintf("/dev/video%d", n),
>Index: www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
>===================================================================
>--- www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/capture/video/file_video_capture_device_factory.cc.orig	2016-10-06 04:02:21.000000000 +0300
>-+++ media/capture/video/file_video_capture_device_factory.cc	2016-10-13 07:41:41.678945000 +0300
>-@@ -49,7 +49,7 @@
>+--- media/capture/video/file_video_capture_device_factory.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/capture/video/file_video_capture_device_factory.cc
>+@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD
>  #elif defined(OS_MACOSX)
>        command_line_file_path.value(), kFileVideoCaptureDeviceName,
>        VideoCaptureApi::MACOSX_AVFOUNDATION
>Index: www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
>===================================================================
>--- www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-10-06 04:02:21.000000000 +0300
>-+++ media/capture/video/linux/video_capture_device_linux.cc	2016-10-13 09:50:59.750346000 +0300
>+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/capture/video/linux/video_capture_device_linux.cc
> @@ -21,6 +21,7 @@
>  
>  namespace media {
>@@ -8,7 +8,7 @@
>  // Translates Video4Linux pixel formats to Chromium pixel formats.
>  // static
>  VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
>-@@ -34,6 +35,7 @@
>+@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
>      bool favour_mjpeg) {
>    return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
>  }
>@@ -16,7 +16,7 @@
>  
>  VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
>      const VideoCaptureDeviceDescriptor& device_descriptor)
>-@@ -47,6 +49,7 @@
>+@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
>    v4l2_thread_.Stop();
>  }
>  
>@@ -24,7 +24,7 @@
>  void VideoCaptureDeviceLinux::AllocateAndStart(
>      const VideoCaptureParams& params,
>      std::unique_ptr<VideoCaptureDevice::Client> client) {
>-@@ -70,7 +73,13 @@
>+@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn
>                   params.requested_format.frame_size.height(),
>                   params.requested_format.frame_rate, base::Passed(&client)));
>  }
>@@ -38,9 +38,9 @@
>  void VideoCaptureDeviceLinux::StopAndDeAllocate() {
>    if (!v4l2_thread_.IsRunning())
>      return;  // Wrong state.
>-@@ -81,7 +90,11 @@
>- 
>-   capture_impl_ = NULL;
>+@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
>+       base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_,
>+                  base::Passed(&settings), base::Passed(&callback)));
>  }
> +#else // !defined(OS_FREEBSD)
> +void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
>@@ -50,7 +50,7 @@
>  void VideoCaptureDeviceLinux::SetRotation(int rotation) {
>    if (v4l2_thread_.IsRunning()) {
>      v4l2_thread_.task_runner()->PostTask(
>-@@ -89,6 +102,9 @@
>+@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio
>          base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
>    }
>  }
>Index: www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
>===================================================================
>--- www/chromium/files/patch-media_capture_video_video__capture__device__client.cc	(revision 432254)
>+++ www/chromium/files/patch-media_capture_video_video__capture__device__client.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- media/capture/video/video_capture_device_client.cc.orig	2016-12-12 21:21:34 UTC
>+--- media/capture/video/video_capture_device_client.cc.orig	2016-12-09 05:04:20 UTC
> +++ media/capture/video/video_capture_device_client.cc
> @@ -184,7 +184,7 @@ void VideoCaptureDeviceClient::OnIncomin
>  // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
>Index: www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
>===================================================================
>--- www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/capture/video/video_capture_device_factory.cc.orig	2016-08-13 01:27:17.328942000 +0300
>-+++ media/capture/video/video_capture_device_factory.cc	2016-08-13 01:16:43.725148000 +0300
>-@@ -18,6 +18,10 @@
>+--- media/capture/video/video_capture_device_factory.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/capture/video/video_capture_device_factory.cc
>+@@ -18,6 +18,10 @@ namespace media {
>  std::unique_ptr<VideoCaptureDeviceFactory>
>  VideoCaptureDeviceFactory::CreateFactory(
>      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
>@@ -11,18 +11,18 @@
>    const base::CommandLine* command_line =
>        base::CommandLine::ForCurrentProcess();
>    // Use a Fake or File Video Device Factory if the command line flags are
>-@@ -36,6 +40,7 @@
>+@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory
>      return std::unique_ptr<VideoCaptureDeviceFactory>(
>          CreateVideoCaptureDeviceFactory(ui_task_runner));
>    }
> +#endif
>  }
>-
>+ 
>  VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
>-@@ -56,7 +61,7 @@
>-   callback.Run(std::move(device_names));
>+@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat
>+   callback.Run(std::move(device_descriptors));
>  }
>-
>+ 
> -#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \
> +#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \
>      !defined(OS_WIN)
>Index: www/chromium/files/patch-media_cast_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-media_cast_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-media_cast_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- media/cast/BUILD.gn.orig	2016-08-03 22:02:20.000000000 +0300
>-+++ media/cast/BUILD.gn	2016-09-03 01:55:19.016112000 +0300
>-@@ -385,7 +385,7 @@
>+--- media/cast/BUILD.gn.orig	2016-12-09 05:04:20 UTC
>++++ media/cast/BUILD.gn
>+@@ -343,7 +343,7 @@ test("cast_unittests") {
>    }
>  }
>  
>@@ -9,7 +9,7 @@
>    # This is a target for the collection of cast development tools.  They are
>    # not built/linked into the Chromium browser.
>    group("testing_tools") {
>-@@ -430,7 +430,7 @@
>+@@ -388,7 +388,7 @@ if (is_win || is_mac || (is_linux && !is
>        "//build/win:default_exe_manifest",
>      ]
>  
>@@ -18,7 +18,7 @@
>        sources += [
>          "test/linux_output_window.cc",
>          "test/linux_output_window.h",
>-@@ -525,7 +525,7 @@
>+@@ -483,7 +483,7 @@ if (is_win || is_mac || (is_linux && !is
>    }
>  }
>  
>Index: www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni
>===================================================================
>--- www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni	(revision 432254)
>+++ www/chromium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni	(working copy)
>@@ -1,8 +1,8 @@
>---- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig	2016-08-03 22:02:20.000000000 +0300
>-+++ media/cdm/ppapi/ppapi_cdm_adapter.gni	2016-09-03 01:55:54.607135000 +0300
>-@@ -7,7 +7,7 @@
>- # depend on media/media_cdm_adapter.gyp:cdmadapter which would in turn modify
>- # your target with direct_dependent_settings.
>+--- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig	2016-12-09 05:04:20 UTC
>++++ media/cdm/ppapi/ppapi_cdm_adapter.gni
>+@@ -5,7 +5,7 @@
>+ # This template defines a CDM adapter target. Just use this as you would a
>+ # normal target and everything should work correctly.
>  template("ppapi_cdm_adapter") {
> -  if (is_mac || is_linux) {
> +  if (is_mac || is_linux || is_bsd) {
>@@ -9,7 +9,7 @@
>      _target_type = "loadable_module"
>    } else {
>      _target_type = "shared_library"
>-@@ -59,7 +59,7 @@
>+@@ -57,7 +57,7 @@ template("ppapi_cdm_adapter") {
>        libs += [ "rt" ]
>      }
>  
>Index: www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h
>===================================================================
>--- www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h	(nonexistent)
>+++ www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h	(working copy)
>@@ -0,0 +1,19 @@
>+--- media/ffmpeg/ffmpeg_common.h.orig	2016-12-09 05:04:20 UTC
>++++ media/ffmpeg/ffmpeg_common.h
>+@@ -25,7 +25,7 @@ extern "C" {
>+ // Disable deprecated features which result in spammy compile warnings.  This
>+ // list of defines must mirror those in the 'defines' section of FFmpeg's
>+ // BUILD.gn file or the headers below will generate different structures!
>+-#define FF_API_CONVERGENCE_DURATION 0
>++//#define FF_API_CONVERGENCE_DURATION 0
>+ // Upstream libavcodec/utils.c still uses the deprecated
>+ // av_dup_packet(), causing deprecation warnings.
>+ // The normal fix for such things is to disable the feature as below,
>+@@ -39,7 +39,6 @@ extern "C" {
>+ MSVC_PUSH_DISABLE_WARNING(4244);
>+ #include <libavcodec/avcodec.h>
>+ #include <libavformat/avformat.h>
>+-#include <libavformat/internal.h>
>+ #include <libavformat/avio.h>
>+ #include <libavutil/avutil.h>
>+ #include <libavutil/imgutils.h>
>
>Property changes on: www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
>===================================================================
>--- www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc	(nonexistent)
>+++ www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc	(working copy)
>@@ -0,0 +1,27 @@
>+--- media/filters/ffmpeg_demuxer.cc.orig	2016-12-09 05:04:20 UTC
>++++ media/filters/ffmpeg_demuxer.cc
>+@@ -1186,24 +1186,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
>+   // If no estimate is found, the stream entry will be kInfiniteDuration.
>+   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
>+                                                     kInfiniteDuration);
>+-  const AVFormatInternal* internal = format_context->internal;
>+-  if (internal && internal->packet_buffer &&
>+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
>+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
>+-    while (packet_buffer != internal->packet_buffer_end) {
>+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
>+-                start_time_estimates.size());
>+-      const AVStream* stream =
>+-          format_context->streams[packet_buffer->pkt.stream_index];
>+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
>+-        const base::TimeDelta packet_pts =
>+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
>+-        if (packet_pts < start_time_estimates[stream->index])
>+-          start_time_estimates[stream->index] = packet_pts;
>+-      }
>+-      packet_buffer = packet_buffer->next;
>+-    }
>+-  }
>+ 
>+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
>+ 
>
>Property changes on: www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-media_filters_vp9__parser.h
>===================================================================
>--- www/chromium/files/patch-media_filters_vp9__parser.h	(revision 432254)
>+++ www/chromium/files/patch-media_filters_vp9__parser.h	(working copy)
>@@ -1,5 +1,5 @@
>---- media/filters/vp9_parser.h.orig	2016-05-25 15:01:03.000000000 -0400
>-+++ media/filters/vp9_parser.h	2016-05-27 11:13:20.498371000 -0400
>+--- media/filters/vp9_parser.h.orig	2016-12-09 05:04:20 UTC
>++++ media/filters/vp9_parser.h
> @@ -14,6 +14,7 @@
>  
>  #include <stddef.h>
>Index: www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
>===================================================================
>--- www/chromium/files/patch-media_formats_common_offset__byte__queue.cc	(revision 432254)
>+++ www/chromium/files/patch-media_formats_common_offset__byte__queue.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- media/formats/common/offset_byte_queue.cc.orig	2016-03-25 13:04:49 UTC
>+--- media/formats/common/offset_byte_queue.cc.orig	2016-12-09 05:04:20 UTC
> +++ media/formats/common/offset_byte_queue.cc
> @@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off
>    *size = tail() - offset;
>Index: www/chromium/files/patch-media_formats_common_offset__byte__queue.h
>===================================================================
>--- www/chromium/files/patch-media_formats_common_offset__byte__queue.h	(revision 432254)
>+++ www/chromium/files/patch-media_formats_common_offset__byte__queue.h	(working copy)
>@@ -1,4 +1,4 @@
>---- media/formats/common/offset_byte_queue.h.orig	2016-03-25 13:04:49 UTC
>+--- media/formats/common/offset_byte_queue.h.orig	2016-12-09 05:04:20 UTC
> +++ media/formats/common/offset_byte_queue.h
> @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
>    // a null |buf| and a |size| of zero.
>Index: www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
>===================================================================
>--- www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc	(revision 432254)
>+++ www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/formats/mp2t/es_parser_adts.cc.orig	2016-05-11 19:02:24 UTC
>+--- media/formats/mp2t/es_parser_adts.cc.orig	2016-12-09 05:04:20 UTC
> +++ media/formats/mp2t/es_parser_adts.cc
>-@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
>+@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
>    const uint8_t* es;
>    es_queue_->Peek(&es, &es_size);
>  
>@@ -15,7 +15,7 @@
>      const uint8_t* cur_buf = &es[offset];
>      if (!isAdtsSyncWord(cur_buf))
>        continue;
>-@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
>+@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
>      return true;
>    }
>  
>Index: www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
>===================================================================
>--- www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc	(revision 432254)
>+++ www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2016-05-11 19:02:24 UTC
>+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2016-12-09 05:04:20 UTC
> +++ media/formats/mp2t/es_parser_mpeg1audio.cc
>-@@ -110,11 +110,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
>+@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
>    const uint8_t* es;
>    es_queue_->Peek(&es, &es_size);
>  
>@@ -15,7 +15,7 @@
>      const uint8_t* cur_buf = &es[offset];
>      if (cur_buf[0] != 0xff)
>        continue;
>-@@ -155,7 +155,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
>+@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
>      return true;
>    }
>  
>Index: www/chromium/files/patch-mojo_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-mojo_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-mojo_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- mojo/BUILD.gn.orig	2016-12-12 22:10:20 UTC
>+--- mojo/BUILD.gn.orig	2016-12-09 05:04:21 UTC
> +++ mojo/BUILD.gn
> @@ -12,7 +12,7 @@ group("mojo") {
>      "//mojo/common",
>Index: www/chromium/files/patch-mojo_edk_test_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-mojo_edk_test_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-mojo_edk_test_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- mojo/edk/test/BUILD.gn.orig	2016-08-03 22:02:20.000000000 +0300
>-+++ mojo/edk/test/BUILD.gn	2016-09-02 23:44:49.826221000 +0300
>-@@ -43,7 +43,7 @@
>+--- mojo/edk/test/BUILD.gn.orig	2016-12-09 05:04:21 UTC
>++++ mojo/edk/test/BUILD.gn
>+@@ -48,7 +48,7 @@ source_set("run_all_unittests") {
>      "//testing/gtest",
>    ]
>  
>@@ -9,7 +9,7 @@
>      public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>    }
>  }
>-@@ -63,7 +63,7 @@
>+@@ -68,7 +68,7 @@ source_set("run_all_perftests") {
>      "run_all_perftests.cc",
>    ]
>  
>Index: www/chromium/files/patch-native__client__sdk_src_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-native__client__sdk_src_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-native__client__sdk_src_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- native_client_sdk/src/BUILD.gn.orig	2016-08-03 22:02:20.000000000 +0300
>-+++ native_client_sdk/src/BUILD.gn	2016-09-02 23:46:03.429042000 +0300
>-@@ -7,7 +7,7 @@
>+--- native_client_sdk/src/BUILD.gn.orig	2016-12-09 05:04:21 UTC
>++++ native_client_sdk/src/BUILD.gn
>+@@ -7,7 +7,7 @@ import("//build/config/features.gni")
>  declare_args() {
>    # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)
>    # binaries is supported.
>@@ -9,7 +9,7 @@
>  
>    # Build the nacl SDK untrusted components.  This is disabled by default since
>    # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc)
>-@@ -28,7 +28,7 @@
>+@@ -28,7 +28,7 @@ if (enable_nacl) {
>          "//native_client/src/trusted/service_runtime:sel_ldr",
>          "//native_client/src/trusted/validator/driver:ncval_new",
>        ]
>Index: www/chromium/files/patch-net_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-net_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-net_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- net/BUILD.gn.orig	2016-10-06 04:02:22.000000000 +0300
>-+++ net/BUILD.gn	2016-10-18 00:25:21.260605000 +0300
>-@@ -175,6 +175,11 @@
>+--- net/BUILD.gn.orig	2016-12-09 05:04:21 UTC
>++++ net/BUILD.gn
>+@@ -158,6 +158,11 @@ component("net") {
>        ]
>        if (is_android) {
>          sources -= [ "base/openssl_private_key_store_android.cc" ]
>@@ -12,7 +12,7 @@
>        }
>      } else {
>        if (is_android) {
>-@@ -298,6 +303,13 @@
>+@@ -283,6 +288,13 @@ component("net") {
>        sources -= [ "disk_cache/blockfile/file_posix.cc" ]
>      }
>  
>@@ -26,7 +26,7 @@
>      if (is_ios || is_mac) {
>        sources += gypi_values.net_base_mac_ios_sources
>      }
>-@@ -1025,7 +1037,7 @@
>+@@ -1013,7 +1025,7 @@ if (!is_ios && !is_android) {
>    }
>  }
>  
>@@ -35,7 +35,7 @@
>    executable("cachetool") {
>      testonly = true
>      sources = [
>-@@ -1054,7 +1066,7 @@
>+@@ -1042,7 +1054,7 @@ if (is_linux || is_mac) {
>    }
>  }
>  
>@@ -44,7 +44,7 @@
>    static_library("epoll_server") {
>      sources = [
>        "tools/epoll_server/epoll_server.cc",
>-@@ -1160,7 +1172,7 @@
>+@@ -1148,7 +1160,7 @@ if (is_android) {
>    }
>  }
>  
>@@ -53,7 +53,7 @@
>    executable("disk_cache_memory_test") {
>      testonly = true
>      sources = [
>-@@ -1353,7 +1365,7 @@
>+@@ -1357,7 +1369,7 @@ test("net_unittests") {
>      "third_party/nist-pkits/",
>    ]
>  
>@@ -62,7 +62,7 @@
>      deps += [
>        "//third_party/pyftpdlib/",
>        "//third_party/pywebsocket/",
>-@@ -1376,7 +1388,7 @@
>+@@ -1380,7 +1392,7 @@ test("net_unittests") {
>    if (is_desktop_linux) {
>      deps += [ ":epoll_quic_tools" ]
>    }
>@@ -71,7 +71,7 @@
>      sources += gypi_values.net_linux_test_sources
>      deps += [
>        ":epoll_quic_tools",
>-@@ -1392,6 +1404,12 @@
>+@@ -1400,6 +1412,12 @@ test("net_unittests") {
>      sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
>    }
>  
>Index: www/chromium/files/patch-net_base_address__tracker__linux.h
>===================================================================
>--- www/chromium/files/patch-net_base_address__tracker__linux.h	(revision 432254)
>+++ www/chromium/files/patch-net_base_address__tracker__linux.h	(working copy)
>@@ -1,5 +1,5 @@
>---- net/base/address_tracker_linux.h.orig	2016-05-25 15:01:03.000000000 -0400
>-+++ net/base/address_tracker_linux.h	2016-05-27 11:17:51.228810000 -0400
>+--- net/base/address_tracker_linux.h.orig	2016-12-09 05:04:21 UTC
>++++ net/base/address_tracker_linux.h
> @@ -6,10 +6,12 @@
>  #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
>  
>@@ -13,7 +13,7 @@
>  #include <stddef.h>
>  
>  #include <map>
>-@@ -33,8 +35,11 @@
>+@@ -34,8 +36,11 @@ namespace internal {
>  class NET_EXPORT_PRIVATE AddressTrackerLinux :
>      public base::MessageLoopForIO::Watcher {
>   public:
>Index: www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
>===================================================================
>--- www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- net/base/address_tracker_linux_unittest.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/base/address_tracker_linux_unittest.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/base/address_tracker_linux_unittest.cc
>-@@ -8,7 +8,11 @@
>- #include "base/threading/simple_thread.h"
>+@@ -4,7 +4,11 @@
>+ 
>  #include "net/base/address_tracker_linux.h"
>  
> +#if defined(__linux__)
>@@ -10,5 +10,5 @@
> +#include <net/if.h>
> +#endif
>  
>- #include <vector>
>- 
>+ #include <memory>
>+ #include <unordered_set>
>Index: www/chromium/files/patch-net_base_mime__util__unittest.cc
>===================================================================
>--- www/chromium/files/patch-net_base_mime__util__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-net_base_mime__util__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/base/mime_util_unittest.cc.orig	2016-03-25 13:04:50 UTC
>+--- net/base/mime_util_unittest.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/base/mime_util_unittest.cc
> @@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM
>      { "MeSsAge/*",  1, "eml" },
>Index: www/chromium/files/patch-net_base_network__change__notifier.cc
>===================================================================
>--- www/chromium/files/patch-net_base_network__change__notifier.cc	(revision 432254)
>+++ www/chromium/files/patch-net_base_network__change__notifier.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- net/base/network_change_notifier.cc.orig	2016-10-06 04:02:22.000000000 +0300
>-+++ net/base/network_change_notifier.cc	2016-10-14 20:28:12.376281000 +0300
>-@@ -533,7 +533,6 @@
>+--- net/base/network_change_notifier.cc.orig	2016-12-09 05:04:21 UTC
>++++ net/base/network_change_notifier.cc
>+@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti
>  #elif defined(OS_MACOSX)
>    return new NetworkChangeNotifierMac();
>  #else
>@@ -8,7 +8,7 @@
>    return NULL;
>  #endif
>  }
>-@@ -753,7 +752,7 @@
>+@@ -753,7 +752,7 @@ void NetworkChangeNotifier::LogOperatorC
>  #endif
>  }
>  
>@@ -17,7 +17,7 @@
>  // static
>  const internal::AddressTrackerLinux*
>  NetworkChangeNotifier::GetAddressTracker() {
>-@@ -978,7 +977,7 @@
>+@@ -978,7 +977,7 @@ NetworkChangeNotifier::NetworkChangeNoti
>    network_change_calculator_->Init();
>  }
>  
>Index: www/chromium/files/patch-net_base_network__change__notifier.h
>===================================================================
>--- www/chromium/files/patch-net_base_network__change__notifier.h	(revision 432254)
>+++ www/chromium/files/patch-net_base_network__change__notifier.h	(working copy)
>@@ -1,6 +1,6 @@
>---- net/base/network_change_notifier.h.orig	2016-08-03 22:02:21.000000000 +0300
>-+++ net/base/network_change_notifier.h	2016-09-26 03:54:03.417293000 +0300
>-@@ -26,7 +26,7 @@
>+--- net/base/network_change_notifier.h.orig	2016-12-09 05:04:21 UTC
>++++ net/base/network_change_notifier.h
>+@@ -26,7 +26,7 @@ struct NetworkInterface;
>  typedef std::vector<NetworkInterface> NetworkInterfaceList;
>  class URLRequest;
>  
>@@ -9,7 +9,7 @@
>  namespace internal {
>  class AddressTrackerLinux;
>  }
>-@@ -329,7 +329,7 @@
>+@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier {
>    // a large HOSTS file.
>    static void GetDnsConfig(DnsConfig* config);
>  
>@@ -18,7 +18,7 @@
>    // Returns the AddressTrackerLinux if present.
>    static const internal::AddressTrackerLinux* GetAddressTracker();
>  #endif
>-@@ -485,7 +485,7 @@
>+@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier {
>        const NetworkChangeCalculatorParams& params =
>            NetworkChangeCalculatorParams());
>  
>Index: www/chromium/files/patch-net_base_network__interfaces__linux.cc
>===================================================================
>--- www/chromium/files/patch-net_base_network__interfaces__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-net_base_network__interfaces__linux.cc	(working copy)
>@@ -1,8 +1,8 @@
>---- net/base/network_interfaces_linux.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/base/network_interfaces_linux.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/base/network_interfaces_linux.cc
>-@@ -4,12 +4,14 @@
>+@@ -6,12 +6,14 @@
>  
>- #include "net/base/network_interfaces_linux.h"
>+ #include <memory>
>  
> +#if !defined(OS_FREEBSD)
>  #if !defined(OS_ANDROID)
>@@ -15,7 +15,7 @@
>  #include <set>
>  #include <sys/ioctl.h>
>  #include <sys/types.h>
>-@@ -44,6 +46,7 @@ bool TryConvertNativeToNetIPAttributes(i
>+@@ -49,6 +51,7 @@ bool TryConvertNativeToNetIPAttributes(i
>    // are still progressing through duplicated address detection (DAD)
>    // and shouldn't be used by the application layer until DAD process
>    // is completed.
>@@ -23,7 +23,7 @@
>    if (native_attributes & (
>  #if !defined(OS_ANDROID)
>                                IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
>-@@ -61,6 +64,10 @@ bool TryConvertNativeToNetIPAttributes(i
>+@@ -66,6 +69,10 @@ bool TryConvertNativeToNetIPAttributes(i
>    }
>  
>    return true;
>@@ -34,7 +34,7 @@
>  }
>  
>  }  // namespace
>-@@ -79,13 +86,15 @@ NetworkChangeNotifier::ConnectionType Ge
>+@@ -80,13 +87,15 @@ NetworkChangeNotifier::ConnectionType Ge
>    if (!s.is_valid())
>      return NetworkChangeNotifier::CONNECTION_UNKNOWN;
>  
>@@ -51,7 +51,7 @@
>    // Test ethtool for CONNECTION_ETHERNET
>    struct ethtool_cmd ecmd = {};
>    ecmd.cmd = ETHTOOL_GSET;
>-@@ -94,12 +103,13 @@ NetworkChangeNotifier::ConnectionType Ge
>+@@ -95,12 +104,13 @@ NetworkChangeNotifier::ConnectionType Ge
>    strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
>    if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
>      return NetworkChangeNotifier::CONNECTION_ETHERNET;
>@@ -66,7 +66,7 @@
>    base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
>    if (!ioctl_socket.is_valid())
>      return "";
>-@@ -111,9 +121,11 @@ std::string GetInterfaceSSID(const std::
>+@@ -112,9 +122,11 @@ std::string GetInterfaceSSID(const std::
>    wreq.u.essid.length = IW_ESSID_MAX_SIZE;
>    if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
>      return ssid;
>@@ -78,7 +78,7 @@
>  bool GetNetworkListImpl(
>      NetworkInterfaceList* networks,
>      int policy,
>-@@ -182,6 +194,7 @@ bool GetNetworkListImpl(
>+@@ -183,6 +195,7 @@ bool GetNetworkListImpl(
>  
>    return true;
>  }
>@@ -86,7 +86,7 @@
>  
>  std::string GetWifiSSIDFromInterfaceListInternal(
>      const NetworkInterfaceList& interfaces,
>-@@ -206,12 +219,16 @@ bool GetNetworkList(NetworkInterfaceList
>+@@ -207,12 +220,16 @@ bool GetNetworkList(NetworkInterfaceList
>    if (networks == NULL)
>      return false;
>  
>Index: www/chromium/files/patch-net_base_network__interfaces__posix.cc
>===================================================================
>--- www/chromium/files/patch-net_base_network__interfaces__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-net_base_network__interfaces__posix.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/base/network_interfaces_posix.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/base/network_interfaces_posix.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/base/network_interfaces_posix.cc
> @@ -20,6 +20,7 @@ namespace net {
>  #if !defined(OS_NACL)
>Index: www/chromium/files/patch-net_dns_address__sorter__posix.cc
>===================================================================
>--- www/chromium/files/patch-net_dns_address__sorter__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-net_dns_address__sorter__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- net/dns/address_sorter_posix.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/dns/address_sorter_posix.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/dns/address_sorter_posix.cc
>-@@ -11,6 +11,7 @@
>+@@ -13,6 +13,7 @@
>  #include <sys/socket.h>  // Must be included before ifaddrs.h.
>  #include <ifaddrs.h>
>  #include <net/if.h>
>Index: www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
>===================================================================
>--- www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/dns/dns_config_service_posix_unittest.cc.orig	2016-12-12 22:12:11 UTC
>+--- net/dns/dns_config_service_posix_unittest.cc.orig	2016-12-09 05:04:21 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
>Index: www/chromium/files/patch-net_dns_dns__reloader.cc
>===================================================================
>--- www/chromium/files/patch-net_dns_dns__reloader.cc	(revision 432254)
>+++ www/chromium/files/patch-net_dns_dns__reloader.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/dns/dns_reloader.cc.orig	2016-03-25 13:04:50 UTC
>+--- net/dns/dns_reloader.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/dns/dns_reloader.cc
> @@ -7,6 +7,10 @@
>  #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
>Index: www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
>===================================================================
>--- www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/http/http_auth_gssapi_posix.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/http/http_auth_gssapi_posix.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/http/http_auth_gssapi_posix.cc
> @@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:
>      static const char* const kDefaultLibraryNames[] = {
>Index: www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
>===================================================================
>--- www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- net/proxy/proxy_config_service_linux.cc.orig	2016-10-06 04:02:23.000000000 +0300
>-+++ net/proxy/proxy_config_service_linux.cc	2016-10-13 08:05:04.653281000 +0300
>+--- net/proxy/proxy_config_service_linux.cc.orig	2016-12-09 05:04:21 UTC
>++++ net/proxy/proxy_config_service_linux.cc
> @@ -11,7 +11,14 @@
>  #include <limits.h>
>  #include <stdio.h>
>@@ -15,7 +15,7 @@
>  #include <unistd.h>
>  
>  #include <map>
>-@@ -863,6 +870,7 @@
>+@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox
>   public:
>    explicit SettingGetterImplKDE(base::Environment* env_var_getter)
>        : inotify_fd_(-1),
>@@ -23,7 +23,7 @@
>          notify_delegate_(nullptr),
>          debounce_timer_(new base::OneShotTimer()),
>          indirect_manual_(false),
>-@@ -937,9 +945,10 @@
>+@@ -937,9 +945,10 @@ class SettingGetterImplKDE : public Prox
>      // and pending tasks may then be deleted without being run.
>      // Here in the KDE version, we can safely close the file descriptor
>      // anyway. (Not that it really matters; the process is exiting.)
>@@ -35,7 +35,7 @@
>    }
>  
>    bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
>-@@ -948,9 +957,17 @@
>+@@ -948,9 +957,17 @@ class SettingGetterImplKDE : public Prox
>      // This has to be called on the UI thread (http://crbug.com/69057).
>      base::ThreadRestrictions::ScopedAllowIO allow_io;
>      DCHECK_LT(inotify_fd_, 0);
>@@ -53,7 +53,7 @@
>        return false;
>      }
>      if (!base::SetNonBlocking(inotify_fd_)) {
>-@@ -974,22 +991,40 @@
>+@@ -974,22 +991,40 @@ class SettingGetterImplKDE : public Prox
>        close(inotify_fd_);
>        inotify_fd_ = -1;
>      }
>@@ -94,7 +94,7 @@
>      notify_delegate_ = delegate;
>      if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
>              inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
>-@@ -1010,7 +1045,19 @@
>+@@ -1010,7 +1045,19 @@ class SettingGetterImplKDE : public Prox
>    void OnFileCanReadWithoutBlocking(int fd) override {
>      DCHECK_EQ(fd, inotify_fd_);
>      DCHECK(file_task_runner_->BelongsToCurrentThread());
>@@ -114,7 +114,7 @@
>    }
>    void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
>  
>-@@ -1283,8 +1330,11 @@
>+@@ -1283,8 +1330,11 @@ class SettingGetterImplKDE : public Prox
>    void OnChangeNotification() {
>      DCHECK_GE(inotify_fd_,  0);
>      DCHECK(file_task_runner_->BelongsToCurrentThread());
>@@ -127,7 +127,7 @@
>      ssize_t r;
>      while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
>        // inotify returns variable-length structures, which is why we have
>-@@ -1321,6 +1371,7 @@
>+@@ -1321,6 +1371,7 @@ class SettingGetterImplKDE : public Prox
>          inotify_fd_ = -1;
>        }
>      }
>@@ -135,7 +135,7 @@
>      if (kioslaverc_touched) {
>        // We don't use Reset() because the timer may not yet be running.
>        // (In that case Stop() is a no-op.)
>-@@ -1336,6 +1387,7 @@
>+@@ -1336,6 +1387,7 @@ class SettingGetterImplKDE : public Prox
>                     std::vector<std::string> > strings_map_type;
>  
>    int inotify_fd_;
>Index: www/chromium/files/patch-net_proxy_proxy__service.cc
>===================================================================
>--- www/chromium/files/patch-net_proxy_proxy__service.cc	(revision 432254)
>+++ www/chromium/files/patch-net_proxy_proxy__service.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- net/proxy/proxy_service.cc.orig	2016-07-20 22:03:27.000000000 +0300
>-+++ net/proxy/proxy_service.cc	2016-08-01 04:25:47.866569000 +0300
>-@@ -48,7 +48,7 @@
>+--- net/proxy/proxy_service.cc.orig	2016-12-09 05:04:21 UTC
>++++ net/proxy/proxy_service.cc
>+@@ -49,7 +49,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"
>-@@ -1542,7 +1542,7 @@
>+@@ -1535,7 +1535,7 @@ ProxyService::CreateSystemProxyConfigSer
>               << "profile_io_data.cc::CreateProxyConfigService and this should "
>               << "be used only for examples.";
>    return base::WrapUnique(new UnsetProxyConfigService);
>@@ -17,4 +17,4 @@
> +#elif defined(OS_LINUX) || defined(OS_BSD)
>    std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
>        new ProxyConfigServiceLinux());
>-
>+ 
>Index: www/chromium/files/patch-net_socket_socks5__client__socket.cc
>===================================================================
>--- www/chromium/files/patch-net_socket_socks5__client__socket.cc	(revision 432254)
>+++ www/chromium/files/patch-net_socket_socks5__client__socket.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- net/socket/socks5_client_socket.cc.orig	2016-05-11 19:02:24 UTC
>+--- net/socket/socks5_client_socket.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/socket/socks5_client_socket.cc
> @@ -4,6 +4,10 @@
>  
>Index: www/chromium/files/patch-net_udp_udp__socket__posix.cc
>===================================================================
>--- www/chromium/files/patch-net_udp_udp__socket__posix.cc	(revision 432254)
>+++ www/chromium/files/patch-net_udp_udp__socket__posix.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- net/udp/udp_socket_posix.cc.orig	2016-12-16 03:54:19.436860000 +0000
>-+++ net/udp/udp_socket_posix.cc	2016-12-16 03:55:18.231119000 +0000
>-@@ -51,7 +51,7 @@
>+--- net/udp/udp_socket_posix.cc.orig	2016-12-09 05:04:21 UTC
>++++ net/udp/udp_socket_posix.cc
>+@@ -51,7 +51,7 @@ const int kBindRetries = 10;
>  const int kPortStart = 1024;
>  const int kPortEnd = 65535;
>  
>@@ -9,7 +9,7 @@
>  
>  // Returns IPv4 address in network order.
>  int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) {
>-@@ -679,7 +679,7 @@
>+@@ -679,7 +679,7 @@ int UDPSocketPosix::SetMulticastOptions(
>    if (multicast_interface_ != 0) {
>      switch (addr_family_) {
>        case AF_INET: {
>@@ -18,7 +18,7 @@
>          ip_mreqn mreq;
>          mreq.imr_ifindex = multicast_interface_;
>          mreq.imr_address.s_addr = htonl(INADDR_ANY);
>-@@ -754,7 +754,7 @@
>+@@ -754,7 +754,7 @@ int UDPSocketPosix::JoinGroup(const IPAd
>        if (addr_family_ != AF_INET)
>          return ERR_ADDRESS_INVALID;
>  
>Index: www/chromium/files/patch-net_udp_udp__socket__unittest.cc
>===================================================================
>--- www/chromium/files/patch-net_udp_udp__socket__unittest.cc	(revision 432254)
>+++ www/chromium/files/patch-net_udp_udp__socket__unittest.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- net/udp/udp_socket_unittest.cc.orig	2016-05-11 19:02:25 UTC
>+--- net/udp/udp_socket_unittest.cc.orig	2016-12-09 05:04:21 UTC
> +++ net/udp/udp_socket_unittest.cc
>-@@ -266,7 +266,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking
>+@@ -280,7 +280,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking
>  }
>  #endif
>  
>Index: www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
>===================================================================
>--- www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc	(revision 432254)
>+++ www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- pdf/pdfium/pdfium_engine.cc.orig	2016-05-11 19:02:25 UTC
>+--- pdf/pdfium/pdfium_engine.cc.orig	2016-12-09 05:04:21 UTC
> +++ pdf/pdfium/pdfium_engine.cc
>-@@ -121,7 +121,7 @@ std::vector<uint32_t> GetPageNumbersFrom
>+@@ -123,7 +123,7 @@ std::vector<uint32_t> GetPageNumbersFrom
>    return page_numbers;
>  }
>  
>@@ -9,7 +9,7 @@
>  
>  PP_Instance g_last_instance_id;
>  
>-@@ -507,7 +507,7 @@ bool InitializeSDK() {
>+@@ -509,7 +509,7 @@ bool InitializeSDK() {
>    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
>    FPDF_InitLibraryWithConfig(&config);
>  
>@@ -18,7 +18,7 @@
>    // Font loading doesn't work in the renderer sandbox in Linux.
>    FPDF_SetSystemFontInfo(&g_font_info);
>  #endif
>-@@ -620,7 +620,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
>+@@ -623,7 +623,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
>    IFSDK_PAUSE::user = nullptr;
>    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
>  
>@@ -27,7 +27,7 @@
>    // PreviewModeClient does not know its pp::Instance.
>    pp::Instance* instance = client_->GetPluginInstance();
>    if (instance)
>-@@ -1330,7 +1330,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
>+@@ -1332,7 +1332,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
>      FPDF_ClosePage(pdf_page);
>    }
>  
>@@ -36,7 +36,7 @@
>    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
>  #endif
>  
>-@@ -2688,7 +2688,7 @@ bool PDFiumEngine::ContinuePaint(int pro
>+@@ -2751,7 +2751,7 @@ bool PDFiumEngine::ContinuePaint(int pro
>    DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
>    DCHECK(image_data);
>  
>@@ -45,7 +45,7 @@
>    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
>  #endif
>  
>-@@ -3142,7 +3142,7 @@ void PDFiumEngine::SetCurrentPage(int in
>+@@ -3210,7 +3210,7 @@ void PDFiumEngine::SetCurrentPage(int in
>      FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
>    }
>    most_visible_page_ = index;
>Index: www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
>===================================================================
>--- www/chromium/files/patch-ppapi_proxy_file__io__resource.cc	(revision 432254)
>+++ www/chromium/files/patch-ppapi_proxy_file__io__resource.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ppapi/proxy/file_io_resource.cc.orig	2016-05-11 19:02:25 UTC
>+--- ppapi/proxy/file_io_resource.cc.orig	2016-12-09 05:04:21 UTC
> +++ ppapi/proxy/file_io_resource.cc
> @@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
>  
>Index: www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
>===================================================================
>--- www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc	(revision 432254)
>+++ www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2016-05-11 19:02:25 UTC
>+--- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2016-12-09 05:04:21 UTC
> +++ ppapi/shared_impl/private/net_address_private_impl.cc
> @@ -26,9 +26,12 @@
>  #include <arpa/inet.h>
>Index: www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ppapi_tests_extensions_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ppapi/tests/extensions/BUILD.gn.orig	2016-10-06 04:02:23.000000000 +0300
>-+++ ppapi/tests/extensions/BUILD.gn	2016-10-13 08:10:32.687869000 +0300
>-@@ -20,7 +20,7 @@
>+--- ppapi/tests/extensions/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ ppapi/tests/extensions/BUILD.gn
>+@@ -20,7 +20,7 @@ group("extensions") {
>      ":ppapi_tests_extensions_popup($newlib)",
>      ":ppapi_tests_extensions_socket_permissions($newlib)",
>    ]
>Index: www/chromium/files/patch-printing_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-printing_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-printing_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- printing/BUILD.gn.orig	2016-10-06 04:02:23.000000000 +0300
>-+++ printing/BUILD.gn	2016-10-13 08:13:38.178051000 +0300
>-@@ -125,7 +125,7 @@
>+--- printing/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ printing/BUILD.gn
>+@@ -125,7 +125,7 @@ component("printing") {
>    if (use_cups) {
>      configs += [ ":cups" ]
>  
>@@ -9,7 +9,7 @@
>        # rebase_path does not accept an empty string
>        if (use_sysroot) {
>          cups_sysroot = rebase_path(sysroot)
>-@@ -202,7 +202,7 @@
>+@@ -202,7 +202,7 @@ component("printing") {
>        "printing_context_no_system_dialog.cc",
>        "printing_context_no_system_dialog.h",
>      ]
>Index: www/chromium/files/patch-printing_cups__config__helper.py
>===================================================================
>--- www/chromium/files/patch-printing_cups__config__helper.py	(revision 432254)
>+++ www/chromium/files/patch-printing_cups__config__helper.py	(working copy)
>@@ -1,6 +1,6 @@
>---- printing/cups_config_helper.py.orig	2016-08-03 22:02:22.000000000 +0300
>-+++ printing/cups_config_helper.py	2016-09-02 22:48:48.706284000 +0300
>-@@ -65,7 +65,7 @@
>+--- printing/cups_config_helper.py.orig	2016-12-09 05:04:22 UTC
>++++ printing/cups_config_helper.py
>+@@ -65,7 +65,7 @@ def main():
>    mode = sys.argv[1]
>    if len(sys.argv) > 2 and sys.argv[2]:
>      sysroot = sys.argv[2]
>Index: www/chromium/files/patch-remoting_host_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-remoting_host_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-remoting_host_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- remoting/host/BUILD.gn.orig	2016-10-06 04:02:23.000000000 +0300
>-+++ remoting/host/BUILD.gn	2016-10-13 08:18:22.564549000 +0300
>-@@ -420,7 +420,7 @@
>+--- remoting/host/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ remoting/host/BUILD.gn
>+@@ -325,7 +325,7 @@ static_library("host") {
>      deps += [ "//components/policy:generated" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      libs += [ "pam" ]
>    }
>  
>-@@ -439,7 +439,7 @@
>+@@ -348,7 +348,7 @@ static_library("host") {
>        "input_injector_x11.cc",
>        "local_input_monitor_x11.cc",
>      ]
>@@ -18,8 +18,8 @@
>        # These will already be filtered out on non-Linux.
>        sources -= [
>          "linux/unicode_to_keysym.cc",
>-@@ -648,7 +648,7 @@
>-     "win/worker_process_launcher_unittest.cc",
>+@@ -537,7 +537,7 @@ source_set("unit_tests") {
>+     "touch_injector_win_unittest.cc",
>    ]
>  
> -  if (!use_x11 && is_linux) {
>@@ -27,9 +27,9 @@
>      sources -= [ "linux/unicode_to_keysym_unittest.cc" ]
>    }
>    if (use_ozone || is_chromeos) {
>-@@ -1217,7 +1217,7 @@
>-     if (is_desktop_linux) {
>-       deps += [ "//build/config/linux/gtk2" ]
>+@@ -770,7 +770,7 @@ if (enable_me2me_host) {
>+         deps += [ "//build/config/linux/gtk2" ]
>+       }
>      }
> -    if ((is_linux && !is_chromeos) || is_mac) {
> +    if ((is_linux && !is_chromeos) || is_mac || is_bsd) {
>@@ -36,7 +36,7 @@
>        libs = [ "pam" ]
>      }
>  
>-@@ -1359,7 +1359,7 @@
>+@@ -886,7 +886,7 @@ if (enable_me2me_host) {
>        }
>      }
>  
>Index: www/chromium/files/patch-sdch_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-sdch_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-sdch_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- sdch/BUILD.gn.orig	2016-08-03 22:02:22.000000000 +0300
>-+++ sdch/BUILD.gn	2016-09-13 17:24:52.015350000 +0300
>-@@ -11,7 +11,7 @@
>+--- sdch/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ sdch/BUILD.gn
>+@@ -11,7 +11,7 @@ config("sdch_config") {
>  # from a config and can't be on the target directly.
>  config("sdch_warnings") {
>    cflags = []
>@@ -9,7 +9,7 @@
>      # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:
>      cflags += [ "-Wno-deprecated-declarations" ]
>    }
>-@@ -61,7 +61,7 @@
>+@@ -59,7 +59,7 @@ static_library("sdch") {
>      "//third_party/zlib",
>    ]
>  
>Index: www/chromium/files/patch-services_shell_standalone_context.cc
>===================================================================
>--- www/chromium/files/patch-services_shell_standalone_context.cc	(revision 432254)
>+++ www/chromium/files/patch-services_shell_standalone_context.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- services/shell/standalone/context.cc.orig	2016-10-06 04:02:24.000000000 +0300
>-+++ services/shell/standalone/context.cc	2016-10-23 13:44:14.656275000 +0300
>-@@ -198,7 +198,7 @@
>+--- services/shell/standalone/context.cc.orig	2016-12-09 05:04:22 UTC
>++++ services/shell/standalone/context.cc
>+@@ -196,7 +196,7 @@ void Context::Init(std::unique_ptr<InitP
>      tracing_remote_interfaces->GetInterface(
>          tracing::mojom::StartupPerformanceDataCollector::Name_,
>          mojo::GetProxy(&collector).PassMessagePipe());
>Index: www/chromium/files/patch-services_ui_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-services_ui_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-services_ui_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- services/ui/BUILD.gn.orig	2016-12-09 05:04:22.000000000 +0000
>-+++ services/ui/BUILD.gn	2016-12-19 19:02:41.332230000 +0000
>-@@ -13,7 +13,6 @@
>+--- services/ui/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ services/ui/BUILD.gn
>+@@ -13,7 +13,6 @@ group("all") {
>    testonly = true
>    deps = [
>      ":ui",
>@@ -8,7 +8,7 @@
>      "//services/ui/test_wm",
>    ]
>  }
>-@@ -38,7 +37,6 @@
>+@@ -38,7 +37,6 @@ service("ui") {
>  
>    data_deps = [
>      ":manifest",
>Index: www/chromium/files/patch-services_ui_ime_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-services_ui_ime_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-services_ui_ime_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- services/ui/ime/BUILD.gn.orig	2016-12-19 15:26:06.098748000 +0000
>-+++ services/ui/ime/BUILD.gn	2016-12-19 15:26:20.556851000 +0000
>-@@ -49,7 +49,6 @@
>+--- services/ui/ime/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ services/ui/ime/BUILD.gn
>+@@ -49,7 +49,6 @@ test("mus_ime_unittests") {
>      ":test_manifest",
>      ":lib",
>      "//services/ui",
>Index: www/chromium/files/patch-skia_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-skia_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-skia_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- skia/BUILD.gn.orig	2016-08-03 22:02:22.000000000 +0300
>-+++ skia/BUILD.gn	2016-10-09 06:26:37.625935000 +0300
>-@@ -213,7 +213,7 @@
>+--- skia/BUILD.gn.orig	2016-12-09 05:04:22 UTC
>++++ skia/BUILD.gn
>+@@ -134,7 +134,7 @@ config("skia_library_config") {
>    }
>  
>    # Settings for text blitting, chosen to approximate the system browser.
>@@ -9,7 +9,7 @@
>      defines += [
>        "SK_GAMMA_EXPONENT=1.2",
>        "SK_GAMMA_CONTRAST=0.2",
>-@@ -405,7 +405,7 @@
>+@@ -359,7 +359,7 @@ component("skia") {
>      sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
>    }
>  
>@@ -16,9 +16,9 @@
> -  if (!is_linux) {
> +  if (!is_linux && !is_bsd) {
>      sources -= [
>-       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
>+       "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
>        "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
>-@@ -416,14 +416,14 @@
>+@@ -371,14 +371,14 @@ component("skia") {
>  
>    # Add the files for the SkFontMgr_Android. This is used to emulate android
>    # fonts on linux. See content/zygote/zygote_main_linux.cc
>@@ -35,8 +35,8 @@
>      sources -= [
>        "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
>        "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
>-@@ -463,7 +463,7 @@
>-     "//third_party/zlib",
>+@@ -417,7 +417,7 @@ component("skia") {
>+     "//base/third_party/dynamic_annotations",
>    ]
>  
> -  if (is_linux) {
>Index: www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
>===================================================================
>--- www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp	(revision 432254)
>+++ www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- skia/ext/SkMemory_new_handler.cpp.orig	2016-04-08 16:02:10 UTC
>+--- skia/ext/SkMemory_new_handler.cpp.orig	2016-12-09 05:04:22 UTC
> +++ skia/ext/SkMemory_new_handler.cpp
>-@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t si
>+@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si
>      // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
>      // doesn't work as intended everywhere.
>      void* result;
>@@ -9,7 +9,7 @@
>      result = malloc(size);
>  #else
>      // It's the responsibility of the caller to check the return value.
>-@@ -89,7 +89,7 @@ void* sk_calloc(size_t size) {
>+@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) {
>      // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
>      // doesn't work as intended everywhere.
>      void* result;
>Index: www/chromium/files/patch-testing_gtest_src_gtest.cc
>===================================================================
>--- www/chromium/files/patch-testing_gtest_src_gtest.cc	(revision 432254)
>+++ www/chromium/files/patch-testing_gtest_src_gtest.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- testing/gtest/src/gtest.cc.orig	2016-05-11 19:03:10 UTC
>+--- testing/gtest/src/gtest.cc.orig	2016-12-09 05:05:02 UTC
> +++ testing/gtest/src/gtest.cc
> @@ -122,6 +122,10 @@
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig	2016-05-11 19:02:30 UTC
>+--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig	2016-12-09 05:04:31 UTC
> +++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
>-@@ -44,6 +44,8 @@
>+@@ -46,6 +46,8 @@
>  
>  #if OS(WIN)
>  #include <malloc.h>
>Index: www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2016-12-15 15:07:51.031899000 +0000
>-+++ third_party/WebKit/Source/core/layout/BUILD.gn	2016-12-15 15:08:04.975660000 +0000
>-@@ -341,7 +341,7 @@
>+--- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2016-12-09 05:04:31 UTC
>++++ third_party/WebKit/Source/core/layout/BUILD.gn
>+@@ -341,7 +341,7 @@ blink_core_sources("layout") {
>      sources += [ "LayoutThemeFontProviderDefault.cpp" ]
>    }
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2016-12-13 00:43:16 UTC
>+--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/FontCache.cpp
> @@ -61,9 +61,9 @@ using namespace WTF;
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2016-12-13 00:42:58 UTC
>+--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/FontCache.h
> @@ -217,7 +217,7 @@ class PLATFORM_EXPORT FontCache {
>                                     const FontFaceCreationParams&,
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2016-12-13 00:46:20 UTC
>+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
> @@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const
>        m_syntheticBold(source.m_syntheticBold),
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2016-12-13 00:46:30 UTC
>+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h
> @@ -47,9 +47,9 @@
>  #include "wtf/text/CString.h"
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig	2016-12-13 00:50:37 UTC
>+--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
> @@ -51,7 +51,7 @@ namespace blink {
>  const float smallCapsFontSizeMultiplier = 0.7f;
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-12-13 00:51:35 UTC
>+--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
> @@ -63,7 +63,7 @@ static sk_sp<SkTypeface> typefaceForFont
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig	2016-04-08 16:02:13 UTC
>+--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/heap/GCInfo.cpp
> @@ -7,6 +7,8 @@
>  #include "platform/heap/Handle.h"
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2016-05-11 19:02:33 UTC
>+--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
> @@ -6,6 +6,8 @@
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig	2016-12-13 00:53:03 UTC
>+--- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
> @@ -28,6 +28,9 @@
>  #include "wtf/StdLibExtras.h"
>Index: www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2016-12-13 00:40:36 UTC
>+--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp
> @@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex
>          m_isInGroup(false),
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-12-13 00:15:09 UTC
>+--- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/wtf/Assertions.cpp
> @@ -60,7 +60,7 @@
>  #include <windows.h>
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/wtf/Atomics.h.orig	2016-12-13 00:13:22 UTC
>+--- third_party/WebKit/Source/wtf/Atomics.h.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/wtf/Atomics.h
> @@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in
>  #if defined(THREAD_SANITIZER)
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/WebKit/Source/wtf/BUILD.gn.orig	2016-12-14 18:31:06.308889000 +0000
>-+++ third_party/WebKit/Source/wtf/BUILD.gn	2016-12-14 18:32:07.771435000 +0000
>-@@ -286,6 +286,10 @@
>+--- third_party/WebKit/Source/wtf/BUILD.gn.orig	2016-12-09 05:04:32 UTC
>++++ third_party/WebKit/Source/wtf/BUILD.gn
>+@@ -286,6 +286,10 @@ component("wtf") {
>      libs = [ "dl" ]
>    }
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2016-12-13 00:09:55 UTC
>+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/wtf/ByteSwap.h
> @@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t 
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig	2016-12-13 00:24:56 UTC
>+--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/wtf/ContainerAnnotations.h
> @@ -10,7 +10,7 @@
>  
>Index: www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2016-12-13 00:19:49 UTC
>+--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2016-12-09 05:04:32 UTC
> +++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp
> @@ -49,11 +49,15 @@
>  #include <objc/objc-auto.h>
>Index: www/chromium/files/patch-third__party_angle_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_angle_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_angle_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/angle/BUILD.gn.orig	2016-10-06 04:04:51.000000000 +0300
>-+++ third_party/angle/BUILD.gn	2016-10-31 01:36:29.431524000 +0200
>-@@ -15,6 +15,12 @@
>+--- third_party/angle/BUILD.gn.orig	2016-12-09 05:05:03 UTC
>++++ third_party/angle/BUILD.gn
>+@@ -16,6 +16,12 @@ if (ozone_platform_gbm) {
>    }
>  }
>  
>@@ -13,7 +13,7 @@
>  angle_git_is_present = exec_script("src/commit_id.py",
>                                     [
>                                       "check",
>-@@ -350,11 +356,7 @@
>+@@ -381,11 +387,7 @@ static_library("libANGLE") {
>      if (use_x11) {
>        sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
>        deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
>@@ -26,7 +26,7 @@
>      }
>      if (is_mac) {
>        sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
>-@@ -492,7 +494,7 @@
>+@@ -527,7 +529,7 @@ util_gypi = exec_script("//build/gypi_to
>  
>  config("angle_util_config") {
>    include_dirs = [ "util" ]
>Index: www/chromium/files/patch-third__party_angle_build_angle__common.gni
>===================================================================
>--- www/chromium/files/patch-third__party_angle_build_angle__common.gni	(revision 432254)
>+++ www/chromium/files/patch-third__party_angle_build_angle__common.gni	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/angle/build/angle_common.gni.orig	2016-10-06 04:04:51.000000000 +0300
>-+++ third_party/angle/build/angle_common.gni	2016-10-13 08:24:01.038996000 +0300
>-@@ -18,6 +18,8 @@
>+--- third_party/angle/build/angle_common.gni.orig	2016-12-09 05:05:03 UTC
>++++ third_party/angle/build/angle_common.gni
>+@@ -19,6 +19,8 @@ if (is_win) {
>    import("//build/config/win/visual_studio_version.gni")
>  } else if (is_linux && use_x11 && !is_chromeos) {
>    angle_enable_gl = true
>Index: www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/angle/src/tests/BUILD.gn.orig	2016-10-06 04:04:51.000000000 +0300
>-+++ third_party/angle/src/tests/BUILD.gn	2016-10-13 10:42:09.229978000 +0300
>-@@ -41,7 +41,7 @@
>+--- third_party/angle/src/tests/BUILD.gn.orig	2016-12-09 05:05:03 UTC
>++++ third_party/angle/src/tests/BUILD.gn
>+@@ -41,7 +41,7 @@ test("angle_unittests") {
>    ]
>  }
>  
>@@ -9,7 +9,7 @@
>    end2end_gypi = exec_script("//build/gypi_to_gn.py",
>                               [
>                                 rebase_path("angle_end2end_tests.gypi"),
>-@@ -82,7 +82,7 @@
>+@@ -82,7 +82,7 @@ if (is_win || is_linux || is_mac || is_a
>        "//third_party/angle:libANGLE_config",
>      ]
>  
>@@ -18,7 +18,7 @@
>        # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
>        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
>      }
>-@@ -175,7 +175,7 @@
>+@@ -175,7 +175,7 @@ if (build_angle_deqp_tests) {
>      # Ask the system headers to expose all the regular function otherwise
>      # dEQP doesn't compile and produces warnings about implicitly defined
>      # functions.
>@@ -27,7 +27,7 @@
>        # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
>        defines += [ "_GNU_SOURCE" ]
>      }
>-@@ -198,7 +198,7 @@
>+@@ -198,7 +198,7 @@ if (build_angle_deqp_tests) {
>      ]
>    }
>  
>@@ -36,7 +36,7 @@
>      deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
>    }
>  
>-@@ -234,7 +234,7 @@
>+@@ -234,7 +234,7 @@ if (build_angle_deqp_tests) {
>      if (is_win) {
>        sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
>      }
>@@ -45,7 +45,7 @@
>        sources +=
>            rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
>      }
>-@@ -262,7 +262,7 @@
>+@@ -262,7 +262,7 @@ if (build_angle_deqp_tests) {
>  
>      # Taken from gpu/BUILD.gn
>      # TODO(jmadill): this should be in a shared location
>@@ -54,7 +54,7 @@
>        libs = [ "pci" ]
>      }
>    }
>-@@ -334,7 +334,7 @@
>+@@ -335,7 +335,7 @@ if (build_angle_deqp_tests) {
>          "../../../deqp/src/data/",
>        ]
>  
>Index: www/chromium/files/patch-third__party_boringssl_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_boringssl_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_boringssl_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/boringssl/BUILD.gn.orig	2016-08-03 22:02:37.000000000 +0300
>-+++ third_party/boringssl/BUILD.gn	2016-09-03 01:48:31.761556000 +0300
>-@@ -83,7 +83,7 @@
>+--- third_party/boringssl/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/boringssl/BUILD.gn
>+@@ -88,7 +88,7 @@ if (is_win && !is_msan) {
>      } else if (current_cpu == "x64") {
>        if (is_mac) {
>          sources += crypto_sources_mac_x86_64
>@@ -9,7 +9,7 @@
>          sources += crypto_sources_linux_x86_64
>        } else {
>          public_configs = [ ":no_asm_config" ]
>-@@ -91,14 +91,14 @@
>+@@ -96,14 +96,14 @@ if (is_win && !is_msan) {
>      } else if (current_cpu == "x86") {
>        if (is_mac) {
>          sources += crypto_sources_mac_x86
>@@ -25,5 +25,5 @@
> -    } else if (current_cpu == "arm64" && (is_linux || is_android)) {
> +    } else if (current_cpu == "arm64" && (is_linux || is_bsd || is_android)) {
>        sources += crypto_sources_linux_aarch64
>- 
>-       # TODO(davidben): Remove explicit arch flag once https://crbug.com/576858
>+     } else {
>+       public_configs = [ ":no_asm_config" ]
>Index: www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c
>===================================================================
>--- www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c	(revision 432254)
>+++ www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/boringssl/src/crypto/ex_data.c.orig	2016-08-03 22:03:20.000000000 +0300
>-+++ third_party/boringssl/src/crypto/ex_data.c	2016-09-17 04:02:25.959140000 +0300
>-@@ -188,7 +188,9 @@
>+--- third_party/boringssl/src/crypto/ex_data.c.orig	2016-12-09 05:05:03 UTC
>++++ third_party/boringssl/src/crypto/ex_data.c
>+@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a
>      }
>    }
>  
>Index: www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h
>===================================================================
>--- www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig	2016-05-20 23:45:41 UTC
>+--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig	2016-12-09 05:04:33 UTC
> +++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
> @@ -334,6 +334,8 @@ class Status {
>       */
>Index: www/chromium/files/patch-third__party_expat_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_expat_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_expat_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/expat/BUILD.gn.orig	2016-10-06 04:02:41.000000000 +0300
>-+++ third_party/expat/BUILD.gn	2016-10-13 08:30:21.841353000 +0300
>-@@ -9,7 +9,7 @@
>+--- third_party/expat/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/expat/BUILD.gn
>+@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test.
>  # let's not pull it in twice.
>  # Chromecast doesn't ship expat as a system library.
>  # Libfuzzer and AFL need to build library from sources.
>Index: www/chromium/files/patch-third__party_ffmpeg_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_ffmpeg_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_ffmpeg_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/ffmpeg/BUILD.gn.orig	2016-08-03 22:03:29.000000000 +0300
>-+++ third_party/ffmpeg/BUILD.gn	2016-10-10 14:53:20.790578000 +0300
>-@@ -6,8 +6,13 @@
>+--- third_party/ffmpeg/BUILD.gn.orig	2016-12-09 05:05:04 UTC
>++++ third_party/ffmpeg/BUILD.gn
>+@@ -6,8 +6,13 @@ import("ffmpeg_options.gni")
>  import("ffmpeg_generated.gni")
>  
>  # Path to platform configuration files.
>Index: www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
>===================================================================
>--- www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni	(revision 432254)
>+++ www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/ffmpeg/ffmpeg_generated.gni.orig	2016-05-11 19:03:23 UTC
>+--- third_party/ffmpeg/ffmpeg_generated.gni.orig	2016-12-09 05:05:04 UTC
> +++ third_party/ffmpeg/ffmpeg_generated.gni
> @@ -12,7 +12,7 @@ ffmpeg_c_sources = []
>  ffmpeg_gas_sources = []
>@@ -9,7 +9,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/allcodecs.c",
>      "libavcodec/autorename_libavcodec_utils.c",
>-@@ -144,7 +144,7 @@ if ((is_android && current_cpu == "arm" 
>+@@ -146,7 +146,7 @@ if ((is_android && current_cpu == "arm" 
>    ]
>  }
>  
>@@ -18,7 +18,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/h264pred.c",
>      "libavcodec/hpeldsp.c",
>-@@ -159,13 +159,13 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -161,13 +161,13 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -34,7 +34,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/aac_ac3_parser.c",
>      "libavcodec/aac_parser.c",
>-@@ -207,7 +207,7 @@ if ((is_android && current_cpu == "arm" 
>+@@ -209,7 +209,7 @@ if ((is_android && current_cpu == "arm" 
>    ]
>  }
>  
>@@ -43,7 +43,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
>      "libavcodec/x86/constants.c",
>-@@ -218,7 +218,7 @@ if ((is_android && current_cpu == "x64" 
>+@@ -221,7 +221,7 @@ if ((is_android && current_cpu == "x64" 
>    ]
>  }
>  
>@@ -52,7 +52,7 @@
>    ffmpeg_yasm_sources += [
>      "libavcodec/x86/fft.asm",
>      "libavcodec/x86/vorbisdsp.asm",
>-@@ -228,7 +228,7 @@ if ((is_android && current_cpu == "x64" 
>+@@ -232,7 +232,7 @@ if ((is_android && current_cpu == "x64" 
>    ]
>  }
>  
>@@ -61,7 +61,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/cabac.c",
>      "libavcodec/h264.c",
>-@@ -251,7 +251,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -255,7 +255,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -70,7 +70,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/fft_fixed_init_arm.c",
>      "libavcodec/arm/fft_init_arm.c",
>-@@ -267,7 +267,7 @@ if ((is_android && current_cpu == "arm" 
>+@@ -271,7 +271,7 @@ if ((is_android && current_cpu == "arm" 
>    ]
>  }
>  
>@@ -79,7 +79,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/flac.c",
>      "libavcodec/flac_parser.c",
>-@@ -278,7 +278,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -282,7 +282,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -88,7 +88,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/h264pred_init_arm.c",
>      "libavcodec/arm/hpeldsp_init_arm.c",
>-@@ -298,7 +298,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -302,7 +302,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -97,7 +97,7 @@
>    ffmpeg_c_sources += [
>      "libavutil/arm/float_dsp_init_neon.c",
>    ]
>-@@ -313,7 +313,7 @@ if ((is_android && current_cpu == "arm" 
>+@@ -317,7 +317,7 @@ if ((is_android && current_cpu == "arm" 
>    ]
>  }
>  
>@@ -106,7 +106,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
>      "libavcodec/x86/h264_intrapred_init.c",
>-@@ -333,13 +333,13 @@ if ((is_linux && current_cpu == "x64" &&
>+@@ -337,13 +337,13 @@ if ((is_linux && current_cpu == "x64" &&
>    ]
>  }
>  
>@@ -122,7 +122,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/aacpsdsp_init.c",
>      "libavcodec/x86/dct_init.c",
>-@@ -348,7 +348,7 @@ if ((is_android && current_cpu == "x64" 
>+@@ -352,7 +352,7 @@ if ((is_android && current_cpu == "x64" 
>    ]
>  }
>  
>@@ -131,7 +131,7 @@
>    ffmpeg_yasm_sources += [
>      "libavcodec/x86/aacpsdsp.asm",
>      "libavcodec/x86/dct32.asm",
>-@@ -357,7 +357,7 @@ if ((is_android && current_cpu == "x64" 
>+@@ -361,7 +361,7 @@ if ((is_android && current_cpu == "x64" 
>    ]
>  }
>  
>@@ -140,7 +140,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/aacpsdsp_init_arm.c",
>      "libavcodec/arm/mpegaudiodsp_init_arm.c",
>-@@ -368,7 +368,7 @@ if ((is_android && current_cpu == "arm" 
>+@@ -372,7 +372,7 @@ if ((is_android && current_cpu == "arm" 
>    ]
>  }
>  
>@@ -149,7 +149,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/acelp_filters.c",
>      "libavcodec/acelp_pitch_delay.c",
>-@@ -423,7 +423,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -427,7 +427,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -158,7 +158,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/mips/h264pred_init_mips.c",
>      "libavcodec/mips/hpeldsp_init_mips.c",
>-@@ -431,7 +431,7 @@ if ((is_linux && current_cpu == "mipsel"
>+@@ -435,7 +435,7 @@ if ((is_linux && current_cpu == "mipsel"
>    ]
>  }
>  
>@@ -167,7 +167,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/aarch64/fft_init_aarch64.c",
>      "libavcodec/aarch64/vorbisdsp_init.c",
>-@@ -446,7 +446,7 @@ if ((is_android && current_cpu == "arm64
>+@@ -450,7 +450,7 @@ if ((is_android && current_cpu == "arm64
>    ]
>  }
>  
>@@ -176,7 +176,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/aarch64/h264pred_init.c",
>      "libavcodec/aarch64/hpeldsp_init_aarch64.c",
>-@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm64" 
>+@@ -463,7 +463,7 @@ if ((is_linux && current_cpu == "arm64" 
>    ]
>  }
>  
>@@ -185,7 +185,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/flacdsp_init_arm.c",
>    ]
>-@@ -468,7 +468,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -472,7 +472,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -194,7 +194,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/h264chroma_init_arm.c",
>      "libavcodec/arm/h264dsp_init_arm.c",
>-@@ -479,7 +479,7 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -483,7 +483,7 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -203,7 +203,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/hpeldsp_init_neon.c",
>      "libavcodec/arm/vp8dsp_init_neon.c",
>-@@ -492,14 +492,14 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -496,14 +496,14 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -220,7 +220,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/h264_qpel.c",
>      "libavcodec/x86/h264chroma_init.c",
>-@@ -520,7 +520,7 @@ if ((is_linux && current_cpu == "x64" &&
>+@@ -524,7 +524,7 @@ if ((is_linux && current_cpu == "x64" &&
>    ]
>  }
>  
>@@ -229,7 +229,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/mips/aacdec_mips.c",
>      "libavcodec/mips/aacpsdsp_mips.c",
>-@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "mips6
>+@@ -533,7 +533,7 @@ if ((is_android && current_cpu == "mips6
>    ]
>  }
>  
>@@ -238,7 +238,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/flacdsp_init.c",
>    ]
>-@@ -544,7 +544,7 @@ if ((is_win && current_cpu == "x64" && f
>+@@ -548,7 +548,7 @@ if ((is_win && current_cpu == "x64" && f
>    ]
>  }
>  
>@@ -247,7 +247,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/mips/h264chroma_init_mips.c",
>      "libavcodec/mips/h264dsp_init_mips.c",
>-@@ -552,7 +552,7 @@ if ((is_linux && current_cpu == "mipsel"
>+@@ -556,7 +556,7 @@ if ((is_linux && current_cpu == "mipsel"
>    ]
>  }
>  
>@@ -256,7 +256,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/aarch64/imdct15_init.c",
>      "libavcodec/aarch64/mpegaudiodsp_init.c",
>-@@ -563,7 +563,7 @@ if ((is_android && current_cpu == "arm64
>+@@ -567,7 +567,7 @@ if ((is_android && current_cpu == "arm64
>    ]
>  }
>  
>@@ -265,7 +265,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/aarch64/h264chroma_init_aarch64.c",
>      "libavcodec/aarch64/h264dsp_init_aarch64.c",
>-@@ -577,7 +577,7 @@ if ((is_linux && current_cpu == "arm64" 
>+@@ -581,7 +581,7 @@ if ((is_linux && current_cpu == "arm64" 
>    ]
>  }
>  
>@@ -274,7 +274,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/arm/blockdsp_init_arm.c",
>      "libavcodec/arm/idctdsp_init_arm.c",
>-@@ -601,13 +601,13 @@ if ((is_linux && current_cpu == "arm" &&
>+@@ -605,13 +605,13 @@ if ((is_linux && current_cpu == "arm" &&
>    ]
>  }
>  
>@@ -290,7 +290,7 @@
>    ffmpeg_gas_sources += [
>      "libavcodec/arm/h264cmc_neon.S",
>      "libavcodec/arm/h264dsp_neon.S",
>-@@ -622,7 +622,7 @@ if ((is_win && current_cpu == "x64" && f
>+@@ -626,7 +626,7 @@ if ((is_win && current_cpu == "x64" && f
>    ]
>  }
>  
>@@ -299,7 +299,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/x86/blockdsp_init.c",
>      "libavcodec/x86/fdct.c",
>-@@ -649,7 +649,7 @@ if ((is_linux && current_cpu == "x64" &&
>+@@ -653,7 +653,7 @@ if ((is_linux && current_cpu == "x64" &&
>    ]
>  }
>  
>@@ -308,7 +308,7 @@
>    ffmpeg_c_sources += [
>      "libavcodec/mips/blockdsp_init_mips.c",
>      "libavcodec/mips/h263dsp_init_mips.c",
>-@@ -662,7 +662,7 @@ if (is_linux && current_cpu == "mipsel" 
>+@@ -666,7 +666,7 @@ if (is_linux && current_cpu == "mipsel" 
>    ]
>  }
>  
>Index: www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
>===================================================================
>--- www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c	(revision 432254)
>+++ www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/ffmpeg/libavutil/mem.c.orig	2016-08-03 22:03:29.000000000 +0300
>-+++ third_party/ffmpeg/libavutil/mem.c	2016-10-11 02:40:34.765488000 +0300
>+--- third_party/ffmpeg/libavutil/mem.c.orig	2016-12-09 05:05:05 UTC
>++++ third_party/ffmpeg/libavutil/mem.c
> @@ -32,9 +32,6 @@
>  #include <stdint.h>
>  #include <stdlib.h>
>Index: www/chromium/files/patch-third__party_fontconfig_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_fontconfig_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_fontconfig_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/fontconfig/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/fontconfig/BUILD.gn	2016-09-03 01:45:52.485587000 +0300
>+--- third_party/fontconfig/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/fontconfig/BUILD.gn
> @@ -2,7 +2,7 @@
>  # Use of this source code is governed by a BSD-style license that can be
>  # found in the LICENSE file.
>Index: www/chromium/files/patch-third__party_freetype2_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_freetype2_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_freetype2_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/freetype2/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/freetype2/BUILD.gn	2016-09-03 01:41:52.625191000 +0300
>+--- third_party/freetype2/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/freetype2/BUILD.gn
> @@ -2,7 +2,7 @@
>  # Use of this source code is governed by a BSD-style license that can be
>  # found in the LICENSE file.
>Index: www/chromium/files/patch-third__party_glslang_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_glslang_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_glslang_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/glslang/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/glslang/BUILD.gn	2016-09-03 01:42:51.603010000 +0300
>-@@ -8,7 +8,7 @@
>+--- third_party/glslang/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/glslang/BUILD.gn
>+@@ -8,7 +8,7 @@ config("glslang_config") {
>    include_dirs = [ "src" ]
>  
>    defines = []
>@@ -9,7 +9,7 @@
>      defines += [ "GLSLANG_OSINCLUDE_UNIX" ]
>    } else if (is_win) {
>      defines += [ "GLSLANG_OSINCLUDE_WIN32" ]
>-@@ -132,7 +132,7 @@
>+@@ -132,7 +132,7 @@ static_library("glslang") {
>      "src/glslang/Public/ShaderLang.h",
>    ]
>  
>Index: www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/harfbuzz-ng/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/harfbuzz-ng/BUILD.gn	2016-09-03 01:51:35.889144000 +0300
>-@@ -48,7 +48,7 @@
>+--- third_party/harfbuzz-ng/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/harfbuzz-ng/BUILD.gn
>+@@ -50,7 +50,7 @@ if (use_system_harfbuzz) {
>  
>    # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this.
>    config("pangoft2_link_hack") {
>@@ -9,7 +9,7 @@
>          current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {
>        # These symbols are referenced from libpangoft2, which will be
>        # dynamically linked later.
>-@@ -186,7 +186,7 @@
>+@@ -193,7 +193,7 @@ if (use_system_harfbuzz) {
>      # in the tree, all symbols pango needs must be included, or
>      # pango uses mixed versions of harfbuzz and leads to crash.
>      # See crbug.com/462689.
>Index: www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
>===================================================================
>--- www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/leveldatabase/env_chromium.cc.orig	2016-10-06 04:02:41.000000000 +0300
>-+++ third_party/leveldatabase/env_chromium.cc	2016-10-13 08:33:43.174604000 +0300
>-@@ -23,7 +23,11 @@
>+--- third_party/leveldatabase/env_chromium.cc.orig	2016-12-09 05:04:33 UTC
>++++ third_party/leveldatabase/env_chromium.cc
>+@@ -24,7 +24,11 @@
>  #include "base/trace_event/trace_event.h"
>  #include "third_party/leveldatabase/chromium_logger.h"
>  #include "third_party/leveldatabase/src/include/leveldb/options.h"
>Index: www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
>===================================================================
>--- www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2016-05-27 10:38:59.514474000 -0400
>-+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h	2016-05-27 10:40:19.234261000 -0400
>+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2016-12-09 05:05:07 UTC
>++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
> @@ -23,6 +23,7 @@
>  // user of the library know that it can't be used in a thread-safe manner when
>  // it is not depending on Boost.
>Index: www/chromium/files/patch-third__party_libusb_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_libusb_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_libusb_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/libusb/BUILD.gn.orig	2016-10-06 04:02:41.000000000 +0300
>-+++ third_party/libusb/BUILD.gn	2016-10-13 08:47:17.152284000 +0300
>-@@ -6,8 +6,25 @@
>+--- third_party/libusb/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/libusb/BUILD.gn
>+@@ -6,8 +6,25 @@ assert(!is_android && !is_ios)
>  
>  import("//build/config/features.gni")
>  
>@@ -28,7 +28,7 @@
>  }
>  
>  config("libusb_warnings") {
>-@@ -21,118 +38,119 @@
>+@@ -21,118 +38,119 @@ config("libusb_warnings") {
>    }
>  }
>  
>@@ -67,32 +67,6 @@
> -  ]
> -  deps = []
> -  include_dirs = [ "src/libusb/os" ]
>--
>--  configs -= [ "//build/config/compiler:chromium_code" ]
>--  configs += [
>--    "//build/config/compiler:no_chromium_code",
>--
>--    # Must be after no_chromium_code for warning flags to be ordered correctly.
>--    ":libusb_warnings",
>--  ]
>--
>--  public_configs = [ ":libusb_config" ]
>--
>--  if (is_posix) {
>--    defines = [
>--      "DEFAULT_VISIBILITY=",
>--      "HAVE_GETTIMEOFDAY=1",
>--      "HAVE_POLL_H=1",
>--      "HAVE_SYS_TIME_H=1",
>--      "LIBUSB_DESCRIBE=\"1.0.16\"",
>--      "POLL_NFDS_TYPE=nfds_t",
>--      "THREADS_POSIX=1",
>--    ]
>--  }
>--
>--  if (is_mac) {
>--    defines += [
>--      "OS_DARWIN=1",
> +if (!use_system_libusb) {
> +  static_library("libusb") {
> +    sources = [
>@@ -129,17 +103,35 @@
> +      ]
> +        deps = []
> +        include_dirs = [ "src/libusb/os" ]
>-+
>+ 
>+-  configs -= [ "//build/config/compiler:chromium_code" ]
>+-  configs += [
>+-    "//build/config/compiler:no_chromium_code",
> +        configs -= [ "//build/config/compiler:chromium_code" ]
> +        configs += [
> +        "//build/config/compiler:no_chromium_code",
>-+
>+ 
>+-    # Must be after no_chromium_code for warning flags to be ordered correctly.
>+-    ":libusb_warnings",
>+-  ]
> +# Must be after no_chromium_code for warning flags to be ordered correctly.
> +      ":libusb_warnings",
> +        ]
>-+
>+ 
>+-  public_configs = [ ":libusb_config" ]
> +          public_configs = [ ":libusb_config" ]
>-+
>+ 
>+-  if (is_posix) {
>+-    defines = [
>+-      "DEFAULT_VISIBILITY=",
>+-      "HAVE_GETTIMEOFDAY=1",
>+-      "HAVE_POLL_H=1",
>+-      "HAVE_SYS_TIME_H=1",
>+-      "LIBUSB_DESCRIBE=\"1.0.16\"",
>+-      "POLL_NFDS_TYPE=nfds_t",
>+-      "THREADS_POSIX=1",
>+-    ]
>+-  }
> +          if (is_posix) {
> +            defines = [
> +              "DEFAULT_VISIBILITY=",
>@@ -151,7 +143,10 @@
> +            "THREADS_POSIX=1",
> +            ]
> +          }
>-+
>+ 
>+-  if (is_mac) {
>+-    defines += [
>+-      "OS_DARWIN=1",
> +    if (is_mac) {
> +      defines += [
> +        "OS_DARWIN=1",
>@@ -250,7 +245,7 @@
>        "src/libusb/os/poll_windows.h",
>        "src/libusb/os/threads_windows.c",
>        "src/libusb/os/threads_windows.h",
>-@@ -142,6 +160,7 @@
>+@@ -142,6 +160,7 @@ static_library("libusb") {
>        "src/msvc/config.h",
>        "src/msvc/inttypes.h",
>        "src/msvc/stdint.h",
>Index: www/chromium/files/patch-third__party_libxml_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_libxml_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_libxml_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/libxml/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/libxml/BUILD.gn	2016-09-02 23:25:19.267995000 +0300
>+--- third_party/libxml/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/libxml/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>  # Define an "os_include" variable that points at the OS-specific generated
>Index: www/chromium/files/patch-third__party_libxslt_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_libxslt_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_libxslt_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/libxslt/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/libxslt/BUILD.gn	2016-09-03 01:40:07.403577000 +0300
>-@@ -82,7 +82,7 @@
>+--- third_party/libxslt/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/libxslt/BUILD.gn
>+@@ -82,7 +82,7 @@ static_library("libxslt") {
>    public_configs = [ ":libxslt_config" ]
>  
>    cflags = []
>Index: www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
>===================================================================
>--- www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/libyuv/include/libyuv/row.h.orig	2016-06-16 21:03:47.000000000 +0200
>-+++ third_party/libyuv/include/libyuv/row.h	2016-06-26 15:14:58.000000000 +0200
>-@@ -160,10 +160,14 @@
>+--- third_party/libyuv/include/libyuv/row.h.orig	2016-12-09 05:05:08 UTC
>++++ third_party/libyuv/include/libyuv/row.h
>+@@ -161,10 +161,14 @@ extern "C" {
>  #define HAS_ARGBSHADEROW_SSE2
>  #define HAS_ARGBSUBTRACTROW_SSE2
>  #define HAS_ARGBUNATTENUATEROW_SSE2
>@@ -15,7 +15,7 @@
>  #define HAS_RGBCOLORTABLEROW_X86
>  #define HAS_SOBELROW_SSE2
>  #define HAS_SOBELTOPLANEROW_SSE2
>-@@ -173,8 +177,7 @@
>+@@ -174,8 +178,7 @@ extern "C" {
>  
>  // The following functions fail on gcc/clang 32 bit with fpic and framepointer.
>  // caveat: clangcl uses row_win.cc which works.
>@@ -25,7 +25,7 @@
>  // TODO(fbarchard): fix build error on x86 debug
>  // https://code.google.com/p/libyuv/issues/detail?id=524
>  #define HAS_I411TOARGBROW_SSSE3
>-@@ -202,7 +205,7 @@
>+@@ -203,7 +206,7 @@ extern "C" {
>  #define HAS_COPYROW_AVX
>  #define HAS_H422TOARGBROW_AVX2
>  #define HAS_I400TOARGBROW_AVX2
>@@ -34,7 +34,7 @@
>  // TODO(fbarchard): fix build error on android_full_debug=1
>  // https://code.google.com/p/libyuv/issues/detail?id=517
>  #define HAS_I422ALPHATOARGBROW_AVX2
>-@@ -215,7 +218,9 @@
>+@@ -216,7 +219,9 @@ extern "C" {
>  #define HAS_I422TORGB565ROW_AVX2
>  #define HAS_I422TORGBAROW_AVX2
>  #define HAS_I444TOARGBROW_AVX2
>@@ -44,7 +44,7 @@
>  #define HAS_J422TOARGBROW_AVX2
>  #define HAS_MERGEUVROW_AVX2
>  #define HAS_MIRRORROW_AVX2
>-@@ -238,8 +243,10 @@
>+@@ -240,8 +245,10 @@ extern "C" {
>  #define HAS_ARGBMULTIPLYROW_AVX2
>  #define HAS_ARGBSUBTRACTROW_AVX2
>  #define HAS_ARGBUNATTENUATEROW_AVX2
>Index: www/chromium/files/patch-third__party_mesa_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_mesa_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_mesa_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/mesa/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/mesa/BUILD.gn	2016-09-25 07:24:36.558482000 +0300
>-@@ -88,6 +88,10 @@
>+--- third_party/mesa/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/mesa/BUILD.gn
>+@@ -90,6 +90,10 @@ config("mesa_internal_config") {
>      defines += [ "_GNU_SOURCE" ]
>    }
>  
>@@ -11,7 +11,7 @@
>    if (is_win) {
>      defines += [
>        # Generated files use const only if __cplusplus or __STDC__ is defined.
>-@@ -755,7 +759,8 @@
>+@@ -757,7 +761,8 @@ loadable_module("osmesa") {
>    ]
>  
>    # Required for the allocator implementation, which is not used on Mac.
>Index: www/chromium/files/patch-third__party_minigbm_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_minigbm_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_minigbm_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/minigbm/BUILD.gn.orig	2016-08-03 22:02:38.000000000 +0300
>-+++ third_party/minigbm/BUILD.gn	2016-09-03 01:40:26.605383000 +0300
>+--- third_party/minigbm/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/minigbm/BUILD.gn
> @@ -4,7 +4,7 @@
>  
>  import("//build/config/linux/pkg_config.gni")
>Index: www/chromium/files/patch-third__party_opus_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_opus_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_opus_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/opus/BUILD.gn.orig	2016-10-06 04:02:42.000000000 +0300
>-+++ third_party/opus/BUILD.gn	2016-10-13 08:49:39.874353000 +0300
>-@@ -14,7 +14,7 @@
>+--- third_party/opus/BUILD.gn.orig	2016-12-09 05:04:33 UTC
>++++ third_party/opus/BUILD.gn
>+@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu 
>  # If OPUS Run Time CPU Detections (RTCD) shall be used.
>  # Based on the conditions in celt/arm/armcpu.c:
>  # defined(_MSC_VER) || defined(__linux__).
>Index: www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h
>===================================================================
>--- www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/ots/include/opentype-sanitiser.h.orig	2016-03-25 13:05:02 UTC
>+--- third_party/ots/include/opentype-sanitiser.h.orig	2016-12-09 05:04:33 UTC
> +++ third_party/ots/include/opentype-sanitiser.h
> @@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t;
>  #else
>Index: www/chromium/files/patch-third__party_pdfium_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/pdfium/BUILD.gn.orig	2016-10-06 04:05:20.000000000 +0300
>-+++ third_party/pdfium/BUILD.gn	2016-10-13 08:51:40.306487000 +0300
>-@@ -40,7 +40,7 @@
>+--- third_party/pdfium/BUILD.gn.orig	2016-12-09 05:05:09 UTC
>++++ third_party/pdfium/BUILD.gn
>+@@ -40,7 +40,7 @@ config("pdfium_core_config") {
>    cflags = []
>    configs = [ ":pdfium_common_config" ]
>    defines = [ "V8_DEPRECATION_WARNINGS" ]
>Index: www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/pdfium/core/fxcrt/fx_system.h.orig	2016-12-13 00:26:52 UTC
>+--- third_party/pdfium/core/fxcrt/fx_system.h.orig	2016-12-09 05:05:09 UTC
> +++ third_party/pdfium/core/fxcrt/fx_system.h
> @@ -40,7 +40,7 @@
>  #elif defined(_WIN64)
>Index: www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2016-05-27 13:33:48.718479000 -0400
>-+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp	2016-05-27 13:43:12.171286000 -0400
>-@@ -590,11 +590,12 @@
>+--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2016-12-09 05:05:09 UTC
>++++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp
>+@@ -458,11 +458,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C
>  }
>  
>  double _getLocalTZA() {
>@@ -14,7 +14,7 @@
>  #if _MSC_VER >= 1900
>    // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
>    // variable declared in time.h. That variable was deprecated and in VS 2015
>-@@ -602,7 +603,11 @@
>+@@ -470,7 +471,11 @@ double _getLocalTZA() {
>    long timezone = 0;
>    _get_timezone(&timezone);
>  #endif
>Index: www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp	(working copy)
>@@ -1,9 +1,9 @@
>---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2016-07-20 22:04:51.000000000 +0300
>-+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp	2016-08-01 18:53:01.768097000 +0300
>-@@ -62,6 +62,103 @@
>+--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2016-12-09 05:05:09 UTC
>++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp
>+@@ -65,6 +65,103 @@ const FX_WCHAR* const fullmonths[] = {L"
>                                        L"July",    L"August",   L"September",
>                                        L"October", L"November", L"December"};
>-
>+ 
> +#if defined(__FreeBSD__)
> +/*
> + * cvt.c - IEEE floating point formatting routines for FreeBSD
>Index: www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_skia_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/pdfium/skia/BUILD.gn.orig	2016-10-06 04:05:20.000000000 +0300
>-+++ third_party/pdfium/skia/BUILD.gn	2016-10-13 08:54:45.371706000 +0300
>-@@ -180,7 +180,7 @@
>+--- third_party/pdfium/skia/BUILD.gn.orig	2016-12-09 05:05:09 UTC
>++++ third_party/pdfium/skia/BUILD.gn
>+@@ -101,7 +101,7 @@ config("skia_library_config") {
>    }
>  
>    # Settings for text blitting, chosen to approximate the system browser.
>@@ -9,7 +9,7 @@
>      defines += [
>        "SK_GAMMA_EXPONENT=1.2",
>        "SK_GAMMA_CONTRAST=0.2",
>-@@ -329,7 +329,7 @@
>+@@ -278,7 +278,7 @@ component("skia") {
>        "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
>      ]
>    }
>@@ -18,7 +18,7 @@
>      sources -= [
>        "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
>        "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
>-@@ -358,7 +358,7 @@
>+@@ -307,7 +307,7 @@ component("skia") {
>      "../third_party:fx_zlib",
>    ]
>  
>Index: www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h
>===================================================================
>--- www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/pdfium/third_party/base/logging.h.orig	2016-05-25 15:02:25.000000000 -0400
>-+++ third_party/pdfium/third_party/base/logging.h	2016-05-27 11:35:39.166720000 -0400
>+--- third_party/pdfium/third_party/base/logging.h.orig	2016-12-09 05:05:09 UTC
>++++ third_party/pdfium/third_party/base/logging.h
> @@ -10,7 +10,7 @@
>  
>  #ifndef _WIN32
>Index: www/chromium/files/patch-third__party_sqlite_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_sqlite_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_sqlite_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/sqlite/BUILD.gn.orig	2016-10-06 04:02:42.000000000 +0300
>-+++ third_party/sqlite/BUILD.gn	2016-10-30 23:32:40.983715000 +0200
>-@@ -20,7 +20,7 @@
>+--- third_party/sqlite/BUILD.gn.orig	2016-12-09 05:04:34 UTC
>++++ third_party/sqlite/BUILD.gn
>+@@ -20,7 +20,7 @@ if (!use_system_sqlite) {
>        # sqlite3Fts3InitTok).
>        cflags += [ "-Wno-unused-function" ]
>      }
>@@ -9,7 +9,7 @@
>        cflags += [
>          # SQLite doesn"t believe in compiler warnings,
>          # preferring testing.
>-@@ -177,7 +177,7 @@
>+@@ -177,7 +177,7 @@ if (!use_system_sqlite) {
>      public_configs = [ ":sqlite_export" ]
>    }
>  
>@@ -18,7 +18,7 @@
>      executable("sqlite_shell") {
>        # So shell.c can find the correct sqlite3.h.
>        include_dirs = [ "amalgamation" ]
>-@@ -206,7 +206,7 @@
>+@@ -206,7 +206,7 @@ if (use_system_sqlite) {
>  
>    config("sqlite_config") {
>      defines = [ "USE_SYSTEM_SQLITE" ]
>@@ -27,7 +27,7 @@
>        libs = [ "sqlite3" ]
>      } else {
>        assert(false, "extra flags to use system sqlite3 library missing")
>-@@ -225,7 +225,7 @@
>+@@ -225,7 +225,7 @@ if (use_system_sqlite) {
>      }
>    }
>  
>Index: www/chromium/files/patch-third__party_usrsctp_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_usrsctp_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_usrsctp_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/usrsctp/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ third_party/usrsctp/BUILD.gn	2016-09-20 02:42:29.328962000 +0300
>-@@ -112,6 +112,12 @@
>+--- third_party/usrsctp/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ third_party/usrsctp/BUILD.gn
>+@@ -112,6 +112,12 @@ static_library("usrsctp") {
>        "__Userspace_os_Linux",
>        "_GNU_SOURCE",
>      ]
>Index: www/chromium/files/patch-third__party_webrtc_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/BUILD.gn.orig	2016-10-06 04:05:35.000000000 +0300
>-+++ third_party/webrtc/BUILD.gn	2016-10-14 17:24:44.301409000 +0300
>-@@ -60,6 +60,9 @@
>+--- third_party/webrtc/BUILD.gn.orig	2016-12-09 05:05:12 UTC
>++++ third_party/webrtc/BUILD.gn
>+@@ -60,6 +60,9 @@ config("common_inherited_config") {
>    if (is_linux) {
>      defines += [ "WEBRTC_LINUX" ]
>    }
>Index: www/chromium/files/patch-third__party_webrtc_base_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/base/BUILD.gn.orig	2016-08-03 22:04:03.000000000 +0300
>-+++ third_party/webrtc/base/BUILD.gn	2016-09-25 15:11:54.051352000 +0300
>-@@ -525,7 +525,6 @@
>+--- third_party/webrtc/base/BUILD.gn.orig	2016-12-09 05:05:12 UTC
>++++ third_party/webrtc/base/BUILD.gn
>+@@ -580,7 +580,6 @@ rtc_static_library("rtc_base") {
>        "x11windowpicker.h",
>      ]
>      libs += [
>Index: www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/httpcommon.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/httpcommon.cc.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/httpcommon.cc
> @@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string
>      gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
>Index: www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/ifaddrs_converter.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/ifaddrs_converter.h.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/ifaddrs_converter.h
> @@ -14,6 +14,8 @@
>  #if defined(WEBRTC_ANDROID)
>Index: www/chromium/files/patch-third__party_webrtc_base_ipaddress.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_ipaddress.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_ipaddress.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/ipaddress.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/ipaddress.h.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/ipaddress.h
> @@ -17,6 +17,10 @@
>  #include <arpa/inet.h>
>Index: www/chromium/files/patch-third__party_webrtc_base_linux.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_linux.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_linux.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/linux.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/linux.cc.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/linux.cc
> @@ -8,7 +8,7 @@
>   *  be found in the AUTHORS file in the root of the source tree.
>Index: www/chromium/files/patch-third__party_webrtc_base_linux.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_linux.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_linux.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/linux.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/linux.h.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/linux.h
> @@ -11,7 +11,7 @@
>  #ifndef WEBRTC_BASE_LINUX_H_
>@@ -8,7 +8,7 @@
> +#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
>  #include <string>
>  #include <map>
>- #include <vector>
>+ #include <memory>
> @@ -114,5 +114,5 @@ int ReadCpuMaxFreq();
>  
>  }  // namespace rtc
>Index: www/chromium/files/patch-third__party_webrtc_base_network.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_network.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_network.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/base/network.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/network.cc.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/network.cc
>-@@ -18,7 +18,7 @@
>+@@ -14,7 +14,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
>  // linux instead of the standard posix one.
>@@ -9,7 +9,7 @@
>  #include <linux/if.h>
>  #include <linux/route.h>
>  #elif !defined(__native_client__)
>-@@ -634,7 +634,7 @@ bool BasicNetworkManager::CreateNetworks
>+@@ -656,7 +656,7 @@ bool BasicNetworkManager::CreateNetworks
>  }
>  #endif  // WEBRTC_WIN
>  
>@@ -18,7 +18,7 @@
>  bool IsDefaultRoute(const std::string& network_name) {
>    FileStream fs;
>    if (!fs.Open("/proc/net/route", "r", NULL)) {
>-@@ -677,7 +677,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
>+@@ -699,7 +699,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
>        strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
>      return true;
>    }
>Index: www/chromium/files/patch-third__party_webrtc_base_network.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_network.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_network.h	(working copy)
>@@ -1,7 +1,7 @@
>---- third_party/webrtc/base/network.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/network.h.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/network.h
> @@ -23,6 +23,10 @@
>- #include "webrtc/base/scoped_ptr.h"
>+ #include "webrtc/base/messagehandler.h"
>  #include "webrtc/base/sigslot.h"
>  
> +#if defined(WEBRTC_BSD)
>Index: www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/base/physicalsocketserver.cc.orig	2016-10-06 04:05:35.000000000 +0300
>-+++ third_party/webrtc/base/physicalsocketserver.cc	2016-10-13 12:57:59.467761000 +0300
>-@@ -63,7 +63,11 @@
>+--- third_party/webrtc/base/physicalsocketserver.cc.orig	2016-12-09 05:05:12 UTC
>++++ third_party/webrtc/base/physicalsocketserver.cc
>+@@ -61,7 +61,11 @@ typedef void* SockOptArg;
>  
>  int64_t GetSocketRecvTimestamp(int socket) {
>    struct timeval tv_ioctl;
>@@ -12,7 +12,7 @@
>    if (ret != 0)
>      return -1;
>    int64_t timestamp =
>-@@ -276,7 +280,7 @@
>+@@ -274,7 +278,7 @@ int PhysicalSocket::GetOption(Option opt
>    socklen_t optlen = sizeof(*value);
>    int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
>    if (ret != -1 && opt == OPT_DONTFRAGMENT) {
>@@ -21,7 +21,7 @@
>      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
>  #endif
>    }
>-@@ -289,7 +293,7 @@
>+@@ -287,7 +291,7 @@ int PhysicalSocket::SetOption(Option opt
>    if (TranslateOption(opt, &slevel, &sopt) == -1)
>      return -1;
>    if (opt == OPT_DONTFRAGMENT) {
>@@ -30,7 +30,7 @@
>      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
>  #endif
>    }
>-@@ -571,10 +575,10 @@
>+@@ -569,10 +573,10 @@ int PhysicalSocket::TranslateOption(Opti
>        *slevel = IPPROTO_IP;
>        *sopt = IP_DONTFRAGMENT;
>        break;
>Index: www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/platform_thread.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/platform_thread.cc.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/platform_thread.cc
> @@ -12,11 +12,18 @@
>  
>Index: www/chromium/files/patch-third__party_webrtc_base_stringutils.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_stringutils.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_stringutils.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/stringutils.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/stringutils.h.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/stringutils.h
> @@ -23,11 +23,11 @@
>  #endif  // WEBRTC_WIN 
>Index: www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/base/systeminfo.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/base/systeminfo.cc.orig	2016-12-09 05:05:12 UTC
> +++ third_party/webrtc/base/systeminfo.cc
> @@ -20,8 +20,12 @@
>  #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
>Index: www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2016-10-06 04:05:36.000000000 +0300
>-+++ third_party/webrtc/modules/audio_device/BUILD.gn	2016-10-17 00:53:40.915668000 +0300
>-@@ -52,7 +52,7 @@
>+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2016-12-09 05:05:12 UTC
>++++ third_party/webrtc/modules/audio_device/BUILD.gn
>+@@ -77,7 +77,7 @@ rtc_static_library("audio_device") {
>    ]
>  
>    include_dirs = []
>@@ -9,7 +9,7 @@
>      include_dirs += [ "linux" ]
>    }
>    if (is_ios) {
>-@@ -98,7 +98,7 @@
>+@@ -125,7 +125,7 @@ rtc_static_library("audio_device") {
>      if (rtc_use_dummy_audio_file_devices) {
>        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
>      } else {
>Index: www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc	(working copy)
>@@ -1,10 +1,10 @@
>---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2016-12-09 05:05:13 UTC
> +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
>-@@ -14,6 +14,7 @@
>+@@ -13,6 +13,7 @@
>  #include <string.h>
>  
>  #include <algorithm>
> +#include <cstdlib>
>  #include <iterator>
>+ #include <utility>
>  
>- #include "webrtc/base/checks.h"
>Index: www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2016-12-13 00:29:05 UTC
>+--- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2016-12-09 05:05:13 UTC
> +++ third_party/webrtc/modules/video_coding/BUILD.gn
> @@ -140,9 +140,7 @@ rtc_static_library("webrtc_h264") {
>    }
>Index: www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2016-10-06 04:05:36.000000000 +0300
>-+++ third_party/webrtc/system_wrappers/BUILD.gn	2016-10-14 17:26:56.594097000 +0300
>-@@ -105,7 +105,7 @@
>+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2016-12-09 05:05:13 UTC
>++++ third_party/webrtc/system_wrappers/BUILD.gn
>+@@ -100,7 +100,7 @@ rtc_static_library("system_wrappers") {
>      libs += [ "log" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      defines += [ "WEBRTC_THREAD_RR" ]
>  
>      if (!build_with_chromium) {
>-@@ -115,7 +115,7 @@
>+@@ -110,7 +110,7 @@ rtc_static_library("system_wrappers") {
>      libs += [ "rt" ]
>    }
>  
>Index: www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig	2016-10-06 04:05:36.000000000 +0300
>-+++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc	2016-10-14 17:25:37.203869000 +0300
>+--- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig	2016-12-09 05:05:13 UTC
>++++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc
> @@ -12,7 +12,7 @@
>  
>  #include <assert.h>
>Index: www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h
>===================================================================
>--- www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h	(revision 432254)
>+++ www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h	(working copy)
>@@ -1,4 +1,4 @@
>---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2016-05-11 19:04:03 UTC
>+--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2016-12-09 05:05:13 UTC
> +++ third_party/webrtc/voice_engine/voice_engine_defines.h
> @@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) {
>  #include <pthread.h>
>Index: www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/widevine/cdm/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ third_party/widevine/cdm/BUILD.gn	2016-09-03 01:41:31.936198000 +0300
>-@@ -22,7 +22,7 @@
>+--- third_party/widevine/cdm/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ third_party/widevine/cdm/BUILD.gn
>+@@ -25,7 +25,7 @@ if (is_android) {
>      widevine_cdm_version_h_file =
>          "chromeos/$widevine_arch/widevine_cdm_version.h"
>      widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ]
>@@ -9,16 +9,16 @@
>      widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h"
>      widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ]
>    } else if (is_win) {
>-@@ -130,7 +130,7 @@
>-       ":widevinecdmadapter_resources",
>+@@ -147,7 +147,7 @@ if ((is_chrome_branded || enable_widevin
>+       ":widevinecdm",
>      ]
>  
> -    if (is_linux) {
> +    if (is_linux || is_bsd) {
>        ldflags =
>-           [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
>-     } else if (is_win) {
>-@@ -150,7 +150,7 @@
>+           [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
>+                         root_build_dir) ]
>+@@ -170,7 +170,7 @@ if ((is_chrome_branded || enable_widevin
>  # This target exists for tests to depend on that pulls in a runtime dependency
>  # on the license server.
>  source_set("widevine_test_license_server") {
>Index: www/chromium/files/patch-third__party_yasm_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_yasm_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_yasm_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/yasm/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ third_party/yasm/BUILD.gn	2016-09-05 21:50:53.007490000 +0300
>-@@ -32,7 +32,12 @@
>+--- third_party/yasm/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ third_party/yasm/BUILD.gn
>+@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler
>  if (current_toolchain == host_toolchain) {
>    # Various files referenced by multiple targets.
>    yasm_gen_include_dir = "$target_gen_dir/include"
>Index: www/chromium/files/patch-third__party_zlib_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_zlib_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-third__party_zlib_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- third_party/zlib/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ third_party/zlib/BUILD.gn	2016-09-29 17:46:32.878236000 +0300
>-@@ -115,7 +115,7 @@
>+--- third_party/zlib/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ third_party/zlib/BUILD.gn
>+@@ -115,7 +115,7 @@ static_library("minizip") {
>        "contrib/minizip/iowin32.h",
>      ]
>    }
>Index: www/chromium/files/patch-tools_battor__agent_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-tools_battor__agent_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-tools_battor__agent_BUILD.gn	(working copy)
>@@ -1,5 +1,5 @@
>---- tools/battor_agent/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ tools/battor_agent/BUILD.gn	2016-09-01 02:14:55.585315000 +0300
>+--- tools/battor_agent/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ tools/battor_agent/BUILD.gn
> @@ -5,7 +5,7 @@
>  import("//testing/test.gni")
>  
>Index: www/chromium/files/patch-tools_gn_args.cc
>===================================================================
>--- www/chromium/files/patch-tools_gn_args.cc	(revision 432254)
>+++ www/chromium/files/patch-tools_gn_args.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- tools/gn/args.cc.orig	2016-08-13 15:22:20.957491000 +0300
>-+++ tools/gn/args.cc	2016-08-13 15:22:40.739449000 +0300
>-@@ -222,6 +222,8 @@
>+--- tools/gn/args.cc.orig	2016-12-09 05:04:35 UTC
>++++ tools/gn/args.cc
>+@@ -256,6 +256,8 @@ void Args::SetSystemVarsLocked(Scope* de
>    os = "mac";
>  #elif defined(OS_LINUX)
>    os = "linux";
>@@ -8,4 +8,4 @@
> +  os = "bsd";
>  #elif defined(OS_ANDROID)
>    os = "android";
>- #else
>+ #elif defined(OS_NETBSD)
>Index: www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
>===================================================================
>--- www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py	(revision 432254)
>+++ www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py	(working copy)
>@@ -1,15 +1,15 @@
>---- tools/gn/bootstrap/bootstrap.py.orig	2016-10-06 04:02:43.000000000 +0300
>-+++ tools/gn/bootstrap/bootstrap.py	2016-10-31 01:50:52.450019000 +0200
>-@@ -23,6 +23,7 @@
>+--- tools/gn/bootstrap/bootstrap.py.orig	2016-12-09 05:04:35 UTC
>++++ tools/gn/bootstrap/bootstrap.py
>+@@ -23,6 +23,7 @@ import os
>  import shutil
>  import subprocess
>  import sys
> +import platform
>  import tempfile
>-
>+ 
>  BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__))
>-@@ -31,8 +32,9 @@
>-
>+@@ -31,8 +32,9 @@ SRC_ROOT = os.path.dirname(os.path.dirna
>+ 
>  is_win = sys.platform.startswith('win')
>  is_linux = sys.platform.startswith('linux')
> +is_bsd = platform.system().lower().endswith('bsd')
>@@ -16,13 +16,13 @@
>  is_mac = sys.platform.startswith('darwin')
> -is_posix = is_linux or is_mac
> +is_posix = is_linux or is_mac or is_bsd
>-
>+ 
>  def check_call(cmd, **kwargs):
>    logging.debug('Running: %s', ' '.join(cmd))
>-@@ -594,6 +596,39 @@
>+@@ -595,6 +597,39 @@ def write_gn_ninja(path, root_gen_dir, o
>          'base/third_party/libevent/epoll.c',
>      ])
>-
>+ 
> +  if is_bsd:
> +    libs.extend(['-lexecinfo', '-lkvm'])
> +    ldflags.extend(['-pthread'])
>@@ -56,6 +56,6 @@
> +    ])
> +    # Suppressing warnings
> +    cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality'])
>-
>+ 
>    if is_mac:
>      static_libraries['base']['sources'].extend([
>Index: www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
>===================================================================
>--- www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py	(revision 432254)
>+++ www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py	(working copy)
>@@ -1,4 +1,4 @@
>---- tools/variations/fieldtrial_to_struct.py.orig	2016-12-13 00:00:14 UTC
>+--- tools/variations/fieldtrial_to_struct.py.orig	2016-12-09 05:04:35 UTC
> +++ tools/variations/fieldtrial_to_struct.py
> @@ -113,7 +113,7 @@ def main(arguments):
>    if not opts.platform:
>Index: www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h
>===================================================================
>--- www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h	(revision 432254)
>+++ www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/accessibility/platform/ax_platform_node.h.orig	2016-05-11 19:02:35 UTC
>+--- ui/accessibility/platform/ax_platform_node.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/accessibility/platform/ax_platform_node.h
> @@ -22,7 +22,7 @@
>  #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
>Index: www/chromium/files/patch-ui_app__list_app__list__constants.cc
>===================================================================
>--- www/chromium/files/patch-ui_app__list_app__list__constants.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_app__list_app__list__constants.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/app_list/app_list_constants.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/app_list/app_list_constants.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/app_list/app_list_constants.cc
>-@@ -144,7 +144,7 @@ const char kSearchQueryLength[] = "Apps.
>+@@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps.
>  const char kSearchResultDistanceFromOrigin[] =
>      "Apps.AppListSearchResultDistanceFromOrigin";
>  
>Index: www/chromium/files/patch-ui_app__list_app__list__constants.h
>===================================================================
>--- www/chromium/files/patch-ui_app__list_app__list__constants.h	(revision 432254)
>+++ www/chromium/files/patch-ui_app__list_app__list__constants.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/app_list/app_list_constants.h.orig	2016-03-25 13:05:03 UTC
>+--- ui/app_list/app_list_constants.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/app_list/app_list_constants.h
>-@@ -92,8 +92,8 @@ APP_LIST_EXPORT extern const char kSearc
>+@@ -89,8 +89,8 @@ APP_LIST_EXPORT extern const char kSearc
>  APP_LIST_EXPORT extern const char kSearchQueryLength[];
>  APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];
>  
>Index: www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc
>===================================================================
>--- www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_app__list_views_app__list__item__view.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/app_list/views/app_list_item_view.cc.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ ui/app_list/views/app_list_item_view.cc	2016-08-19 05:58:12.763965000 +0300
>-@@ -62,7 +62,7 @@
>+--- ui/app_list/views/app_list_item_view.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/app_list/views/app_list_item_view.cc
>+@@ -55,7 +55,7 @@ gfx::FontList GetFontList() {
>    const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
>  // The font is different on each platform. The font size is adjusted on some
>  // platforms to keep a consistent look.
>Index: www/chromium/files/patch-ui_app__list_views_app__list__view.cc
>===================================================================
>--- www/chromium/files/patch-ui_app__list_views_app__list__view.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_app__list_views_app__list__view.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/app_list/views/app_list_view.cc.orig	2016-10-06 04:02:44.000000000 +0300
>-+++ ui/app_list/views/app_list_view.cc	2016-10-13 09:16:02.654490000 +0300
>-@@ -70,7 +70,7 @@
>+--- ui/app_list/views/app_list_view.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/app_list/views/app_list_view.cc
>+@@ -70,7 +70,7 @@ const int kArrowOffset = 10;
>  
>  // Determines whether the current environment supports shadows bubble borders.
>  bool SupportsShadow() {
>@@ -9,7 +9,7 @@
>    // Shadows are not supported on (non-ChromeOS) Linux.
>    return false;
>  #endif
>-@@ -567,7 +567,7 @@
>+@@ -538,7 +538,7 @@ void AppListView::OnBeforeBubbleWidgetIn
>    if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop())
>      params->native_widget = new views::DesktopNativeWidgetAura(widget);
>  #endif
>Index: www/chromium/files/patch-ui_aura_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_aura_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_aura_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/aura/BUILD.gn.orig	2016-08-03 22:02:40.000000000 +0300
>-+++ ui/aura/BUILD.gn	2016-09-03 00:18:30.181232000 +0300
>-@@ -275,7 +275,7 @@
>+--- ui/aura/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ ui/aura/BUILD.gn
>+@@ -281,7 +281,7 @@ test("aura_unittests") {
>      "//ui/gl:test_support",
>    ]
>  
>Index: www/chromium/files/patch-ui_base_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_base_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_base_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/base/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/base/BUILD.gn	2016-09-28 09:32:40.317599000 +0300
>-@@ -341,7 +341,7 @@
>+--- ui/base/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ ui/base/BUILD.gn
>+@@ -349,7 +349,7 @@ component("base") {
>      sources += [ "touch/touch_device_android.cc" ]
>    } else if (is_ios) {
>      sources += [ "touch/touch_device_ios.cc" ]
>@@ -9,7 +9,7 @@
>      sources += [ "touch/touch_device_linux.cc" ]
>    } else {
>      # Empty implementation for all other cases.
>-@@ -443,7 +443,7 @@
>+@@ -451,11 +451,11 @@ component("base") {
>      ]
>    }
>  
>@@ -18,16 +18,12 @@
>      sources -= [ "resource/resource_bundle_auralinux.cc" ]
>    }
>  
>-@@ -451,7 +451,7 @@
>-     sources -= [ "dragdrop/drag_utils_aura.cc" ]
>-   }
>- 
> -  if (is_linux) {
> +  if (is_linux || is_bsd) {
>      deps += [ "//build/linux:fontconfig" ]
>    }
>  
>-@@ -459,7 +459,7 @@
>+@@ -463,7 +463,7 @@ component("base") {
>      configs += [ "//build/config/linux:glib" ]
>    }
>  
>@@ -36,7 +32,7 @@
>      if (!toolkit_views && !use_aura) {
>        sources -= [
>          "dragdrop/drag_utils.cc",
>-@@ -794,7 +794,7 @@
>+@@ -796,7 +796,7 @@ test("ui_base_unittests") {
>        "ime/win/imm32_manager_unittest.cc",
>        "ime/win/tsf_input_scope_unittest.cc",
>      ]
>@@ -44,8 +40,8 @@
> +    if ((is_linux || is_bsd) && use_aura && !is_chromeos) {
>        sources += [ "ime/input_method_auralinux_unittest.cc" ]
>      }
>-     if (is_mac) {
>-@@ -919,7 +919,7 @@
>+     if (use_x11) {
>+@@ -919,7 +919,7 @@ test("ui_base_unittests") {
>      ]
>    }
>  
>@@ -54,7 +50,7 @@
>      # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
>      # instead of depending directly on the non-test .pak files, but depending
>      # on ui_test_pak seems to have no effect.
>-@@ -932,7 +932,7 @@
>+@@ -932,7 +932,7 @@ test("ui_base_unittests") {
>        "//third_party/mesa:osmesa",
>      ]
>    }
>Index: www/chromium/files/patch-ui_base_ime_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_base_ime_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_base_ime_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/base/ime/BUILD.gn.orig	2016-10-06 04:02:44.000000000 +0300
>-+++ ui/base/ime/BUILD.gn	2016-10-14 18:28:15.896660000 +0300
>-@@ -123,7 +123,7 @@
>+--- ui/base/ime/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ ui/base/ime/BUILD.gn
>+@@ -123,7 +123,7 @@ component("ime") {
>      ":text_input_types",
>    ]
>  
>@@ -9,7 +9,7 @@
>      sources -= [
>        "input_method_auralinux.cc",
>        "input_method_auralinux.h",
>-@@ -137,7 +137,7 @@
>+@@ -137,7 +137,7 @@ component("ime") {
>      ]
>    }
>  
>Index: www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
>===================================================================
>--- www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h	(revision 432254)
>+++ www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/base/ime/ime_engine_handler_interface.h.orig	2016-04-08 16:02:15 UTC
>+--- ui/base/ime/ime_engine_handler_interface.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/base/ime/ime_engine_handler_interface.h
> @@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
>    // Hides the input view window (from API call).
>Index: www/chromium/files/patch-ui_base_ime_input__method__factory.cc
>===================================================================
>--- www/chromium/files/patch-ui_base_ime_input__method__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_base_ime_input__method__factory.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- ui/base/ime/input_method_factory.cc.orig	2016-10-06 04:02:44.000000000 +0300
>-+++ ui/base/ime/input_method_factory.cc	2016-10-13 09:19:24.642495000 +0300
>+--- ui/base/ime/input_method_factory.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/base/ime/input_method_factory.cc
> @@ -14,8 +14,8 @@
>  #include "ui/base/ime/input_method_win.h"
>  #elif defined(OS_MACOSX)
>@@ -11,7 +11,7 @@
>  #include "ui/base/ime/input_method_auralinux.h"
>  #elif defined(OS_ANDROID)
>  #include "ui/base/ime/input_method_android.h"
>-@@ -56,8 +56,8 @@
>+@@ -56,8 +56,8 @@ std::unique_ptr<InputMethod> CreateInput
>    return base::MakeUnique<InputMethodWin>(delegate, widget);
>  #elif defined(OS_MACOSX)
>    return base::MakeUnique<InputMethodMac>(delegate);
>Index: www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
>===================================================================
>--- www/chromium/files/patch-ui_base_ime_input__method__initializer.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_base_ime_input__method__initializer.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/base/ime/input_method_initializer.cc.orig	2016-03-25 13:05:03 UTC
>+--- ui/base/ime/input_method_initializer.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/base/ime/input_method_initializer.cc
> @@ -8,14 +8,14 @@
>  
>Index: www/chromium/files/patch-ui_base_resource_resource__bundle.cc
>===================================================================
>--- www/chromium/files/patch-ui_base_resource_resource__bundle.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_base_resource_resource__bundle.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/base/resource/resource_bundle.cc.orig	2016-07-20 22:03:45.000000000 +0300
>-+++ ui/base/resource/resource_bundle.cc	2016-08-01 22:13:38.986790000 +0300
>-@@ -626,7 +626,7 @@
>+--- ui/base/resource/resource_bundle.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/base/resource/resource_bundle.cc
>+@@ -651,7 +651,7 @@ void ResourceBundle::ReloadFonts() {
>  }
>  
>  ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
>@@ -9,7 +9,7 @@
>    return max_scale_factor_;
>  #else
>    return GetSupportedScaleFactors().back();
>-@@ -686,7 +686,7 @@
>+@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance(
>      supported_scale_factors.push_back(SCALE_FACTOR_100P);
>    }
>  #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
>Index: www/chromium/files/patch-ui_base_ui__features.gni
>===================================================================
>--- www/chromium/files/patch-ui_base_ui__features.gni	(revision 432254)
>+++ www/chromium/files/patch-ui_base_ui__features.gni	(working copy)
>@@ -1,5 +1,5 @@
>---- ui/base/ui_features.gni.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/base/ui_features.gni	2016-09-01 03:07:44.861869000 +0300
>+--- ui/base/ui_features.gni.orig	2016-12-09 05:04:35 UTC
>++++ ui/base/ui_features.gni
> @@ -2,4 +2,4 @@
>  # Use of this source code is governed by a BSD-style license that can be
>  # found in the LICENSE file.
>Index: www/chromium/files/patch-ui_base_webui_web__ui__util.cc
>===================================================================
>--- www/chromium/files/patch-ui_base_webui_web__ui__util.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_base_webui_web__ui__util.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/base/webui/web_ui_util.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/base/webui/web_ui_util.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/base/webui/web_ui_util.cc
>-@@ -164,7 +164,7 @@ std::string GetFontFamily() {
>+@@ -161,7 +161,7 @@ std::string GetFontFamily() {
>  
>  // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
>  // into Ozone: crbug.com/320050
>Index: www/chromium/files/patch-ui_compositor_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_compositor_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_compositor_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/compositor/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/compositor/BUILD.gn	2016-09-03 00:17:02.164382000 +0300
>-@@ -199,7 +199,7 @@
>+--- ui/compositor/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ ui/compositor/BUILD.gn
>+@@ -200,7 +200,7 @@ test("compositor_unittests") {
>      "//ui/gl",
>      "//ui/resources",
>    ]
>Index: www/chromium/files/patch-ui_events_event__switches.cc
>===================================================================
>--- www/chromium/files/patch-ui_events_event__switches.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_events_event__switches.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/events/event_switches.cc.orig	2016-03-25 13:05:03 UTC
>+--- ui/events/event_switches.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/events/event_switches.cc
> @@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis
>  const char kCompensateForUnstablePinchZoom[] =
>Index: www/chromium/files/patch-ui_events_event__switches.h
>===================================================================
>--- www/chromium/files/patch-ui_events_event__switches.h	(revision 432254)
>+++ www/chromium/files/patch-ui_events_event__switches.h	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/events/event_switches.h.orig	2016-03-25 13:05:03 UTC
>+--- ui/events/event_switches.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/events/event_switches.h
> @@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo
>  EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
>Index: www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
>===================================================================
>--- www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/events/keycodes/dom/keycode_converter.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/events/keycodes/dom/keycode_converter.cc
> @@ -19,7 +19,7 @@ namespace {
>  // and DOM Level 3 |code| strings.
>Index: www/chromium/files/patch-ui_gfx_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_gfx_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_gfx_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/gfx/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/gfx/BUILD.gn	2016-09-03 00:17:18.862703000 +0300
>-@@ -360,7 +360,7 @@
>+--- ui/gfx/BUILD.gn.orig	2016-12-09 05:04:35 UTC
>++++ ui/gfx/BUILD.gn
>+@@ -368,7 +368,7 @@ component("gfx") {
>    }
>  
>    # Linux.
>@@ -9,7 +9,7 @@
>      deps += [ "//build/linux:fontconfig" ]
>    }
>  
>-@@ -668,7 +668,7 @@
>+@@ -546,7 +546,7 @@ static_library("test_support") {
>        "test/ui_cocoa_test_helper.mm",
>      ]
>    }
>Index: www/chromium/files/patch-ui_gfx_canvas__skia.cc
>===================================================================
>--- www/chromium/files/patch-ui_gfx_canvas__skia.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_gfx_canvas__skia.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/gfx/canvas_skia.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/gfx/canvas_skia.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/gfx/canvas_skia.cc
>-@@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(c
>+@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c
>      Range range = StripAcceleratorChars(flags, &adjusted_text);
>      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
>  
>Index: www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
>===================================================================
>--- www/chromium/files/patch-ui_gfx_font__fallback__linux.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_gfx_font__fallback__linux.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- ui/gfx/font_fallback_linux.cc.orig	2016-05-27 10:26:15.843855000 -0400
>-+++ ui/gfx/font_fallback_linux.cc	2016-05-27 10:26:38.723265000 -0400
>+--- ui/gfx/font_fallback_linux.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/gfx/font_fallback_linux.cc
> @@ -15,6 +15,10 @@
>  #include "base/memory/ptr_util.h"
>  #include "ui/gfx/font.h"
>Index: www/chromium/files/patch-ui_gfx_font__render__params.h
>===================================================================
>--- www/chromium/files/patch-ui_gfx_font__render__params.h	(revision 432254)
>+++ www/chromium/files/patch-ui_gfx_font__render__params.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/gfx/font_render_params.h.orig	2016-05-27 10:24:30.925944000 -0400
>-+++ ui/gfx/font_render_params.h	2016-05-27 10:24:56.069225000 -0400
>-@@ -102,13 +102,13 @@
>+--- ui/gfx/font_render_params.h.orig	2016-12-09 05:04:35 UTC
>++++ ui/gfx/font_render_params.h
>+@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende
>      const FontRenderParamsQuery& query,
>      std::string* family_out);
>  
>Index: www/chromium/files/patch-ui_gfx_render__text.cc
>===================================================================
>--- www/chromium/files/patch-ui_gfx_render__text.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_gfx_render__text.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/gfx/render_text.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/gfx/render_text.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/gfx/render_text.cc
>-@@ -942,32 +942,33 @@ void RenderText::SetDisplayOffset(int ho
>+@@ -967,32 +967,33 @@ void RenderText::SetDisplayOffset(int ho
>    const int extra_content = GetContentWidth() - display_rect_.width();
>    const int cursor_width = cursor_enabled_ ? 1 : 0;
>  
>Index: www/chromium/files/patch-ui_gl_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_gl_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_gl_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/gl/BUILD.gn.orig	2016-12-12 22:13:27 UTC
>+--- ui/gl/BUILD.gn.orig	2016-12-09 05:04:35 UTC
> +++ ui/gl/BUILD.gn
> @@ -13,7 +13,7 @@ declare_args() {
>    enable_swiftshader = is_chrome_branded && is_win
>Index: www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
>===================================================================
>--- www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/gl/sync_control_vsync_provider.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/gl/sync_control_vsync_provider.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/gl/sync_control_vsync_provider.cc
> @@ -11,7 +11,7 @@
>  #include "base/trace_event/trace_event.h"
>@@ -9,7 +9,7 @@
>  // These constants define a reasonable range for a calculated refresh interval.
>  // Calculating refreshes out of this range will be considered a fatal error.
>  const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
>-@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS
>+@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVS
>  void SyncControlVSyncProvider::GetVSyncParameters(
>      const UpdateVSyncCallback& callback) {
>    TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
>@@ -18,7 +18,7 @@
>    base::TimeTicks timebase;
>  
>    // The actual clock used for the system time returned by glXGetSyncValuesOML
>-@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP
>+@@ -155,7 +155,7 @@ void SyncControlVSyncProvider::GetVSyncP
>    last_timebase_ = timebase;
>    last_media_stream_counter_ = media_stream_counter;
>    callback.Run(timebase, last_good_interval_);
>@@ -26,4 +26,4 @@
> +#endif  // defined(OS_LINUX) || defined(OS_BSD)
>  }
>  
>- }  // namespace gfx
>+ }  // namespace gl
>Index: www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h
>===================================================================
>--- www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h	(revision 432254)
>+++ www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/gl/sync_control_vsync_provider.h.orig	2016-08-04 17:39:12.324777000 +0300
>-+++ ui/gl/sync_control_vsync_provider.h	2016-08-04 17:39:19.973676000 +0300
>-@@ -31,7 +31,7 @@
>+--- ui/gl/sync_control_vsync_provider.h.orig	2016-12-09 05:04:35 UTC
>++++ ui/gl/sync_control_vsync_provider.h
>+@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public 
>    virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;
>  
>   private:
>Index: www/chromium/files/patch-ui_message__center_message__center__style.h
>===================================================================
>--- www/chromium/files/patch-ui_message__center_message__center__style.h	(revision 432254)
>+++ www/chromium/files/patch-ui_message__center_message__center__style.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/message_center/message_center_style.h.orig	2016-05-11 19:02:35 UTC
>+--- ui/message_center/message_center_style.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/message_center/message_center_style.h
>-@@ -111,7 +111,7 @@ const int kButtonHorizontalPadding = 16;
>+@@ -115,7 +115,7 @@ const int kButtonHorizontalPadding = 16;
>  const int kButtonIconTopPadding = 11;      // In DIPs.
>  const int kButtonIconToTitlePadding = 16;  // In DIPs.
>  
>Index: www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc
>===================================================================
>--- www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/message_center/views/message_center_button_bar.cc.orig	2016-05-11 19:02:35 UTC
>+--- ui/message_center/views/message_center_button_bar.cc.orig	2016-12-09 05:04:35 UTC
> +++ ui/message_center/views/message_center_button_bar.cc
>-@@ -96,7 +96,7 @@ MessageCenterButtonBar::MessageCenterBut
>+@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut
>      const base::string16& title)
>      : message_center_view_(message_center_view),
>        message_center_(message_center),
>@@ -9,7 +9,7 @@
>        close_bubble_button_(NULL),
>  #endif
>        title_arrow_(NULL),
>-@@ -171,7 +171,7 @@ MessageCenterButtonBar::MessageCenterBut
>+@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterBut
>                                     IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
>    button_container_->AddChildView(settings_button_);
>  
>@@ -18,7 +18,7 @@
>    close_bubble_button_ = new views::ImageButton(this);
>    close_bubble_button_->SetImage(
>        views::Button::STATE_NORMAL,
>-@@ -233,7 +233,7 @@ void MessageCenterButtonBar::ViewVisibil
>+@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibil
>                      0,
>                      0);
>  
>@@ -27,7 +27,7 @@
>    // The close-bubble button.
>    column->AddColumn(views::GridLayout::LEADING,
>                      views::GridLayout::LEADING,
>-@@ -248,7 +248,7 @@ void MessageCenterButtonBar::ViewVisibil
>+@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibil
>      layout->AddView(title_arrow_);
>    layout->AddView(notification_label_);
>    layout->AddView(button_container_);
>@@ -36,7 +36,7 @@
>    layout->AddView(close_bubble_button_);
>  #endif
>  }
>-@@ -295,7 +295,7 @@ void MessageCenterButtonBar::ButtonPress
>+@@ -297,7 +297,7 @@ void MessageCenterButtonBar::ButtonPress
>      else
>        message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
>      quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
>Index: www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h
>===================================================================
>--- www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h	(revision 432254)
>+++ www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/message_center/views/message_center_button_bar.h.orig	2016-04-08 16:02:15 UTC
>+--- ui/message_center/views/message_center_button_bar.h.orig	2016-12-09 05:04:35 UTC
> +++ ui/message_center/views/message_center_button_bar.h
>-@@ -73,7 +73,7 @@ class MessageCenterButtonBar : public vi
>+@@ -76,7 +76,7 @@ class MessageCenterButtonBar : public vi
>    // close-on-deactivation is off. This is a tentative solution. Once pkotwicz
>    // Fixes the problem of focus-follow-mouse, close-on-deactivation will be
>    // back and this field will be removed. See crbug.com/319516.
>Index: www/chromium/files/patch-ui_message__center_views_message__view__factory.cc
>===================================================================
>--- www/chromium/files/patch-ui_message__center_views_message__view__factory.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_message__center_views_message__view__factory.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/message_center/views/message_view_factory.cc.orig	2016-08-03 16:51:43.884486000 -0400
>-+++ ui/message_center/views/message_view_factory.cc	2016-08-03 16:51:59.171721000 -0400
>-@@ -43,7 +43,7 @@
>+--- ui/message_center/views/message_view_factory.cc.orig	2016-12-09 05:04:35 UTC
>++++ ui/message_center/views/message_view_factory.cc
>+@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(
>        notification_view = new NotificationView(controller, notification);
>    }
>  
>Index: www/chromium/files/patch-ui_resources_ui__resources.grd
>===================================================================
>--- www/chromium/files/patch-ui_resources_ui__resources.grd	(revision 432254)
>+++ www/chromium/files/patch-ui_resources_ui__resources.grd	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/resources/ui_resources.grd.orig	2016-05-11 19:02:35 UTC
>+--- ui/resources/ui_resources.grd.orig	2016-12-09 05:04:36 UTC
> +++ ui/resources/ui_resources.grd
> @@ -15,7 +15,7 @@
>        <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
>Index: www/chromium/files/patch-ui_views_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_views_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_views_BUILD.gn	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/BUILD.gn.orig	2016-12-12 22:16:29 UTC
>+--- ui/views/BUILD.gn.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/BUILD.gn
> @@ -424,7 +424,7 @@ component("views") {
>    if (use_x11 && !is_chromeos) {
>Index: www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
>===================================================================
>--- www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h	(revision 432254)
>+++ www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/accessibility/native_view_accessibility.h.orig	2016-03-25 13:05:04 UTC
>+--- ui/views/accessibility/native_view_accessibility.h.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/accessibility/native_view_accessibility.h
> @@ -22,7 +22,7 @@
>  #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
>Index: www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/bubble/bubble_dialog_delegate.cc.orig	2016-08-03 16:59:43.426393000 -0400
>-+++ ui/views/bubble/bubble_dialog_delegate.cc	2016-08-03 17:00:10.585958000 -0400
>-@@ -72,7 +72,7 @@
>+--- ui/views/bubble/bubble_dialog_delegate.cc.orig	2016-12-09 05:04:36 UTC
>++++ ui/views/bubble/bubble_dialog_delegate.cc
>+@@ -73,7 +73,7 @@ Widget* BubbleDialogDelegateView::Create
>    // the parent frame and let DWM handle compositing.  If not, then we don't
>    // want to allow the bubble to extend the frame because it will be clipped.
>    bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
>Index: www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_controls_textfield_textfield.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_controls_textfield_textfield.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/controls/textfield/textfield.cc.orig	2016-12-12 22:18:59 UTC
>+--- ui/views/controls/textfield/textfield.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/controls/textfield/textfield.cc
> @@ -52,7 +52,7 @@
>  #include "ui/base/win/osk_display_manager.h"
>Index: www/chromium/files/patch-ui_views_controls_webview_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-ui_views_controls_webview_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-ui_views_controls_webview_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/controls/webview/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/views/controls/webview/BUILD.gn	2016-09-03 00:18:20.159623000 +0300
>-@@ -39,7 +39,7 @@
>+--- ui/views/controls/webview/BUILD.gn.orig	2016-12-09 05:04:36 UTC
>++++ ui/views/controls/webview/BUILD.gn
>+@@ -39,7 +39,7 @@ component("webview") {
>      "//ui/views",
>    ]
>  
>Index: www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/corewm/tooltip_aura.cc.orig	2016-12-16 15:15:24.020369000 +0000
>-+++ ui/views/corewm/tooltip_aura.cc	2016-12-16 15:16:03.296431000 +0000
>-@@ -34,7 +34,7 @@
>+--- ui/views/corewm/tooltip_aura.cc.orig	2016-12-09 05:04:36 UTC
>++++ ui/views/corewm/tooltip_aura.cc
>+@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;
>  
>  // TODO(varkha): Update if native widget can be transparent on Linux.
>  bool CanUseTranslucentTooltipWidget() {
>Index: www/chromium/files/patch-ui_views_examples_widget__example.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_examples_widget__example.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_examples_widget__example.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/examples/widget_example.cc.orig	2016-05-11 19:02:36 UTC
>+--- ui/views/examples/widget_example.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/examples/widget_example.cc
>-@@ -84,7 +84,7 @@ void WidgetExample::CreateExampleView(Vi
>+@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi
>    BuildButton(container, "Popup widget", POPUP);
>    BuildButton(container, "Dialog widget", DIALOG);
>    BuildButton(container, "Modal Dialog", MODAL_DIALOG);
>Index: www/chromium/files/patch-ui_views_style_platform__style.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_style_platform__style.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_style_platform__style.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- ui/views/style/platform_style.cc.orig	2016-08-03 22:02:41.000000000 +0300
>-+++ ui/views/style/platform_style.cc	2016-09-26 05:44:41.103708000 +0300
>+--- ui/views/style/platform_style.cc.orig	2016-12-09 05:04:36 UTC
>++++ ui/views/style/platform_style.cc
> @@ -17,7 +17,7 @@
>  #include "ui/views/controls/focusable_border.h"
>  #include "ui/views/controls/scrollbar/native_scroll_bar.h"
>Index: www/chromium/files/patch-ui_views_views__delegate.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_views__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_views__delegate.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/views_delegate.cc.orig	2016-03-25 13:05:04 UTC
>+--- ui/views/views_delegate.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/views_delegate.cc
> @@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco
>  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
>Index: www/chromium/files/patch-ui_views_views__delegate.h
>===================================================================
>--- www/chromium/files/patch-ui_views_views__delegate.h	(revision 432254)
>+++ www/chromium/files/patch-ui_views_views__delegate.h	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/views_delegate.h.orig	2016-05-11 19:02:36 UTC
>+--- ui/views/views_delegate.h.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/views_delegate.h
> @@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate {
>    // Returns true if the window passed in is in the Windows 8 metro
>Index: www/chromium/files/patch-ui_views_views__switches.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_views__switches.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_views__switches.cc	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/views/views_switches.cc.orig	2016-03-25 13:05:04 UTC
>+--- ui/views/views_switches.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/views_switches.cc
> @@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti
>      "disable-views-rect-based-targeting";
>Index: www/chromium/files/patch-ui_views_window_custom__frame__view.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_window_custom__frame__view.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_window_custom__frame__view.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/window/custom_frame_view.cc.orig	2016-05-11 19:02:36 UTC
>+--- ui/views/window/custom_frame_view.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/window/custom_frame_view.cc
>-@@ -288,7 +288,7 @@ int CustomFrameView::NonClientTopBorderH
>+@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderH
>  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.
>Index: www/chromium/files/patch-ui_views_window_dialog__delegate.cc
>===================================================================
>--- www/chromium/files/patch-ui_views_window_dialog__delegate.cc	(revision 432254)
>+++ www/chromium/files/patch-ui_views_window_dialog__delegate.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/views/window/dialog_delegate.cc.orig	2016-05-11 19:02:36 UTC
>+--- ui/views/window/dialog_delegate.cc.orig	2016-12-09 05:04:36 UTC
> +++ ui/views/window/dialog_delegate.cc
>-@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidg
>+@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDi
>    params.bounds = bounds;
>    DialogDelegate* dialog = delegate->AsDialogDelegate();
>  
>@@ -8,4 +8,4 @@
> +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
>    // The new style doesn't support unparented dialogs on Linux desktop.
>    if (dialog)
>-     dialog->supports_new_style_ &= parent != NULL;
>+     dialog->supports_custom_frame_ &= parent != NULL;
>Index: www/chromium/files/patch-ui_webui_resources_js_cr.js
>===================================================================
>--- www/chromium/files/patch-ui_webui_resources_js_cr.js	(revision 432254)
>+++ www/chromium/files/patch-ui_webui_resources_js_cr.js	(working copy)
>@@ -1,6 +1,6 @@
>---- ui/webui/resources/js/cr.js.orig	2016-05-11 19:02:36 UTC
>+--- ui/webui/resources/js/cr.js.orig	2016-12-09 05:04:36 UTC
> +++ ui/webui/resources/js/cr.js
>-@@ -444,6 +444,11 @@ var cr = function() {
>+@@ -451,6 +451,11 @@ var cr = cr || function() {
>      get doc() {
>        return document;
>      },
>Index: www/chromium/files/patch-ui_webui_resources_js_icon.js
>===================================================================
>--- www/chromium/files/patch-ui_webui_resources_js_icon.js	(revision 432254)
>+++ www/chromium/files/patch-ui_webui_resources_js_icon.js	(working copy)
>@@ -1,4 +1,4 @@
>---- ui/webui/resources/js/icon.js.orig	2016-12-12 22:24:45 UTC
>+--- ui/webui/resources/js/icon.js.orig	2016-12-09 05:04:36 UTC
> +++ ui/webui/resources/js/icon.js
> @@ -14,7 +14,7 @@ cr.define('cr.icon', function() {
>        // supports SCALE_FACTOR_100P on all non-iOS platforms.
>Index: www/chromium/files/patch-v8_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-v8_BUILD.gn	(revision 432254)
>+++ www/chromium/files/patch-v8_BUILD.gn	(working copy)
>@@ -1,6 +1,6 @@
>---- v8/BUILD.gn.orig	2016-12-01 23:03:17.000000000 +0000
>-+++ v8/BUILD.gn	2016-12-16 15:25:09.616617000 +0000
>-@@ -2226,7 +2226,7 @@
>+--- v8/BUILD.gn.orig	2016-12-09 05:05:14 UTC
>++++ v8/BUILD.gn
>+@@ -2226,7 +2226,7 @@ v8_source_set("v8_libbase") {
>      sources += [ "src/base/platform/platform-posix.cc" ]
>    }
>  
>@@ -9,7 +9,7 @@
>      sources += [
>        "src/base/debug/stack_trace_posix.cc",
>        "src/base/platform/platform-linux.cc",
>-@@ -2236,6 +2236,12 @@
>+@@ -2236,6 +2236,12 @@ v8_source_set("v8_libbase") {
>        "dl",
>        "rt",
>      ]
>@@ -22,7 +22,7 @@
>    } else if (is_android) {
>      if (current_toolchain == host_toolchain) {
>        libs = [
>-@@ -2388,6 +2394,7 @@
>+@@ -2388,6 +2394,7 @@ if (current_toolchain == v8_snapshot_too
>      sources = [
>        "src/snapshot/mksnapshot.cc",
>      ]
>Index: www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
>===================================================================
>--- www/chromium/files/patch-v8_src_base_platform_platform-posix.cc	(revision 432254)
>+++ www/chromium/files/patch-v8_src_base_platform_platform-posix.cc	(working copy)
>@@ -1,5 +1,5 @@
>---- v8/src/base/platform/platform-posix.cc.orig	2016-10-06 04:05:41.000000000 +0300
>-+++ v8/src/base/platform/platform-posix.cc	2016-10-13 09:39:34.732843000 +0300
>+--- v8/src/base/platform/platform-posix.cc.orig	2016-12-09 05:05:14 UTC
>++++ v8/src/base/platform/platform-posix.cc
> @@ -27,6 +27,10 @@
>  #include <sys/sysctl.h>  // NOLINT, for sysctl
>  #endif
>@@ -11,7 +11,7 @@
>  #undef MAP_TYPE
>  
>  #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
>-@@ -329,6 +333,12 @@
>+@@ -329,6 +333,12 @@ int OS::GetCurrentThreadId() {
>    return static_cast<int>(syscall(__NR_gettid));
>  #elif V8_OS_ANDROID
>    return static_cast<int>(gettid());

Flags:

cpm: maintainer-approval+

Actions: View | Diff

Attachments on bug 215271: 179156 | 179157 | 179266 | 179269 | 179318