MFH: r516832 r517349

www/chromium: update to 78.0.3904.87 Submitted by: Matthias Wolf via github www/chromium: update to 78.0.3904.97 Submitted by: Matthias Wolf Security: 88d00176-058e-11ea-bd1c-3065ec8fd3ec Approved by: ports-secteam (joneum)
svn path=/branches/2019Q4/; revision=517385
2019-11-13 20:44:08 +00:00 · 2019-11-13 20:44:08 +00:00 · 3b67efe70e · 2021-03-31 03:12:20 +00:00
commit 3b67efe70e
parent 0c8bf19c7c
424 changed files with 2872 additions and 2207 deletions
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	chromium
-PORTVERSION=	76.0.3809.132
+PORTVERSION=	78.0.3904.97
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
@ -74,7 +74,7 @@ USES=		compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \
 		python:2.7,build shebangfix tar:xz
 .else
 USES=		bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \
-		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz
+		ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg
 .endif
 MAKE_ARGS=	-C out/${BUILDTYPE}
 BINARY_ALIAS=	python=${PYTHON_CMD}
@ -293,6 +293,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		${STAGEDIR}${MANPREFIX}/man/man1/chrome.1
+	${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
@ -315,10 +316,15 @@ do-install:
 		${STAGEDIR}${DATADIR}

 	# ANGLE, EGL, Vk
-.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so libVkLayer_core_validation.so libVkLayer_object_lifetimes.so \
-	libVkLayer_stateless_validation.so libVkLayer_thread_safety.so libVkLayer_unique_objects.so
+.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
+.if ${BUILDTYPE} == Debug
+.for f in libVkLayer_core_validation.so libVkLayer_object_lifetimes.so libVkLayer_stateless_validation.so \
+	libVkLayer_thread_safety.so libVkLayer_unique_objects.so
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
+.endfor
+.endif

 	# SwiftShader
 .if ${ARCH} != aarch64
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1566850881
-SHA256 (chromium-76.0.3809.132.tar.xz) = d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241
-SIZE (chromium-76.0.3809.132.tar.xz) = 728899912
-SHA256 (chromium-76.0.3809.132-testdata.tar.xz) = 527447872a16b868789215d6ce6a82047afca4ad825beb45c0ac349e3034cbb7
-SIZE (chromium-76.0.3809.132-testdata.tar.xz) = 262868312
+TIMESTAMP = 1573140185
+SHA256 (chromium-78.0.3904.97.tar.xz) = d1f49ab9f4f973536166f587114553c21a29977bdc350dd407a89d34e22a9d07
+SIZE (chromium-78.0.3904.97.tar.xz) = 742793812
+SHA256 (chromium-78.0.3904.97-testdata.tar.xz) = f9897cfbb2039f42e3c02cb78e3a528972394c5ed0fe88280023ae1bbdf57287
+SIZE (chromium-78.0.3904.97-testdata.tar.xz) = 252327620
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@ -1,6 +1,6 @@
--- BUILD.gn.orig	2019-07-24 18:58:00 UTC
+--- BUILD.gn.orig	2019-10-21 19:06:17 UTC
 +++ BUILD.gn
-@@ -386,7 +386,7 @@ group("gn_all") {
+@@ -404,7 +404,7 @@ group("gn_all") {
     ]
   }
 
@ -9,7 +9,7 @@
     deps += [
       "//third_party/breakpad:breakpad_unittests",
       "//third_party/breakpad:core-2-minidump",
-@@ -427,8 +427,6 @@ group("gn_all") {
+@@ -445,8 +445,6 @@ group("gn_all") {
       "//net:disk_cache_memory_test",
       "//net:quic_client",
       "//net:quic_server",
@ -18,7 +18,7 @@
       "//testing:empty_main",
     ]
 
-@@ -483,10 +481,6 @@ group("gn_all") {
+@@ -501,10 +499,6 @@ group("gn_all") {
         "//chrome/test:load_library_perf_tests",
         "//chrome/test:sync_performance_tests",
         "//chrome/test/chromedriver:chromedriver",
@ -29,7 +29,7 @@
         "//media/cast:generate_barcode_video",
         "//media/cast:generate_timecode_audio",
         "//net:crash_cache",
-@@ -541,10 +535,6 @@ group("gn_all") {
+@@ -560,10 +554,6 @@ group("gn_all") {
       "//mojo:mojo_perftests",
       "//services/service_manager/public/cpp",
       "//testing/gmock:gmock_main",
@ -40,7 +40,7 @@
     ]
 
     if (!is_android) {
-@@ -619,7 +609,7 @@ group("gn_all") {
+@@ -637,7 +627,7 @@ group("gn_all") {
         host_os == "win") {
       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
     }
@ -49,7 +49,7 @@
     deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
   }
 
-@@ -758,7 +748,6 @@ group("gn_all") {
+@@ -776,7 +766,6 @@ group("gn_all") {
       "//chrome/browser/vr:vr_common_perftests",
       "//chrome/browser/vr:vr_common_unittests",
       "//chrome/browser/vr:vr_pixeltests",
@ -57,7 +57,7 @@
     ]
     if (is_desktop_linux && use_ozone) {
       deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -877,7 +866,6 @@ if (is_chromeos) {
+@@ -896,7 +885,6 @@ if (is_chromeos) {
       "//ppapi/examples/video_decode",
       "//sandbox/linux:chrome_sandbox",
       "//sandbox/linux:sandbox_linux_unittests",
@ -65,7 +65,7 @@
 
       # Blocked on https://github.com/catapult-project/catapult/issues/2297
       #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1033,7 +1021,7 @@ if (!is_ios) {
+@@ -1065,7 +1053,7 @@ if (!is_ios) {
       ]
     }
 
@ -74,7 +74,7 @@
       data_deps +=
           [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
     }
-@@ -1042,7 +1030,7 @@ if (!is_ios) {
+@@ -1074,7 +1062,7 @@ if (!is_ios) {
       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 
@ -83,7 +83,7 @@
       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
     }
 
-@@ -1185,9 +1173,6 @@ group("chromium_builder_perf") {
+@@ -1216,9 +1204,6 @@ group("chromium_builder_perf") {
 
     if (is_win) {
       data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@ -1,6 +1,6 @@
--- base/BUILD.gn.orig	2019-07-24 18:58:01 UTC
+--- base/BUILD.gn.orig	2019-10-21 19:06:18 UTC
 +++ base/BUILD.gn
-@@ -1258,7 +1258,7 @@ jumbo_component("base") {
+@@ -1266,7 +1266,7 @@ jumbo_component("base") {
   # Needed for <atomic> if using newer C++ library than sysroot, except if
   # building inside the cros_sdk environment - use host_toolchain as a
   # more robust check for this.
@ -9,7 +9,7 @@
       host_toolchain != "//build/toolchain/cros:host") {
     libs += [ "atomic" ]
   }
-@@ -1284,7 +1284,7 @@ jumbo_component("base") {
+@@ -1292,7 +1292,7 @@ jumbo_component("base") {
         "allocator/allocator_shim_override_glibc_weak_symbols.h",
       ]
       deps += [ "//base/allocator:tcmalloc" ]
@ -18,7 +18,7 @@
       sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
     } else if (is_android && use_allocator == "none") {
       sources += [
-@@ -1862,6 +1862,33 @@ jumbo_component("base") {
+@@ -1893,6 +1893,33 @@ jumbo_component("base") {
     }
   }
 
@ -52,7 +52,7 @@
   # iOS
   if (is_ios) {
     set_sources_assignment_filter([])
-@@ -2999,6 +3026,12 @@ test("base_unittests") {
+@@ -3041,6 +3068,12 @@ test("base_unittests") {
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
--- a/www/chromium/files/patch-base_allocator_allocator__shim.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc
@ -1,6 +1,6 @@
--- base/allocator/allocator_shim.cc.orig	2019-07-24 18:58:01 UTC
+--- base/allocator/allocator_shim.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/allocator/allocator_shim.cc
-@@ -70,7 +70,7 @@ inline const base::allocator::AllocatorDispatch* GetCh
+@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh
   // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
   // barriered on Linux+Clang, and that causes visible perf regressons.
   return reinterpret_cast<const base::allocator::AllocatorDispatch*>(
--- a/www/chromium/files/patch-base_allocator_partition__allocator_pageallocatorinternals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_pageallocatorinternals__posix.h
@ -1,8 +1,8 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-07-24 18:58:01 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-10-21 19:06:18 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -16,7 +16,7 @@
- 
- #include <mach/mach.h>
+@@ -19,7 +19,7 @@
+ #if defined(OS_ANDROID)
+ #include <sys/prctl.h>
 #endif
 -#if defined(OS_LINUX)
 +#if defined(OS_BSD) || defined(OS_LINUX)
--- a/www/chromium/files/patch-base_base__switches.cc
+++ b/www/chromium/files/patch-base_base__switches.cc
@ -1,6 +1,6 @@
--- base/base_switches.cc.orig	2019-07-29 16:52:17 UTC
+--- base/base_switches.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/base_switches.cc
-@@ -107,7 +107,7 @@ const char kProfilingFlush[] = "profiling-flush";
+@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t
 const char kDisableUsbKeyboardDetect[]      = "disable-usb-keyboard-detect";
 #endif
 
@ -9,7 +9,7 @@
 // The /dev/shm partition is too small in certain VM environments, causing
 // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to
 // work-around this issue (a temporary directory will always be used to create
-@@ -128,7 +128,7 @@ const char kEnableCrashReporterForTesting[] =
+@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] =
 const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler";
 #endif
 
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@ -1,6 +1,6 @@
--- base/base_switches.h.orig	2019-07-29 18:05:10 UTC
+--- base/base_switches.h.orig	2019-10-21 19:06:18 UTC
 +++ base/base_switches.h
-@@ -36,7 +36,7 @@ extern const char kWaitForDebugger[];
+@@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[];
 extern const char kDisableUsbKeyboardDetect[];
 #endif
 
@ -9,7 +9,7 @@
 extern const char kDisableDevShmUsage[];
 #endif
 
-@@ -49,7 +49,7 @@ extern const char kEnableReachedCodeProfiler[];
+@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[];
 extern const char kOrderfileMemoryOptimization[];
 #endif
 
--- a/www/chromium/files/patch-base_cpu.cc
+++ b/www/chromium/files/patch-base_cpu.cc
@ -1,15 +1,15 @@
--- base/cpu.cc.orig	2019-07-29 18:05:46 UTC
+--- base/cpu.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/cpu.cc
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,7 @@
+ 
 #include "base/stl_util.h"
- #include "build/build_config.h"
 
 -#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
 +#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
 #include "base/files/file_util.h"
 #endif
 
-@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) {
+@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) {
 
 #endif  // ARCH_CPU_X86_FAMILY
 
@ -18,7 +18,7 @@
 std::string* CpuInfoBrand() {
   static std::string* brand = []() {
     // This function finds the value from /proc/cpuinfo under the key "model
-@@ -127,7 +127,7 @@ std::string* CpuInfoBrand() {
+@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() {
   return brand;
 }
 #endif  // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
@ -27,7 +27,7 @@
 
 }  // namespace
 
-@@ -252,7 +252,7 @@ void CPU::Initialize() {
+@@ -287,7 +287,7 @@ void CPU::Initialize() {
     }
   }
 #elif defined(ARCH_CPU_ARM_FAMILY)
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@ -1,6 +1,6 @@
--- base/debug/debugger_posix.cc.orig	2019-06-04 18:55:15 UTC
+--- base/debug/debugger_posix.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/debug/debugger_posix.cc
-@@ -87,7 +87,7 @@ bool BeingDebugged() {
+@@ -90,7 +90,7 @@ bool BeingDebugged() {
     KERN_PROC,
     KERN_PROC_PID,
     getpid()
@ -9,7 +9,7 @@
     , sizeof(struct kinfo_proc),
     0
 #endif
-@@ -95,33 +95,35 @@ bool BeingDebugged() {
+@@ -98,33 +98,35 @@ bool BeingDebugged() {
 
   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
   // binary interfaces may change.
--- a/www/chromium/files/patch-base_debug_stack__trace.h
+++ b/www/chromium/files/patch-base_debug_stack__trace.h
@ -1,9 +1,9 @@
--- base/debug/stack_trace.h.orig	2019-03-11 22:00:51 UTC
+--- base/debug/stack_trace.h.orig	2019-09-09 21:55:05 UTC
 +++ base/debug/stack_trace.h
-@@ -16,6 +16,7 @@
- #include "build/build_config.h"
- 
- #if defined(OS_POSIX)
+@@ -19,6 +19,7 @@
+ #if !defined(OS_NACL)
+ #include <signal.h>
+ #endif
 +#include <sys/stdint.h>
 #include <unistd.h>
 #endif
--- a/www/chromium/files/patch-base_debug_stacktraceposix.cc
+++ b/www/chromium/files/patch-base_debug_stacktraceposix.cc
@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/debug/stack_trace_posix.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/debug/stack_trace_posix.cc
@@ -35,7 +35,7 @@
 #include <AvailabilityMacros.h>
@ -9,7 +9,7 @@
 #include "base/debug/proc_maps_linux.h"
 #endif
 
-@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper {
+@@ -657,6 +657,11 @@ class SandboxSymbolizeHelper {
   // for the modules that are loaded in the current process.
   // Returns true on success.
   bool CacheMemoryRegions() {
@ -21,7 +21,7 @@
     // Reads /proc/self/maps.
     std::string contents;
     if (!ReadProcMaps(&contents)) {
-@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper {
+@@ -674,6 +679,7 @@ class SandboxSymbolizeHelper {
 
     is_initialized_ = true;
     return true;
--- a/www/chromium/files/patch-base_files_filepathwatcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_filepathwatcher__unittest.cc
@ -1,6 +1,6 @@
--- base/files/file_path_watcher_unittest.cc.orig	2019-03-11 22:00:51 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/files/file_path_watcher_unittest.cc
-@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
   VLOG(1) << "Waiting for file1 creation";
   ASSERT_TRUE(WaitForEvents());
 
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@ -1,6 +1,6 @@
--- base/files/file_util.h.orig	2019-07-24 18:58:02 UTC
+--- base/files/file_util.h.orig	2019-10-21 19:06:18 UTC
 +++ base/files/file_util.h
-@@ -476,7 +476,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -497,7 +497,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
 // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
 BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
 
--- a/www/chromium/files/patch-base_files_fileutilposix.cc
+++ b/www/chromium/files/patch-base_files_fileutilposix.cc
@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig	2019-06-04 18:55:15 UTC
+--- base/files/file_util_posix.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/files/file_util_posix.cc
-@@ -419,7 +419,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+@@ -426,7 +426,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
 }
 
 bool CreateLocalNonBlockingPipe(int fds[2]) {
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@ -1,6 +1,6 @@
--- base/logging_unittest.cc.orig	2019-07-24 18:58:02 UTC
+--- base/logging_unittest.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/logging_unittest.cc
-@@ -444,7 +444,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -590,7 +590,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
   // need the arch-specific boilerplate below, which is inspired by breakpad.
   // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
   uintptr_t crash_addr = 0;
--- a/www/chromium/files/patch-base_memory_platformsharedmemory__region.h
+++ b/www/chromium/files/patch-base_memory_platformsharedmemory__region.h
@ -0,0 +1,29 @@
+--- base/memory/platform_shared_memory_region.h.orig	2019-09-16 12:06:15 UTC
+++ base/memory/platform_shared_memory_region.h
+@@ -28,7 +28,7 @@
+ #include "base/files/scoped_file.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+ namespace content {
+ class SandboxIPCHandler;
+ }
+@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+     kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
+   };
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+   // Structure to limit access to executable region creation.
+   struct ExecutableRegion {
+    private:
+@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+                            CheckPlatformHandlePermissionsCorrespondToMode);
+   static PlatformSharedMemoryRegion Create(Mode mode,
+                                            size_t size
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+                                            ,
+                                            bool executable = false
+ #endif
--- a/www/chromium/files/patch-base_memory_platformsharedmemoryregionposix.cc
+++ b/www/chromium/files/patch-base_memory_platformsharedmemoryregionposix.cc
@ -0,0 +1,38 @@
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2019-09-16 12:05:39 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
+@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const {
+   return {fd.get(), readonly_fd.get()};
+ }
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+ // static
+ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
+   PlatformSharedMemoryRegion region =
+@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
+     return region.PassPlatformHandle().fd;
+   return ScopedFD();
+ }
+-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // static
+ PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
+@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+ // static
+ PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
+                                                               size_t size
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+                                                               ,
+                                                               bool executable
+ #endif
+@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+   // flag.
+   FilePath directory;
+   if (!GetShmemTempDir(
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+           executable,
+ #else
+           false /* executable */,
--- a/www/chromium/files/patch-base_numerics_safemathshared__impl.h
+++ b/www/chromium/files/patch-base_numerics_safemathshared__impl.h
@ -1,13 +1,12 @@
--- base/numerics/safe_math_shared_impl.h.orig	2019-03-11 22:00:51 UTC
+--- base/numerics/safe_math_shared_impl.h.orig	2019-09-09 21:55:05 UTC
 +++ base/numerics/safe_math_shared_impl.h
-@@ -19,9 +19,7 @@
- 
+@@ -23,8 +23,7 @@
 // Where available use builtin math overflow support on Clang and GCC.
- #if !defined(__native_client__) &&                         \
-    ((defined(__clang__) &&                                \
-      ((__clang_major__ > 3) ||                            \
-       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-+    ((defined(__clang__) && (__clang_major__ > 6)) ||      \
-      (defined(__GNUC__) && __GNUC__ >= 5))
+ #elif !defined(__native_client__) &&                         \
+       ((defined(__clang__) &&                                \
+-        ((__clang_major__ > 3) ||                            \
+-         (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+        (__clang_major__ > 6)) ||                            \
+        (defined(__GNUC__) && __GNUC__ >= 5))
 #include "base/numerics/safe_math_clang_gcc_impl.h"
 #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
--- a/www/chromium/files/patch-base_process_memory.h
+++ b/www/chromium/files/patch-base_process_memory.h
@ -1,6 +1,6 @@
--- base/process/memory.h.orig	2019-03-11 22:00:51 UTC
+--- base/process/memory.h.orig	2019-10-21 19:06:18 UTC
 +++ base/process/memory.h
-@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
+@@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
 // Crash reporting classifies such crashes as OOM.
 BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
 
--- a/www/chromium/files/patch-base_process_memory__unittest.cc
+++ b/www/chromium/files/patch-base_process_memory__unittest.cc
@ -1,4 +1,4 @@
--- base/process/memory_unittest.cc.orig	2019-03-11 22:00:51 UTC
+--- base/process/memory_unittest.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/process/memory_unittest.cc
@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) {
 // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
@ -9,7 +9,7 @@
     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 
 namespace {
-@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
+@@ -527,5 +527,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
   EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
   EXPECT_TRUE(value_ == nullptr);
 }
--- a/www/chromium/files/patch-base_process_process__handle.cc
+++ b/www/chromium/files/patch-base_process_process__handle.cc
@ -1,11 +1,11 @@
--- base/process/process_handle.cc.orig	2019-03-11 22:00:51 UTC
+--- base/process/process_handle.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/process/process_handle.cc
-@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() {
-   return g_unique_id;
+@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() {
+              : UniqueProcId(GetCurrentProcId());
 }
 
 -#if defined(OS_LINUX) || defined(OS_AIX)
 +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
 
 void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
-   g_unique_id = MangleProcessId(pid_outside_of_namespace);
+   DCHECK(pid_outside_of_namespace != kNullProcessId);
--- a/www/chromium/files/patch-base_process_process__handle.h
+++ b/www/chromium/files/patch-base_process_process__handle.h
@ -1,8 +1,8 @@
--- base/process/process_handle.h.orig	2019-03-11 22:00:51 UTC
+--- base/process/process_handle.h.orig	2019-10-21 19:06:18 UTC
 +++ base/process/process_handle.h
-@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
- // a process's PID.
- BASE_EXPORT uint32_t GetUniqueIdForProcess();
+@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
+ // processes may be reused.
+ BASE_EXPORT UniqueProcId GetUniqueIdForProcess();
 
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@ -1,4 +1,4 @@
--- base/process/process_metrics.h.orig	2019-07-24 18:58:02 UTC
+--- base/process/process_metrics.h.orig	2019-10-21 19:06:18 UTC
 +++ base/process/process_metrics.h
@@ -41,7 +41,7 @@ namespace base {
 // Full declaration is in process_metrics_iocounters.h.
@ -27,7 +27,7 @@
   // Resident Set Size is a Linux/Android specific memory concept. Do not
   // attempt to extend this to other platforms.
   BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics {
+@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics {
   int GetOpenFdSoftLimit() const;
 #endif  // defined(OS_POSIX)
 
@ -44,7 +44,7 @@
 
   // Returns total memory usage of malloc.
   size_t GetMallocUsage();
-@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics {
   ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
 #endif  // !defined(OS_MACOSX) || defined(OS_IOS)
 
@ -53,7 +53,7 @@
   int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
 #endif
 #if defined(OS_MACOSX)
-@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics {
   // Number of bytes transferred to/from disk in bytes.
   uint64_t last_cumulative_disk_usage_ = 0;
 
@ -62,7 +62,7 @@
   // Same thing for idle wakeups.
   TimeTicks last_idle_wakeups_time_;
   uint64_t last_absolute_idle_wakeups_;
-@@ -292,7 +292,7 @@ BASE_EXPORT size_t GetMaxFds();
+@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit();
 BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors);
 #endif  // defined(OS_POSIX)
 
@ -71,7 +71,7 @@
     defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA)
 // Data about system-wide memory consumption. Values are in KB. Available on
 // Windows, Mac, Linux, Android and Chrome OS.
-@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int avail_phys = 0;
 #endif
 
@ -80,7 +80,7 @@
   // This provides an estimate of available memory as described here:
   // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
   // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -340,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int swap_free = 0;
 #endif
 
@ -89,7 +89,7 @@
     defined(OS_FUCHSIA)
   int buffers = 0;
   int cached = 0;
-@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
   int inactive_file = 0;
   int dirty = 0;
   int reclaimable = 0;
@ -98,7 +98,7 @@
         // defined(OS_FUCHSIA)
 
 #if defined(OS_CHROMEOS)
-@@ -376,10 +376,10 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB {
 // Exposed for memory debugging widget.
 BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
 
@ -111,7 +111,7 @@
 // Parse the data found in /proc/<pid>/stat and return the sum of the
 // CPU-related ticks.  Returns -1 on parse error.
 // Exposed for testing.
-@@ -452,7 +452,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
+@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
 // Returns the amount of time spent in user space since boot across all CPUs.
 BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot();
 
@ -120,7 +120,7 @@
 
 #if defined(OS_CHROMEOS)
 // Data from files in directory /sys/block/zram0 about ZRAM usage.
-@@ -547,7 +547,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics {
   FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
 
   size_t committed_memory_;
--- a/www/chromium/files/patch-base_process_processmetricsposix.cc
+++ b/www/chromium/files/patch-base_process_processmetricsposix.cc
@ -1,6 +1,6 @@
--- base/process/process_metrics_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/process/process_metrics_posix.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/process/process_metrics_posix.cc
-@@ -19,6 +19,8 @@
+@@ -20,6 +20,8 @@
 
 #if defined(OS_MACOSX)
 #include <malloc/malloc.h>
@ -9,7 +9,7 @@
 #else
 #include <malloc.h>
 #endif
-@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -117,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() {
 #else
   return minfo.hblkhd + minfo.arena;
 #endif
--- a/www/chromium/files/patch-base_samplingheapprofiler_samplingheapprofiler.cc
+++ b/www/chromium/files/patch-base_samplingheapprofiler_samplingheapprofiler.cc
@ -1,6 +1,6 @@
--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2019-07-24 18:58:02 UTC
+--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/sampling_heap_profiler/sampling_heap_profiler.cc
-@@ -30,6 +30,10 @@
+@@ -29,6 +29,10 @@
 #include <sys/prctl.h>
 #endif
 
@ -11,7 +11,7 @@
 #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
     defined(OFFICIAL_BUILD)
 #include "base/trace_event/cfi_backtrace_android.h"
-@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() {
+@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() {
 #elif defined(OS_MACOSX)
   int err = pthread_getname_np(pthread_self(), name, kBufferLen);
   if (err == 0 && *name != '\0')
--- a/www/chromium/files/patch-base_syslog__logging.cc
+++ b/www/chromium/files/patch-base_syslog__logging.cc
@ -1,18 +1,18 @@
--- base/syslog_logging.cc.orig	2019-05-01 17:21:47 UTC
+--- base/syslog_logging.cc.orig	2019-10-21 19:06:18 UTC
 +++ base/syslog_logging.cc
-@@ -9,7 +9,7 @@
- #include "base/bind.h"
- #include "base/callback_helpers.h"
+@@ -14,7 +14,7 @@
 #include "base/debug/stack_trace.h"
+ #include "base/strings/string_util.h"
+ #include "base/win/win_util.h"
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
 // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
 // base::LOG_INFO, base::LOG_WARNING.
 #include <syslog.h>
-@@ -94,7 +94,7 @@ EventLogMessage::~EventLogMessage() {
-                     1, 0, strings, nullptr)) {
-     stream() << " !!NOT ADDED TO EVENTLOG!!";
-   }
+@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() {
+ 
+   if (user_sid != nullptr)
+     ::LocalFree(user_sid);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
   const char kEventSource[] = "chrome";
--- a/www/chromium/files/patch-base_system_sysinfofreebsd.cc
+++ b/www/chromium/files/patch-base_system_sysinfofreebsd.cc
@ -1,6 +1,6 @@
--- base/system/sys_info_freebsd.cc.orig	2019-03-11 22:00:51 UTC
+--- base/system/sys_info_freebsd.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/system/sys_info_freebsd.cc
-@@ -13,26 +13,58 @@
+@@ -13,26 +13,46 @@
 namespace base {
 
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@ -45,8 +45,8 @@
   }
 -  return static_cast<uint64_t>(limit);
 +  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
-+}
-+
+ }
+ 
 +// static
 +std::string SysInfo::CPUModelName() {
 +  int mib[] = { CTL_HW, HW_MODEL };
@ -56,16 +56,4 @@
 +    return name;
 +  return std::string();
 +}
-+
-+int SysInfo::NumberOfProcessors() {
-+  int mib[] = { CTL_HW, HW_NCPU };
-+  int ncpu;
-+  size_t size = sizeof(ncpu);
-+  if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) {
-+    NOTREACHED();
-+    return 1;
-+  }
-+  return ncpu;
- }
- 
 }  // namespace base
--- a/www/chromium/files/patch-base_system_sysinfoposix.cc
+++ b/www/chromium/files/patch-base_system_sysinfoposix.cc
@ -1,33 +1,6 @@
--- base/system/sys_info_posix.cc.orig	2019-07-24 18:58:02 UTC
+--- base/system/sys_info_posix.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/system/sys_info_posix.cc
-@@ -38,7 +38,7 @@
- 
- namespace {
- 
-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
-+#if !defined(OS_FUCHSIA) && !defined(OS_BSD)
- 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.
-@@ -64,7 +64,7 @@ int NumberOfProcessors() {
- 
- base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
-     Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
-#endif  // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
-+#endif  // !defined(OS_FUCHSIA) && !defined(OS_BSD)
- 
- #if !defined(OS_FUCHSIA)
- int64_t AmountOfVirtualMemory() {
-@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
- 
- namespace base {
- 
-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
-+#if !defined(OS_FUCHSIA) && !defined(OS_BSD)
- int SysInfo::NumberOfProcessors() {
-   return g_lazy_number_of_processors.Get().value();
- }
-@@ -227,6 +227,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
     arch = "x86";
   } else if (arch == "amd64") {
     arch = "x86_64";
--- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig	2019-03-11 22:00:51 UTC
+--- base/test/launcher/test_launcher.cc.orig	2019-09-09 21:55:05 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_POSIX)
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@ -1,6 +1,6 @@
--- base/threading/platform_thread.h.orig	2019-03-11 22:00:51 UTC
+--- base/threading/platform_thread.h.orig	2019-10-21 19:06:18 UTC
 +++ base/threading/platform_thread.h
-@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread {
+@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread {
 
   static ThreadPriority GetCurrentThreadPriority();
 
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@ -1,6 +1,6 @@
--- build/config/BUILD.gn.orig	2019-07-24 18:58:02 UTC
+--- build/config/BUILD.gn.orig	2019-10-21 19:06:18 UTC
 +++ build/config/BUILD.gn
-@@ -161,7 +161,7 @@ config("debug") {
+@@ -149,7 +149,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?
-@@ -259,9 +259,7 @@ config("default_libs") {
+@@ -247,9 +247,7 @@ config("default_libs") {
     ]
   } else if (is_linux) {
     libs = [
@ -19,7 +19,7 @@
     ]
   }
 }
-@@ -349,7 +347,7 @@ config("executable_config") {
+@@ -337,7 +335,7 @@ config("executable_config") {
       "//build/config/ios:ios_dynamic_flags",
       "//build/config/ios:ios_executable_flags",
     ]
--- a/www/chromium/files/patch-build_config_allocator.gni
+++ b/www/chromium/files/patch-build_config_allocator.gni
@ -1,20 +0,0 @@
--- build/config/allocator.gni.orig	2019-04-30 22:22:28 UTC
-+++ build/config/allocator.gni
-@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
- 
- # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
- if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
-    is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
-+    is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
-   _default_allocator = "none"
- } else {
-   _default_allocator = "tcmalloc"
-@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
- # against the debug CRT with "is_nacl=false".
- if ((is_linux || is_android || is_mac ||
-      (is_win && !is_component_build && !is_debug)) && !is_asan && !is_hwasan &&
-    !is_lsan && !is_tsan && !is_msan) {
-+    !is_lsan && !is_tsan && !is_msan && !is_bsd) {
-   _default_use_allocator_shim = true
- } else {
-   _default_use_allocator_shim = false
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig	2019-07-24 18:58:02 UTC
+--- build/config/compiler/BUILD.gn.orig	2019-10-21 19:06:18 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -54,7 +54,7 @@ declare_args() {
+@@ -57,7 +57,7 @@ declare_args() {
   # only two architectures that are currently checked in). Turn this off when
   # you are using a custom toolchain and need to control -B in cflags.
   linux_use_bundled_binutils =
@ -9,16 +9,16 @@
       (current_cpu == "x64" || current_cpu == "x86")
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                               root_build_dir)
-@@ -269,7 +269,7 @@ config("compiler") {
+@@ -288,7 +288,7 @@ config("compiler") {
+ 
     # Linker warnings.
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
-         !(is_android && use_order_profiling) && !is_mac && !is_ios &&
-        current_os != "aix") {
-+        current_os != "aix" && !is_bsd) {
+-        !is_mac && !is_ios && current_os != "aix") {
+        !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
-       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
-       # crbug.com/485542
-@@ -363,7 +363,7 @@ config("compiler") {
+       ldflags += [ "-Wl,--fatal-warnings" ]
+     }
+@@ -383,7 +383,7 @@ config("compiler") {
 
     # Compiler instrumentation can introduce dependencies in DSOs to symbols in
     # the executable they are loaded into, so they are unresolved at link-time.
@ -27,7 +27,7 @@
       ldflags += [
         "-Wl,-z,defs",
         "-Wl,--as-needed",
-@@ -471,7 +471,7 @@ config("compiler") {
+@@ -483,7 +483,7 @@ config("compiler") {
     }
   }
 
@ -36,7 +36,7 @@
     cflags += [ "-fcrash-diagnostics-dir=" +
                 rebase_path("//tools/clang/crashreports", root_build_dir) ]
 
-@@ -741,7 +741,7 @@ config("compiler_cpu_abi") {
+@@ -753,7 +753,7 @@ config("compiler_cpu_abi") {
         cflags += [ "-mtune=$arm_tune" ]
       }
     } else if (current_cpu == "arm64") {
@ -45,7 +45,7 @@
         cflags += [ "--target=aarch64-linux-gnu" ]
         ldflags += [ "--target=aarch64-linux-gnu" ]
       }
-@@ -1102,7 +1102,7 @@ config("compiler_deterministic") {
+@@ -1104,7 +1104,7 @@ config("compiler_deterministic") {
       "-Xclang",
       ".",
     ]
@ -54,7 +54,7 @@
       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
     }
-@@ -1492,7 +1492,7 @@ config("default_warnings") {
+@@ -1493,7 +1493,7 @@ config("default_warnings") {
         cflags += [ "-Wno-nonportable-include-path" ]
       }
 
@ -63,7 +63,7 @@
         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
         # recognize.
         cflags += [
-@@ -1701,7 +1701,7 @@ config("thin_archive") {
+@@ -1722,7 +1722,7 @@ config("thin_archive") {
   # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
   # have a "thin archive" mode (it does accept -T, but it means truncating
   # archive names to 16 characters, which is not what we want).
@ -72,7 +72,7 @@
     arflags = [ "-T" ]
   } else if (is_win && use_lld) {
     arflags = [ "/llvmlibthin" ]
-@@ -2288,7 +2288,7 @@ config("symbols") {
+@@ -2292,7 +2292,7 @@ config("symbols") {
     # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
     # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
     if (!is_nacl || is_clang) {
@ -81,7 +81,7 @@
     }
 
     if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2309,7 +2309,7 @@ config("symbols") {
+@@ -2313,7 +2313,7 @@ config("symbols") {
     # DWARF info may be corrupt; offsets in a range list entry are in different
     # sections" there.  Maybe just a bug in nacl_switch_32.S.
     if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
--- a/www/chromium/files/patch-build_config_compiler_compiler.gni
+++ b/www/chromium/files/patch-build_config_compiler_compiler.gni
@ -1,6 +1,6 @@
--- build/config/compiler/compiler.gni.orig	2019-07-24 18:58:02 UTC
+--- build/config/compiler/compiler.gni.orig	2019-10-21 19:06:18 UTC
 +++ build/config/compiler/compiler.gni
-@@ -179,7 +179,7 @@ declare_args() {
+@@ -188,7 +188,7 @@ declare_args() {
 declare_args() {
   # Whether to use the gold linker from binutils instead of lld or bfd.
   use_gold =
--- a/www/chromium/files/patch-build_config_features.gni
+++ b/www/chromium/files/patch-build_config_features.gni
@ -1,7 +1,7 @@
--- build/config/features.gni.orig	2019-06-04 18:55:15 UTC
+--- build/config/features.gni.orig	2019-10-21 19:06:18 UTC
 +++ build/config/features.gni
-@@ -45,7 +45,7 @@ declare_args() {
-   }
+@@ -26,7 +26,7 @@ declare_args() {
+   proprietary_codecs = is_chrome_branded || is_chromecast
 
   # libudev usage. This currently only affects the content layer.
 -  use_udev = is_linux && !is_chromecast
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@ -1,4 +1,4 @@
--- build/toolchain/gcc_toolchain.gni.orig	2019-06-04 18:55:15 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2019-10-21 19:06:18 UTC
 +++ build/toolchain/gcc_toolchain.gni
@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") {
   enable_resource_whitelist_generation = false
@ -12,7 +12,7 @@
 # This template defines a toolchain for something that works like gcc
 # (including clang).
 #
-@@ -617,13 +622,23 @@ template("clang_toolchain") {
+@@ -589,13 +594,23 @@ template("clang_toolchain") {
   }
 
   gcc_toolchain(target_name) {
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig	2019-07-24 18:58:02 UTC
+--- cc/BUILD.gn.orig	2019-10-21 19:06:18 UTC
 +++ cc/BUILD.gn
-@@ -566,7 +566,7 @@ cc_test_static_library("test_support") {
+@@ -572,7 +572,7 @@ cc_test_static_library("test_support") {
   if (enable_vulkan) {
     deps += [ "//gpu/vulkan/init" ]
   }
@ -9,7 +9,7 @@
     data_deps = [
       "//third_party/mesa_headers",
     ]
-@@ -767,9 +767,6 @@ cc_test("cc_unittests") {
+@@ -776,9 +776,6 @@ cc_test("cc_unittests") {
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",
@ -17,5 +17,5 @@
 -  data_deps = [
 -    "//third_party/mesa_headers",
   ]
- }
 
+   if (enable_vulkan) {
--- a/www/chromium/files/patch-cc_trees_property__tree.cc
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@ -1,6 +1,6 @@
--- cc/trees/property_tree.cc.orig	2019-07-24 18:58:03 UTC
+--- cc/trees/property_tree.cc.orig	2019-10-21 19:06:18 UTC
 +++ cc/trees/property_tree.cc
-@@ -1348,13 +1348,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1278,13 +1278,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
 
   gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
 
--- a/www/chromium/files/patch-chrome_app_chromecontentbrowseroverlaymanifest.cc
+++ b/www/chromium/files/patch-chrome_app_chromecontentbrowseroverlaymanifest.cc
@ -1,6 +1,6 @@
--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig	2019-07-29 18:39:15 UTC
+--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig	2019-10-21 19:06:19 UTC
 +++ chrome/app/chrome_content_browser_overlay_manifest.cc
-@@ -79,7 +79,7 @@
+@@ -69,7 +69,7 @@
 #include "chrome/services/app_service/public/cpp/manifest.h"
 #endif
 
@ -9,7 +9,7 @@
     defined(OS_CHROMEOS)
 #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h"  // nogncheck
 #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -240,7 +240,7 @@ const service_manager::Manifest& GetChromeContentBrows
+@@ -205,7 +205,7 @@ const service_manager::Manifest& GetChromeContentBrows
 #else
                 app_management::mojom::PageHandlerFactory,
 #endif
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@ -1,7 +1,7 @@
--- chrome/app/chrome_main.cc.orig	2019-04-30 22:22:30 UTC
+--- chrome/app/chrome_main.cc.orig	2019-09-09 21:55:07 UTC
 +++ chrome/app/chrome_main.cc
-@@ -94,11 +94,11 @@ int ChromeMain(int argc, const char** argv) {
- #endif
+@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) {
+   MainThreadStackSamplingProfiler scoped_sampling_profiler;
 
   // Chrome-specific process modes.
 -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
--- a/www/chromium/files/patch-chrome_app_chromemaindelegate.cc
+++ b/www/chromium/files/patch-chrome_app_chromemaindelegate.cc
@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig	2019-07-24 18:58:05 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2019-10-21 19:06:19 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -100,7 +100,7 @@
+@@ -99,7 +99,7 @@
 #include "chrome/app/shutdown_signal_handlers_posix.h"
 #endif
 
@ -18,7 +18,7 @@
 #include "base/environment.h"
 #endif
 
-@@ -241,7 +241,7 @@ bool UseHooks() {
+@@ -240,7 +240,7 @@ bool UseHooks() {
 
 #endif  // defined(OS_WIN)
 
@ -27,7 +27,7 @@
 void AdjustLinuxOOMScore(const std::string& process_type) {
   // Browsers and zygotes should still be killable, but killed last.
   const int kZygoteScore = 0;
-@@ -300,7 +300,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
   if (score > -1)
     base::AdjustOOMScore(base::GetCurrentProcId(), score);
 }
@ -36,7 +36,14 @@
 
 // Returns true if this subprocess type needs the ResourceBundle initialized
 // and resources loaded.
-@@ -345,7 +345,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
+   return
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+       // The zygote process opens the resources for the renderers.
+       process_type == service_manager::switches::kZygoteProcess ||
+ #endif
+@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
   return false;
 }
 
@ -45,7 +52,7 @@
 // Show the man page if --help or -h is on the command line.
 void HandleHelpSwitches(const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kHelp) ||
-@@ -355,7 +355,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
     PLOG(FATAL) << "execlp failed";
   }
 }
@ -54,7 +61,7 @@
 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 void SIGTERMProfilingShutdown(int signal) {
-@@ -409,7 +409,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_
   std::string process_type =
       command_line->GetSwitchValueASCII(switches::kProcessType);
 
@ -63,7 +70,7 @@
   // On Linux, Chrome does not support running multiple copies under different
   // DISPLAYs, so the profile directory can be specified in the environment to
   // support the virtual desktop use-case.
-@@ -421,7 +421,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_
       user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
     }
   }
@ -72,7 +79,7 @@
 #if defined(OS_MACOSX)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 #endif  // OS_MAC
-@@ -478,7 +478,7 @@ void InitLogging(const std::string& process_type) {
+@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) {
 void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
   if (!exe_entry_point_ticks.is_null())
     startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@ -81,7 +88,7 @@
   // Record the startup process creation time on supported platforms.
   startup_metric_utils::RecordStartupProcessCreationTime(
       base::Process::Current().CreationTime());
-@@ -650,7 +650,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
     *exit_code = 0;
     return true;  // Got a --version switch; exit with a success error code.
   }
@ -90,7 +97,7 @@
   // This will directly exit if the user asked for help.
   HandleHelpSwitches(command_line);
 #endif
-@@ -674,7 +674,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
@ -99,7 +106,7 @@
   nacl::RegisterPathProvider();
 #endif
 
-@@ -868,7 +868,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
 #if defined(OS_WIN)
   child_process_logging::Init();
 #endif
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@ -1,6 +1,6 @@
--- chrome/app/chromium_strings.grd.orig	2019-07-24 18:58:05 UTC
+--- chrome/app/chromium_strings.grd.orig	2019-10-21 19:06:20 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like
+@@ -694,7 +694,7 @@ Signing in anyway will merge Chromium information like
       </if>
 
       <!-- about:browser-switch strings -->
@ -9,7 +9,7 @@
         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
           Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
         </message>
-@@ -815,7 +815,7 @@ Signing in anyway will merge Chromium information like
+@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like
       </message>
 
       <!-- ProcessSingleton -->
@ -18,7 +18,7 @@
         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
         </message>
-@@ -1074,7 +1074,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like
       </message>
 
       <!-- Plugin Placeholders -->
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@ -1,6 +1,6 @@
--- chrome/app/generated_resources.grd.orig	2019-07-24 18:58:05 UTC
+--- chrome/app/generated_resources.grd.orig	2019-10-21 19:06:20 UTC
 +++ chrome/app/generated_resources.grd
-@@ -4805,7 +4805,7 @@ Keep your key file in a safe place. You will need it t
+@@ -4885,7 +4885,7 @@ Keep your key file in a safe place. You will need it t
       </if>
 
       <!-- chrome://browser-switch strings -->
@ -9,7 +9,7 @@
         <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
           Legacy Browser Support
         </message>
-@@ -6370,7 +6370,7 @@ the Bookmarks menu.">
+@@ -6514,7 +6514,7 @@ the Bookmarks menu.">
         Google Pay
       </message>
 
@ -18,7 +18,7 @@
         <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
           Use system title bar and borders
         </message>
-@@ -7223,7 +7223,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7395,7 +7395,7 @@ Please help our engineers fix this problem. Tell us wh
         Set as default
       </message>
 
--- a/www/chromium/files/patch-chrome_app_googlechromestrings.grd
+++ b/www/chromium/files/patch-chrome_app_googlechromestrings.grd
@ -1,6 +1,6 @@
--- chrome/app/google_chrome_strings.grd.orig	2019-07-24 18:58:05 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2019-10-21 19:06:20 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -702,7 +702,7 @@ Signing in anyway will merge Chrome information like b
+@@ -706,7 +706,7 @@ Signing in anyway will merge Chrome information like b
       </if>
 
       <!-- about:browser-switch strings -->
@ -9,7 +9,7 @@
         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
           Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
         </message>
-@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b
+@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b
       </message>
 
       <!-- ProcessSingleton -->
@ -18,7 +18,7 @@
         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
           The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
         </message>
-@@ -1093,7 +1093,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b
       </message>
 
       <!-- Plugin Placeholders -->
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@ -1,6 +1,6 @@
--- chrome/app/settings_strings.grdp.orig	2019-07-24 18:58:07 UTC
+--- chrome/app/settings_strings.grdp.orig	2019-10-21 19:06:20 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -653,7 +653,7 @@
+@@ -757,7 +757,7 @@
       Themes
     </message>
   </if>
@ -9,7 +9,7 @@
     <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
       GTK+
     </message>
-@@ -667,7 +667,7 @@
+@@ -771,7 +771,7 @@
       Use Classic
     </message>
   </if>
--- a/www/chromium/files/patch-chrome_app_theme_chromeunscaledresources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_chromeunscaledresources.grd
@ -1,4 +1,4 @@
--- chrome/app/theme/chrome_unscaled_resources.grd.orig	2019-07-24 18:58:07 UTC
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig	2019-09-09 21:55:08 UTC
 +++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -18,7 +18,7 @@
         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
@ -9,7 +9,7 @@
           <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
           <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
         </if>
-@@ -100,7 +100,7 @@
+@@ -109,7 +109,7 @@
         <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
         <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
       </if>
--- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
@ -0,0 +1,11 @@
+--- chrome/app/theme/theme_resources.grd.orig	2019-10-30 15:46:23 UTC
+++ chrome/app/theme/theme_resources.grd
+@@ -25,7 +25,7 @@
+       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
+            BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
+            SAME CONDITIONALS. -->
+-      <if expr="is_linux or is_win or chromeos">
+      <if expr="is_posix or is_win or chromeos">
+         <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" />
+       </if>
+       <if expr="toolkit_views and not is_macosx">
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@ -1,6 +1,15 @@
--- chrome/browser/about_flags.cc.orig	2019-07-24 18:58:07 UTC
+--- chrome/browser/about_flags.cc.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/about_flags.cc
-@@ -621,7 +621,7 @@ const FeatureEntry::FeatureVariation
+@@ -162,7 +162,7 @@
+ #include "ui/gl/gl_switches.h"
+ #include "ui/native_theme/native_theme_features.h"
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/allocator/buildflags.h"
+ #endif
+ 
+@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation
          nullptr}};
 #endif  // OS_ANDROID
 
@ -9,7 +18,7 @@
 const FeatureEntry::FeatureParam
     kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = {
         {autofill::features::
-@@ -668,7 +668,7 @@ const FeatureEntry::FeatureVariation
+@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation
              kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard),
          nullptr},
 };
@ -18,7 +27,25 @@
 
 const FeatureEntry::Choice kMemlogModeChoices[] = {
     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
-@@ -776,7 +776,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+      heap_profiling::kMemlogSamplingRate5MB},
+ };
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
+     {"DocumentUseServerScore", "true"},
+     {"DocumentUseClientScore", "false"},
+@@ -854,7 +854,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
+      base::size(kOmniboxDocumentProviderClientScoring), nullptr},
+     {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
+      base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+ const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamNTPOmnibox[] = {
+     {"ZeroSuggestVariant:7:*", ZeroSuggestProvider::kRemoteNoUrlVariant}};
+@@ -932,7 +932,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
     {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),
      nullptr}};
 
@ -27,16 +54,16 @@
     defined(OS_CHROMEOS)
 const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = {
     {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}};
-@@ -792,7 +792,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU
+@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU
     {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr},
     {"Button_GM2", kTranslateBubbleUIButtonGM2,
      base::size(kTranslateBubbleUIButton), nullptr}};
 -#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS
 +#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS
 
- const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin0px[] = {
-     {OmniboxFieldTrial::kUIVerticalMarginParam, "0"}};
-@@ -1567,13 +1567,13 @@ const FeatureEntry kFeatureEntries[] = {
+ const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
+     {security_state::features::kMarkHttpAsFeatureParameterName,
+@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kCloudPrintXpsDescription, kOsWin,
      SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
 #endif  // OS_WIN
@ -52,7 +79,7 @@
     {"enable-webgl-draft-extensions",
      flag_descriptions::kWebglDraftExtensionsName,
      flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -1614,14 +1614,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = {
                                     "OverrideTranslateTriggerInIndia")},
 #endif  // OS_ANDROID
 
@ -61,15 +88,33 @@
     defined(OS_CHROMEOS)
     {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName,
      flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUI,
+      FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi,
                                     kTranslateBubbleUIVariations,
                                     "UseButtonTranslateBubbleUI")},
 -#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS
-+#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS
+#endif  // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD
 
 #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
     {"enable-native-notifications",
-@@ -1762,7 +1762,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCrostiniBackupDescription, kOsCrOS,
+      FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)},
+ #endif  // OS_CHROMEOS
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+     {"terminal-system-app", flag_descriptions::kTerminalSystemAppName,
+      flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kTerminalSystemApp)},
+@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux,
+      FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)},
+ #endif  // BUILDFLAG(USE_TCMALLOC)
+-#endif  // OS_CHROMEOS || OS_LINUX
+#endif  // OS_CHROMEOS || OS_LINUX || defined(OS_BSD)
+ #if defined(OS_ANDROID)
+     {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
+      flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
+@@ -2075,7 +2075,7 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          previews::features::kHTTPSServerPreviewsUsingURLLoader)},
 #endif  // OS_ANDROID
@ -78,22 +123,22 @@
     {"enable-save-data", flag_descriptions::kEnableSaveDataName,
      flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(
-@@ -2091,12 +2091,12 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
+@@ -2427,12 +2427,12 @@ const FeatureEntry kFeatureEntries[] = {
+                                     "AndroidNightMode")},
 #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
 #endif  // OS_ANDROID
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     {"passwords-migrate-linux-to-login-db",
-      flag_descriptions::kPasswordsMigrateLinuxToLoginDBName,
-      flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux,
-      FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)},
+     {"enable-dbus-and-x11-status-icons",
+      flag_descriptions::kEnableDbusAndX11StatusIconsName,
+      flag_descriptions::kEnableDbusAndX11StatusIconsDescription, kOsLinux,
+      FEATURE_VALUE_TYPE(features::kEnableDbusAndX11StatusIcons)},
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
     {"enable-experimental-accessibility-features",
      flag_descriptions::kExperimentalAccessibilityFeaturesName,
      flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -2423,7 +2423,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
 
@ -102,16 +147,16 @@
     {"omnibox-experimental-keyword-mode",
      flag_descriptions::kOmniboxExperimentalKeywordModeName,
      flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2470,7 +2470,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
-      flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
+@@ -2806,7 +2806,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kDocumentProvider,
+                                     kOmniboxDocumentProviderVariations,
+                                     "OmniboxBundledExperimentV1")},
 -#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
 
     {"enable-speculative-service-worker-start-on-query-input",
      flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -2696,7 +2696,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3026,13 +3026,13 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kClickToOpenPDFDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
 
@ -120,50 +165,48 @@
     {"direct-manipulation-stylus",
      flag_descriptions::kDirectManipulationStylusName,
      flag_descriptions::kDirectManipulationStylusDescription,
-@@ -2707,7 +2707,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kShowManagedUiDescription,
-      kOsWin | kOsMac | kOsLinux | kOsCrOS,
-      FEATURE_VALUE_TYPE(features::kShowManagedUi)},
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)},
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 #if !defined(OS_ANDROID)
     {"chrome-colors", flag_descriptions::kChromeColorsName,
-@@ -3514,7 +3514,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
- #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
+@@ -3729,7 +3729,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(kClickToCallReceiver)},
+ #endif  // defined(OS_ANDROID)
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-     {"autofill-always-show-server-cards-in-sync-transport",
-      flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
-      flag_descriptions::
-@@ -3522,7 +3522,7 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsMac | kOsWin | kOsLinux,
-      FEATURE_VALUE_TYPE(
-          autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+     {"click-to-call-context-menu-selected-text",
+      flag_descriptions::kClickToCallContextMenuForSelectedTextName,
+@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"click-to-call-ui", flag_descriptions::kClickToCallUIName,
+      flag_descriptions::kClickToCallUIDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(kClickToCallUI)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
 
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
-     {"enable-custom-mac-paper-sizes",
-@@ -3562,13 +3562,13 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
- #endif  // OS_CHROMEOS
+     {"shared-clipboard-receiver",
+@@ -3859,13 +3859,13 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
+ #endif
 
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-     {"autofill-settings-split-by-card-type",
-      flag_descriptions::kAutofillSettingsSplitByCardTypeName,
-      flag_descriptions::kAutofillSettingsSplitByCardTypeDescription,
-      kOsMac | kOsWin | kOsLinux,
-      FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)},
-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+     {"enable-reopen-tab-in-product-help",
+      flag_descriptions::kReopenTabInProductHelpName,
+      flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
 
- #if !defined(OS_ANDROID)
-     {"hardware-media-key-handling",
-@@ -3895,7 +3895,7 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-audio-focus-enforcement",
+@@ -4245,7 +4245,7 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll,
      FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)},
 
@ -172,7 +215,7 @@
     {"enable-autofill-save-credit-card-uses-improved-messaging",
      flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName,
      flag_descriptions::
-@@ -3905,7 +3905,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4255,7 +4255,7 @@ const FeatureEntry kFeatureEntries[] = {
          autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging,
          kAutofillSaveCreditCardUsesImprovedMessagingVariations,
          "AutofillSaveCreditCardUsesImprovedMessaging")},
@ -180,4 +223,63 @@
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_CHROMEOS)
-     {"smart-dim-model-v3", flag_descriptions::kSmartDimModelV3Name,
+     {"release-notes", flag_descriptions::kReleaseNotesName,
+@@ -4337,12 +4337,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
+      FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
+      flag_descriptions::kGlobalMediaControlsDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(media::kGlobalMediaControls)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN)
+     {"win-use-native-spellchecker",
+@@ -4355,12 +4355,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSafetyTipDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kSafetyTipUI)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"animated-avatar-button", flag_descriptions::kAnimatedAvatarButtonName,
+      flag_descriptions::kAnimatedAvatarButtonDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kAnimatedAvatarButton)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_CHROMEOS)
+     {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName,
+@@ -4484,12 +4484,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kBundledHTTPExchangesDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kBundledHTTPExchanges)},
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"profile-menu-revamp", flag_descriptions::kProfileMenuRevampName,
+      flag_descriptions::kProfileMenuRevampDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kProfileMenuRevamp)},
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+     {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName,
+      flag_descriptions::kPasswordLeakDetectionDescription, kOsAll,
+@@ -4543,11 +4543,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)},
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     {"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName,
+      flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)},
+-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
+ 
+ #if defined(OS_ANDROID)
+     {"enable-clipboard-provider-text-suggestions",
--- a/www/chromium/files/patch-chrome_browser_autocomplete_chromeautocompletescheme__classifier.cc
+++ b/www/chromium/files/patch-chrome_browser_autocomplete_chromeautocompletescheme__classifier.cc
@ -1,4 +1,4 @@
--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2019-06-04 18:55:16 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2019-09-09 21:55:09 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
       return metrics::OmniboxInputType::QUERY;
@ -9,7 +9,7 @@
       // Linux impl of GetApplicationNameForProtocol doesn't distinguish
       // between URL schemes with handers and those without. This will
       // make the default behaviour be search on Linux.
-       return metrics::OmniboxInputType::INVALID;
+       return metrics::OmniboxInputType::EMPTY;
 -#endif // defined(OS_LINUX)
 +#endif // defined(OS_LINUX) || defined(OS_BSD)
       // If block state is unknown, check if there is an application registered
--- a/www/chromium/files/patch-chrome_browser_background_backgroundmodemanager.cc
+++ b/www/chromium/files/patch-chrome_browser_background_backgroundmodemanager.cc
@ -0,0 +1,11 @@
+--- chrome/browser/background/background_mode_manager.cc.orig	2019-10-21 19:06:20 UTC
+++ chrome/browser/background/background_mode_manager.cc
+@@ -769,7 +769,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+     return gfx::ImageSkia();
+ 
+   return family->CreateExact(size).AsImageSkia();
+-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
+   return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+       IDR_PRODUCT_LOGO_128);
+ #elif defined(OS_MACOSX)
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@ -0,0 +1,14 @@
+--- chrome/browser/browser_features.cc.orig	2019-10-30 15:46:57 UTC
+++ chrome/browser/browser_features.cc
+@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{
+     "DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ const base::Feature kSyncClipboardServiceFeature{
+     "SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT};
+-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
+ 
+ }  // namespace features
--- a/www/chromium/files/patch-chrome_browser_browser__features.h
+++ b/www/chromium/files/patch-chrome_browser_browser__features.h
@ -0,0 +1,14 @@
+--- chrome/browser/browser_features.h.orig	2019-10-30 15:47:15 UTC
+++ chrome/browser/browser_features.h
+@@ -20,9 +20,9 @@ namespace features {
+ extern const base::Feature kDoubleTapToZoomInTabletMode;
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ extern const base::Feature kSyncClipboardServiceFeature;
+-#endif  // OS_WIN || OS_MACOSX || OS_LINUX
+#endif  // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
+ 
+ }  // namespace features
+ 
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@ -1,6 +1,6 @@
--- chrome/browser/browser_resources.grd.orig	2019-07-24 18:58:07 UTC
+--- chrome/browser/browser_resources.grd.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -77,7 +77,7 @@
+@@ -106,7 +106,7 @@
         <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
         <include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\performance_manager\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
       </if>
@ -9,8 +9,8 @@
         <include name="IDR_BROWSER_SWITCH_APP_HTML" file="resources\browser_switch\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_BROWSER_SWITCH_APP_JS" file="resources\browser_switch\app.js" compress="gzip" type="BINDATA" />
         <include name="IDR_BROWSER_SWITCH_PROXY_HTML" file="resources\browser_switch\browser_switch_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
-@@ -666,7 +666,7 @@
-         <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
+@@ -561,7 +561,7 @@
+         <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />
       </if>
       <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
 -      <if expr="is_android or is_linux">
--- a/www/chromium/files/patch-chrome_browser_chromebrowsermain.cc
+++ b/www/chromium/files/patch-chrome_browser_chromebrowsermain.cc
@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig	2019-07-24 18:58:07 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -220,9 +220,9 @@
+@@ -222,9 +222,9 @@
 #include "components/arc/metrics/stability_metrics_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
@ -12,7 +12,7 @@
 
 #if defined(OS_LINUX)
 #include "components/crash/content/app/breakpad_linux.h"
-@@ -260,7 +260,7 @@
+@@ -261,7 +261,7 @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -21,7 +21,7 @@
 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
 #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
 #endif
-@@ -1079,7 +1079,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1075,7 +1075,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
       AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
     }
 
@ -30,7 +30,7 @@
     // Create directory for user-level Native Messaging manifest files. This
     // makes it less likely that the directory will be created by third-party
     // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1088,14 +1088,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1084,14 +1084,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                  &user_native_messaging_dir));
     if (!base::PathExists(user_native_messaging_dir))
       base::CreateDirectory(user_native_messaging_dir);
@ -48,7 +48,7 @@
 
 #if defined(OS_MACOSX)
   // Get the Keychain API to register for distributed notifications on the main
-@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   }
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -57,15 +57,15 @@
   metrics::DesktopSessionDurationTracker::Initialize();
   ProfileActivityMetricsRecorder::Initialize();
 #endif
-@@ -1291,6 +1291,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1280,6 +1280,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
       base::TimeDelta::FromMinutes(1));
 
 #if !defined(OS_ANDROID)
 +#if !defined(OS_BSD)
   if (base::FeatureList::IsEnabled(features::kWebUsb)) {
     web_usb_detector_.reset(new WebUsbDetector());
-     BrowserThread::PostAfterStartupTask(
-@@ -1299,6 +1300,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+     base::PostTask(
+@@ -1288,6 +1289,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
         base::BindOnce(&WebUsbDetector::Initialize,
                        base::Unretained(web_usb_detector_.get())));
   }
--- a/www/chromium/files/patch-chrome_browser_chromebrowsermain__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chromebrowsermain__linux.cc
@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig	2019-06-04 18:55:16 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
 void ChromeBrowserMainPartsLinux::PostProfileInit() {
   ChromeBrowserMainPartsPosix::PostProfileInit();
 
@ -16,7 +16,7 @@
   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
 #endif
 
-@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
 }
 
 void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
--- a/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.cc
@ -1,7 +1,7 @@
--- chrome/browser/chrome_content_browser_client.cc.orig	2019-07-24 18:58:07 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -429,7 +429,7 @@
- #include "chromeos/services/secure_channel/secure_channel_service.h"
+@@ -403,7 +403,7 @@
+ #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
 -#elif defined(OS_LINUX)
@ -9,7 +9,7 @@
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "base/android/application_status_listener.h"
-@@ -484,7 +484,7 @@
+@@ -459,7 +459,7 @@
 #endif  //  !defined(OS_ANDROID)
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -18,7 +18,7 @@
 #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
 #endif
 
-@@ -510,7 +510,7 @@
+@@ -485,7 +485,7 @@
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
 
@ -27,7 +27,7 @@
 #if defined(USE_X11)
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h"
 #else
-@@ -1250,7 +1250,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1199,7 +1199,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
 #elif defined(OS_CHROMEOS)
   main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
       parameters, startup_data_);
@ -36,7 +36,7 @@
   main_parts =
       std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
 #elif defined(OS_ANDROID)
-@@ -1276,7 +1276,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1225,7 +1225,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
     // Construct additional browser parts. Stages are called in the order in
     // which they are added.
 #if defined(TOOLKIT_VIEWS)
@ -45,7 +45,7 @@
 #if defined(USE_X11)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11());
 #else
-@@ -2093,7 +2093,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2028,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
     command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                     client_info->client_id);
   }
@ -54,16 +54,16 @@
 #if defined(OS_ANDROID)
   bool enable_crash_reporter = true;
 #else
-@@ -2318,7 +2318,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
-       process_type,
-       command_line);
+@@ -2266,7 +2266,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+   StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
+       process_type, command_line);
 
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
   // Processes may only query perf_event_open with the BPF sandbox disabled.
   if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
       command_line->HasSwitch(service_manager::switches::kNoSandbox)) {
-@@ -3660,7 +3660,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3574,7 +3574,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
   }
 }
 
@ -72,7 +72,7 @@
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-@@ -4362,7 +4362,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4244,7 +4244,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
   }
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -81,12 +81,3 @@
   std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle =
       browser_switcher::BrowserSwitcherNavigationThrottle ::
           MaybeCreateThrottleFor(handle);
-@@ -5205,7 +5205,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco
- std::unique_ptr<content::OverlayWindow>
- ChromeContentBrowserClient::CreateWindowForPictureInPicture(
-     content::PictureInPictureWindowController* controller) {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
-     defined(OS_CHROMEOS)
-   // Note: content::OverlayWindow::Create() is defined by platform-specific
-   // implementation in chrome/browser/ui/views. This layering hack, which goes
--- a/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.h
@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig	2019-07-24 18:58:07 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2019-10-21 19:06:20 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -380,12 +380,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -360,12 +360,12 @@ class ChromeContentBrowserClient : public content::Con
   void OverridePageVisibilityState(
       content::RenderFrameHost* render_frame_host,
       content::PageVisibilityState* visibility_state) override;
@ -13,5 +13,5 @@
 -#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 +#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
 #if defined(OS_WIN)
-   bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override;
-   base::string16 GetAppContainerSidForSandboxType(
+   bool PreSpawnRenderer(sandbox::TargetPolicy* policy,
+                         RendererSpawnFlags flags) override;
--- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocolhandlerregistry.cc
+++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocolhandlerregistry.cc
@ -1,6 +1,6 @@
--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig	2019-03-17 19:35:08 UTC
+--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/custom_handlers/protocol_handler_registry.cc
-@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler(
+@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler(
 // If true default protocol handlers will be removed if the OS level
 // registration for a protocol is no longer Chrome.
 bool ShouldRemoveHandlersNotInOS() {
--- a/www/chromium/files/patch-chrome_browser_devtools_devtoolseyedropper.cc
+++ b/www/chromium/files/patch-chrome_browser_devtools_devtoolseyedropper.cc
@ -1,6 +1,6 @@
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2019-09-09 21:55:09 UTC
 +++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {
 // magnified projection only with centered hotspot.
 // Mac Retina requires cursor to be > 120px in order to render smoothly.
 
--- a/www/chromium/files/patch-chrome_browser_download_chromedownloadmanager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chromedownloadmanager__delegate.cc
@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1237,7 +1237,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1257,7 +1257,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
         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
-@@ -1267,7 +1267,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1287,7 +1287,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
 
 bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
     const base::FilePath& path) {
--- a/www/chromium/files/patch-chrome_browser_download_downloaditemmodel.cc
+++ b/www/chromium/files/patch-chrome_browser_download_downloaditemmodel.cc
@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/download/download_item_model.cc
-@@ -560,7 +560,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -565,7 +565,7 @@ bool DownloadItemModel::IsCommandChecked(
       return download_->GetOpenWhenComplete() ||
              download_crx_util::IsExtensionDownload(*download_);
     case DownloadCommands::ALWAYS_OPEN_TYPE:
@ -9,7 +9,7 @@
       if (download_commands->CanOpenPdfInSystemViewer()) {
         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
         return prefs->ShouldOpenPdfInSystemReader();
-@@ -597,7 +597,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -602,7 +602,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
       bool is_checked = IsCommandChecked(download_commands,
                                          DownloadCommands::ALWAYS_OPEN_TYPE);
       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@ -1,6 +1,6 @@
--- chrome/browser/extensions/BUILD.gn.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1135,6 +1135,12 @@ jumbo_static_library("extensions") {
+@@ -1128,6 +1128,12 @@ jumbo_static_library("extensions") {
     deps += [ "//chrome/common:service_process_mojom" ]
   }
 
--- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
-@@ -53,7 +53,11 @@
+@@ -54,7 +54,11 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@ -1,15 +1,15 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -128,7 +128,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
-       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+@@ -155,7 +155,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
   (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+ 
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
       settings_api::PrefType::PREF_TYPE_BOOLEAN;
 #endif
-@@ -138,7 +138,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -165,7 +165,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
   // Appearance settings.
   (*s_whitelist)[::prefs::kCurrentThemeID] =
       settings_api::PrefType::PREF_TYPE_STRING;
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtcloggingprivate_webrtcloggingprivate__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtcloggingprivate_webrtcloggingprivate__api.cc
@ -1,4 +1,4 @@
--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2019-10-21 19:06:21 UTC
 +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -29,7 +29,7 @@
 #include "extensions/browser/process_manager.h"
@ -18,7 +18,7 @@
   if (extension) {
     enabled_by_permissions =
         extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -609,7 +609,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
 }
 
 bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() {
@ -27,7 +27,7 @@
   // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
   // this function shouldn't be called by a component extension on behalf of
   // some web code. It returns a DirectoryEntry for use directly in the calling
-@@ -633,11 +633,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run
+@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run
           &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback,
           this));
   return true;
--- a/www/chromium/files/patch-chrome_browser_extensions_bookmarkappextension__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_bookmarkappextension__util.cc
@ -1,11 +0,0 @@
--- chrome/browser/extensions/bookmark_app_extension_util.cc.orig	2019-06-04 18:55:17 UTC
-+++ chrome/browser/extensions/bookmark_app_extension_util.cc
-@@ -34,7 +34,7 @@ namespace {
- 
- #if !defined(OS_CHROMEOS)
- bool CanOsAddDesktopShortcuts() {
-#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-   return true;
- #else
-   return false;
--- a/www/chromium/files/patch-chrome_browser_extensions_browsercontextkeyedservicefactories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browsercontextkeyedservicefactories.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2019-09-09 21:55:09 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
 #include "chrome/browser/chromeos/extensions/input_method_api.h"
 #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
 
-@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -94,7 +94,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
 #if defined(OS_CHROMEOS)
   extensions::InputImeAPI::GetFactoryInstance();
   extensions::InputMethodAPI::GetFactoryInstance();
--- a/www/chromium/files/patch-chrome_browser_extensions_externalproviderimpl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_externalproviderimpl.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -755,7 +755,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -765,7 +765,7 @@ void ExternalProviderImpl::CreateExternalProviders(
     chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader);
     provider_list->push_back(std::move(demo_apps_provider));
   }
@ -8,13 +8,13 @@
 +#elif defined(OS_LINUX) || defined(OS_BSD)
   provider_list->push_back(std::make_unique<ExternalProviderImpl>(
       service,
-       new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
-@@ -782,7 +782,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+       base::MakeRefCounted<ExternalPrefLoader>(
+@@ -793,7 +793,7 @@ void ExternalProviderImpl::CreateExternalProviders(
         bundled_extension_creation_flags));
 
     // Define a per-user source of external extensions.
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD))
+-#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING))
+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING))
     provider_list->push_back(std::make_unique<ExternalProviderImpl>(
         service,
-         new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
+         base::MakeRefCounted<ExternalPrefLoader>(
--- a/www/chromium/files/patch-chrome_browser_first__run_firstruninternal__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_first__run_firstruninternal__posix.cc
@ -1,6 +1,6 @@
--- chrome/browser/first_run/first_run_internal_posix.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/first_run/first_run_internal_posix.cc
-@@ -44,7 +44,7 @@ enum class ForcedShowDialogState {
+@@ -45,7 +45,7 @@ enum class ForcedShowDialogState {
 ForcedShowDialogState g_forced_show_dialog_state =
     ForcedShowDialogState::kNotForced;
 
@ -9,7 +9,7 @@
 // Returns whether the first run dialog should be shown. This is only true for
 // certain builds, and only if the user has not already set preferences. In a
 // real, official-build first run, initializes the default metrics reporting if
-@@ -95,7 +95,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) {
+@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) {
 }
 
 void DoPostImportPlatformSpecificTasks(Profile* profile) {
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@ -1,6 +1,24 @@
--- chrome/browser/flag_descriptions.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -3256,21 +3256,21 @@ const char kInstallableInkDropDescription[] =
+@@ -3632,7 +3632,7 @@ const char kZeroStateFilesDescription[] =
+ 
+ #endif  // defined(OS_CHROMEOS)
+ 
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ const char kTerminalSystemAppName[] = "Terminal System App";
+ const char kTerminalSystemAppDescription[] =
+     "Enables the Terminal System App at chrome://terminal which is used for "
+@@ -3645,7 +3645,7 @@ const char kDynamicTcmallocDescription[] =
+     "utilization.";
+ #endif  // BUILDFLAG(USE_TCMALLOC)
+ 
+-#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // All views-based platforms --------------------------------------------------
+ 
+@@ -3670,15 +3670,15 @@ const char kReopenTabInProductHelpDescription[] =
 
 // Random platform combinations -----------------------------------------------
 
@ -14,15 +32,48 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||  \
+     defined(OS_CHROMEOS)
+ 
+ const char kClickToCallContextMenuForSelectedTextName[] =
+@@ -3693,10 +3693,10 @@ const char kClickToCallUIDescription[] =
+     "Enables click to call feature signals to be handled on desktop by showing "
+     "a list of user's available devices with telephony functionality.";
+ 
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
+ 
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus";
 const char kDirectManipulationStylusDescription[] =
-     "If enabled, Chrome will scroll web pages on stylus drag.";
+@@ -3715,7 +3715,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa
+ const char kSyncClipboardServiceDescription[] =
+     "Enables clipboard syncing via Chrome Sync.";
 
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
 
+@@ -3825,7 +3825,7 @@ extern const char kWebrtcPipeWireCapturerDescription[]
+ 
+ #endif  // #if defined(WEBRTC_USE_PIPEWIRE)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ const char kEnableDbusAndX11StatusIconsName[] =
+     "Enable DBus and X11 status icons";
+@@ -3834,7 +3834,7 @@ const char kEnableDbusAndX11StatusIconsDescription[] =
+     "(X11) implementations of status icons.  Otherwise, uses libappindicator's "
+     "and GTK's implementations.";
+ 
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ const char kAvoidFlashBetweenNavigationName[] =
+     "Enable flash avoidance between same-origin navigations";
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@ -1,6 +1,36 @@
--- chrome/browser/flag_descriptions.h.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/flag_descriptions.h.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -1963,19 +1963,19 @@ extern const char kInstallableInkDropDescription[];
+@@ -20,9 +20,9 @@
+ #include "ui/android/buildflags.h"
+ #endif  // defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/allocator/buildflags.h"
+-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // This file declares strings used in chrome://flags. These messages are not
+ // translated, because instead of end-users they target Chromium developers and
+@@ -2178,7 +2178,7 @@ extern const char kZeroStateFilesDescription[];
+ 
+ #endif  // #if defined(OS_CHROMEOS)
+ 
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kTerminalSystemAppName[];
+ extern const char kTerminalSystemAppDescription[];
+ 
+@@ -2187,7 +2187,7 @@ extern const char kDynamicTcmallocName[];
+ extern const char kDynamicTcmallocDescription[];
+ #endif  // BUILDFLAG(USE_TCMALLOC)
+ 
+-#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#endif  // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // All views-based platforms --------------------------------------------------
+ 
+@@ -2206,14 +2206,14 @@ extern const char kReopenTabInProductHelpDescription[]
 
 // Random platform combinations -----------------------------------------------
 
@ -13,14 +43,45 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
+ 
+ extern const char kClickToCallContextMenuForSelectedTextName[];
+@@ -2222,10 +2222,10 @@ extern const char kClickToCallContextMenuForSelectedTe
+ extern const char kClickToCallUIName[];
+ extern const char kClickToCallUIDescription[];
+ 
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
+         // defined(OS_CHROMEOS)
+ 
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 extern const char kDirectManipulationStylusName[];
 extern const char kDirectManipulationStylusDescription[];
+@@ -2239,7 +2239,7 @@ extern const char kProfileMenuRevampDescription[];
+ extern const char kSyncClipboardServiceName[];
+ extern const char kSyncClipboardServiceDescription[];
 
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
 
 #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
 
+@@ -2330,12 +2330,12 @@ extern const char kWebrtcPipeWireCapturerDescription[]
+ 
+ #endif  // #if defined(WEBRTC_USE_PIPEWIRE)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ extern const char kEnableDbusAndX11StatusIconsName[];
+ extern const char kEnableDbusAndX11StatusIconsDescription[];
+ 
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ // ============================================================================
+ // Don't just add flags to the end, put them in the right section in
--- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wireddisplaymediarouteprovider.cc
+++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wireddisplaymediarouteprovider.cc
@ -1,14 +1,14 @@
--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2019-09-09 21:55:09 UTC
 +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
     bool incognito,
     CreateRouteCallback callback) {
-   DCHECK(!base::ContainsKey(presentations_, presentation_id));
-+#if defined(OS_BSD) // XXX
-+   std::move(callback).Run(base::nullopt, nullptr,
-+                           std::string("Not implemented"),
-+                           RouteRequestResult::UNKNOWN_ERROR);
-+   return;
+   DCHECK(!base::Contains(presentations_, presentation_id));
+#if defined(OS_BSD)
+  std::move(callback).Run(base::nullopt, nullptr,
+		          std::string("Not implemented"),
+			  RouteRequestResult::UNKNOWN_ERROR);
+  return;
 +#else
   base::Optional<Display> display = GetDisplayBySinkId(sink_id);
   if (!display) {
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtcloguploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtcloguploader.cc
@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2019-04-30 22:22:34 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -393,6 +393,8 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -358,6 +358,8 @@ void WebRtcLogUploader::SetupMultipart(
   const char product[] = "Chrome_Android";
 #elif defined(OS_CHROMEOS)
   const char product[] = "Chrome_ChromeOS";
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtclogginghandler__host.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtclogginghandler__host.cc
@ -1,8 +1,8 @@
--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig	2019-07-24 18:58:09 UTC
-+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc
-@@ -26,10 +26,10 @@
- #include "content/public/browser/content_browser_client.h"
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2019-10-30 15:49:45 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
+@@ -24,10 +24,10 @@
 #include "content/public/browser/render_process_host.h"
+ #include "services/service_manager/public/cpp/connector.h"
 
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
@ -11,23 +11,23 @@
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
- using content::BrowserThread;
 using webrtc_event_logging::WebRtcEventLogManager;
-@@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging(
+ 
+@@ -267,7 +267,7 @@ void WebRtcLoggingController::StartEventLogging(
       web_app_id, callback);
 }
 
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- void WebRtcLoggingHandlerHost::GetLogsDirectory(
+ void WebRtcLoggingController::GetLogsDirectory(
     const LogsDirectoryCallback& callback,
     const LogsDirectoryErrorCallback& error_callback) {
-@@ -328,7 +328,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces
-       FROM_HERE, {BrowserThread::UI},
-       base::BindOnce(callback, file_system.id(), registered_name));
+@@ -312,7 +312,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+   base::SequencedTaskRunnerHandle::Get()->PostTask(
+       FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name));
 }
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD
+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
- void WebRtcLoggingHandlerHost::OnRtpPacket(
+ void WebRtcLoggingController::OnRtpPacket(
     std::unique_ptr<uint8_t[]> packet_header,
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtclogginghandler__host.h
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtclogginghandler__host.h
@ -1,6 +1,6 @@
--- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig	2019-04-30 22:22:34 UTC
-+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h
-@@ -153,13 +153,13 @@ class WebRtcLoggingHandlerHost : public content::Brows
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2019-10-30 15:50:11 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
+@@ -129,13 +129,13 @@ class WebRtcLoggingController
                          size_t web_app_id,
                          const StartEventLoggingCallback& callback);
 
@ -14,9 +14,9 @@
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
-  private:
-   friend class content::BrowserThread;
-@@ -226,7 +226,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+   // chrome::mojom::WebRtcLoggingClient methods:
+   void OnAddMessages(
+@@ -188,7 +188,7 @@ class WebRtcLoggingController
       bool success,
       const std::string& error_message);
 
@ -25,12 +25,12 @@
   // Grants the render process access to the 'WebRTC Logs' directory, and
   // invokes |callback| with the ids necessary to create a DirectoryEntry
   // object. If the |logs_path| couldn't be created or found, |error_callback|
-@@ -235,7 +235,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+@@ -197,7 +197,7 @@ class WebRtcLoggingController
       const LogsDirectoryCallback& callback,
       const LogsDirectoryErrorCallback& error_callback,
       const base::FilePath& logs_path);
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
 
-   // The render process ID this object belongs to.
-   const int render_process_id_;
+   static base::FilePath GetLogDirectoryAndEnsureExists(
+       const base::FilePath& browser_context_directory_path);
--- a/www/chromium/files/patch-chrome_browser_metrics_chromebrowsermainextraparts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chromebrowsermainextraparts__metrics.cc
@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2019-09-09 21:55:09 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -44,7 +44,9 @@
+@@ -47,7 +47,9 @@
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include <gnu/libc-version.h>
@ -10,7 +10,7 @@
 #include "base/linux_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-@@ -52,7 +54,7 @@
+@@ -55,7 +57,7 @@
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
@ -18,4 +18,4 @@
 +#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 
 #if defined(USE_OZONE) || defined(USE_X11)
- #include "ui/events/devices/input_device_event_observer.h"
+ #include "ui/events/devices/device_data_manager.h"
--- a/www/chromium/files/patch-chrome_browser_metrics_chromemetricsservice__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chromemetricsservice__client.cc
@ -1,6 +1,20 @@
--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -902,7 +902,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -721,11 +721,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+ #endif  // defined(OS_WIN)
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   metrics_service_->RegisterMetricsProvider(
+       std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
+ #endif  //  defined(OS_WIN) || defined(OS_MACOSX) || \
+-        // (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+        // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_PLUGINS)
+   plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
+@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
   }
 #endif
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
--- a/www/chromium/files/patch-chrome_browser_metrics_processmemorymetrics__emitter.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_processmemorymetrics__emitter.cc
@ -1,6 +1,6 @@
--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/metrics/process_memory_metrics_emitter.cc
-@@ -360,7 +360,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -378,7 +378,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
 
   builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024);
   builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024);
@ -9,12 +9,12 @@
   builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
                                    1024);
 #endif
-@@ -383,7 +383,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
-   MEMORY_METRICS_HISTOGRAM_MB(
-       std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint",
-       pmd.os_dump().shared_footprint_kb / 1024);
+@@ -401,7 +401,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+   MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
+                                   process_name + ".SharedMemoryFootprint",
+                               pmd.os_dump().shared_footprint_kb / 1024);
 -#if defined(OS_LINUX) || defined(OS_ANDROID)
 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   MEMORY_METRICS_HISTOGRAM_MB(
-       std::string(UMA_PREFIX) + process_name + ".PrivateSwapFootprint",
-       pmd.os_dump().private_footprint_swap_kb / 1024);
+   MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
+                                   process_name + ".PrivateSwapFootprint",
+                               pmd.os_dump().private_footprint_swap_kb / 1024);
--- a/www/chromium/files/patch-chrome_browser_nativefilesystem_chromenativefilesystempermission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_nativefilesystem_chromenativefilesystempermission__context.cc
@ -0,0 +1,11 @@
+--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig	2019-10-21 19:06:22 UTC
+++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
+@@ -225,7 +225,7 @@ const struct {
+     {base::DIR_APP_DATA, nullptr, true},
+     {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true},
+ #endif
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+     // On Linux also block access to devices via /dev, as well as security
+     // sensitive data in /sys and /proc.
+     {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), true},
--- a/www/chromium/files/patch-chrome_browser_net_systemnetworkcontext__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_systemnetworkcontext__manager.cc
@ -1,21 +1,20 @@
--- chrome/browser/net/system_network_context_manager.cc.orig	2019-07-24 18:58:09 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -72,12 +72,12 @@
+@@ -78,11 +78,11 @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #endif  // defined(OS_CHROMEOS)
 
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 #include "chrome/common/chrome_paths_internal.h"
- #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
 
- namespace {
- 
-@@ -191,10 +191,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+ #include "extensions/common/constants.h"
+@@ -206,10 +206,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
   auth_dynamic_params->enable_negotiate_port =
       local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
 
@ -28,7 +27,7 @@
 
 #if defined(OS_POSIX)
   auth_dynamic_params->ntlm_v2_enabled =
-@@ -434,10 +434,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -457,10 +457,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
   pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
                              auth_pref_callback);
 
@ -41,7 +40,7 @@
 
 #if defined(OS_POSIX)
   pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
-@@ -486,10 +486,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -509,10 +509,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
   registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
                                std::string());
@ -54,9 +53,9 @@
 
 #if defined(OS_POSIX)
   registry->RegisterBooleanPref(
-@@ -586,7 +586,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
-   content::GetNetworkService()->ConfigureStubHostResolver(
-       stub_resolver_enabled, std::move(dns_over_https_servers));
+@@ -620,7 +620,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+       insecure_stub_resolver_enabled, secure_dns_mode,
+       std::move(dns_over_https_servers));
 
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
--- a/www/chromium/files/patch-chrome_browser_notifications_notificationdisplayservice__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_notificationdisplayservice__impl.cc
@ -1,6 +1,6 @@
--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
 #include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
 #endif
 
@ -9,7 +9,7 @@
 #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
 #endif
 
-@@ -121,7 +121,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
     AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
                            std::make_unique<PersistentNotificationHandler>());
 
--- a/www/chromium/files/patch-chrome_browser_password__manager_chromepasswordmanager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chromepasswordmanager__client.cc
@ -1,8 +1,8 @@
--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2019-07-24 18:58:10 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -82,7 +82,11 @@
+@@ -84,7 +84,11 @@
+ #include "net/base/url_util.h"
 #include "net/cert/cert_status_flags.h"
- #include "services/identity/public/cpp/identity_manager.h"
 #include "services/metrics/public/cpp/ukm_recorder.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
@ -11,4 +11,4 @@
 +#endif
 #include "url/url_constants.h"
 
- #if defined(FULL_SAFE_BROWSING)
+ #if BUILDFLAG(FULL_SAFE_BROWSING)
--- a/www/chromium/files/patch-chrome_browser_password__manager_passwordstorefactory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_passwordstorefactory.cc
@ -1,11 +1,11 @@
--- chrome/browser/password_manager/password_store_factory.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -302,7 +302,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
-                                                   network_context_getter);
+@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+                         base::TimeDelta::FromSeconds(20));
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
   std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
       std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
-           profile);
+           IdentityManagerFactory::GetForProfile(profile));
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_processmetricshistory.cc
+++ b/www/chromium/files/patch-chrome_browser_performance__monitor_processmetricshistory.cc
@ -1,4 +1,4 @@
--- chrome/browser/performance_monitor/process_metrics_history.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/performance_monitor/process_metrics_history.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/performance_monitor/process_metrics_history.cc
@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() {
 #if defined(OS_WIN)
@ -9,7 +9,7 @@
   idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond();
 #endif
 #if defined(OS_MACOSX)
-@@ -87,7 +87,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+@@ -88,7 +88,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
           kDiskUsageHistogramMin, kDiskUsageHistogramMax,
           kDiskUsageHistogramBucketCount);
 #endif
@ -18,7 +18,7 @@
       UMA_HISTOGRAM_COUNTS_10000(
           "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_);
 #endif
-@@ -105,7 +105,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+@@ -109,7 +109,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
         UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess",
                               true);
       }
@ -27,7 +27,7 @@
       UMA_HISTOGRAM_COUNTS_10000(
           "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_);
 #endif
-@@ -122,7 +122,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+@@ -129,7 +129,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
                                   kHistogramBucketCount);
       if (cpu_usage_ > kHighCPUUtilizationThreshold)
         UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true);
--- a/www/chromium/files/patch-chrome_browser_plugins_plugininfohost__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_plugins_plugininfohost__impl.cc
@ -1,6 +1,6 @@
--- chrome/browser/plugins/plugin_info_host_impl.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/plugins/plugin_info_host_impl.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/plugins/plugin_info_host_impl.cc
-@@ -411,7 +411,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
+@@ -383,7 +383,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
     std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
   if (cus_plugin_info) {
     output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
--- a/www/chromium/files/patch-chrome_browser_policy_browsersigninpolicy__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_browsersigninpolicy__handler.cc
@ -0,0 +1,11 @@
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2019-09-16 07:21:37 UTC
+++ chrome/browser/policy/browser_signin_policy_handler.cc
+@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
+     }
+     switch (static_cast<BrowserSigninMode>(int_value)) {
+       case BrowserSigninMode::kForced:
+-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) && !defined(OS_BSD)
+         prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true));
+ #endif
+         FALLTHROUGH;
--- a/www/chromium/files/patch-chrome_browser_policy_configurationpolicyhandlerlistfactory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configurationpolicyhandlerlistfactory.cc
@ -1,6 +1,6 @@
--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2019-07-24 18:58:10 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -109,7 +109,7 @@
+@@ -113,7 +113,7 @@
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -9,10 +9,10 @@
 #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
 #endif
 
-@@ -321,11 +321,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-   { key::kSafeSitesFilterBehavior,
-     policy_prefs::kSafeSitesFilterBehavior,
-     base::Value::Type::INTEGER},
+@@ -333,11 +333,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     prefs::kSafeBrowsingSendFilesForMalwareCheck,
+     base::Value::Type::INTEGER
+   },
 -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
   { key::kAuthNegotiateDelegateByKdcPolicy,
@ -23,7 +23,7 @@
 #if defined(OS_POSIX)
   { key::kNtlmV2Enabled,
     prefs::kNtlmV2Enabled,
-@@ -1021,7 +1021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1064,7 +1064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
     base::Value::Type::BOOLEAN },
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -32,3 +32,12 @@
   { key::kAlternativeBrowserPath,
     browser_switcher::prefs::kAlternativeBrowserPath,
     base::Value::Type::STRING },
+@@ -1125,7 +1125,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     browser_switcher::prefs::kChromeParameters,
+     base::Value::Type::LIST },
+ #endif
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
+   { key::kBrowserGuestModeEnforced,
+     prefs::kBrowserGuestModeEnforced,
+     base::Value::Type::BOOLEAN },
--- a/www/chromium/files/patch-chrome_browser_policy_policyprefsbrowsertest.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_policyprefsbrowsertest.cc
@ -1,6 +1,6 @@
--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -183,6 +183,8 @@ class PolicyTestCase {
+@@ -184,6 +184,8 @@ class PolicyTestCase {
     const std::string os("chromeos");
 #elif defined(OS_LINUX)
     const std::string os("linux");
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@ -1,6 +1,6 @@
--- chrome/browser/prefs/browser_prefs.cc.orig	2019-07-24 18:58:10 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -338,7 +338,7 @@
+@@ -346,7 +346,7 @@
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -9,7 +9,7 @@
 #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
 #endif
 
-@@ -872,7 +872,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -951,7 +951,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
--- a/www/chromium/files/patch-chrome_browser_prefs_prefserviceincognito__whitelist.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_prefserviceincognito__whitelist.cc
@ -1,6 +1,6 @@
--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
-@@ -183,7 +183,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = {
     prefs::kShowFullscreenToolbar,
 #endif
 
--- a/www/chromium/files/patch-chrome_browser_processsingletonposix.cc
+++ b/www/chromium/files/patch-chrome_browser_processsingletonposix.cc
@ -1,6 +1,6 @@
--- chrome/browser/process_singleton_posix.cc.orig	2019-06-04 18:55:17 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/process_singleton_posix.cc
-@@ -94,11 +94,11 @@
+@@ -95,11 +95,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
 
-@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
   if (g_disable_prompt)
     return g_user_opted_unlock_in_use_profile;
 
@ -23,7 +23,7 @@
   base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
       IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
   return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -901,7 +901,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
     SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
     return PROCESS_NONE;
   } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
--- a/www/chromium/files/patch-chrome_browser_profiles_chromebrowsermainextraparts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chromebrowsermainextraparts__profiles.cc
@ -1,6 +1,15 @@
--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2019-07-24 18:58:10 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -181,7 +181,7 @@
+ #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/sync/sync_clipboard_service_factory.h"
+ #endif
+ 
+@@ -336,7 +336,7 @@ void ChromeBrowserMainExtraPartsProfiles::
   MediaGalleriesPreferencesFactory::GetInstance();
 #endif
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -9,3 +18,12 @@
   metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
 #endif
   ModelTypeStoreServiceFactory::GetInstance();
+@@ -398,7 +398,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+   SpellcheckServiceFactory::GetInstance();
+ #endif
+   suggestions::SuggestionsServiceFactory::GetInstance();
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   SyncClipboardServiceFactory::GetInstance();
+ #endif
+   TabRestoreServiceFactory::GetInstance();
--- a/www/chromium/files/patch-chrome_browser_renderercontextmenu_renderviewcontext__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_renderercontextmenu_renderviewcontext__menu.cc
@ -1,6 +1,6 @@
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2019-07-24 18:58:10 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2019-10-21 19:06:22 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1672,7 +1672,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1699,7 +1699,7 @@ void RenderViewContextMenu::AppendEditableItems() {
 // 'Undo' and 'Redo' for text input with no suggestions and no text selected.
 // We make an exception for OS X as context clicking will select the closest
 // word. In this case both items are always shown.
@ -9,7 +9,7 @@
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
                                   IDS_CONTENT_CONTEXT_UNDO);
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
-@@ -1714,7 +1714,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1741,7 +1741,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
   if (!use_spelling)
     return;
 
@ -18,7 +18,7 @@
   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
                                   IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
 #else
-@@ -1994,7 +1994,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -2045,7 +2045,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
     case IDC_CHECK_SPELLING_WHILE_TYPING:
       return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
 
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearancebrowserproxy.js
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearancebrowserproxy.js
@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig	2019-10-21 19:06:23 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js
-@@ -35,7 +35,7 @@ cr.define('settings', function() {
+@@ -19,7 +19,7 @@ cr.define('settings', function() {
 
     useDefaultTheme() {}
 
@ -9,7 +9,7 @@
     useSystemTheme() {}
 
     // </if>
-@@ -93,7 +93,7 @@ cr.define('settings', function() {
+@@ -59,7 +59,7 @@ cr.define('settings', function() {
       chrome.send('useDefaultTheme');
     }
 
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2019-04-30 22:22:35 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2019-10-21 19:06:23 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -64,7 +64,7 @@
+@@ -67,7 +67,7 @@
           <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
               label="$i18n{themes}" sub-label="[[themeSublabel_]]"
               on-click="openThemeUrl_" external></cr-link-row>
@ -8,16 +8,16 @@
 +<if expr="not is_posix or chromeos">
           <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
             <div class="separator"></div>
-             <paper-button id="useDefault" on-click="onUseDefaultTap_"
-@@ -73,7 +73,7 @@
-             </paper-button>
+             <cr-button id="useDefault" on-click="onUseDefaultTap_">
+@@ -75,7 +75,7 @@
+             </cr-button>
           </template>
 </if>
 -<if expr="is_linux and not chromeos">
 +<if expr="is_posix and not chromeos">
           <div class="settings-row continuation"
               hidden="[[!showThemesSecondary_(
-               prefs.extensions.theme.id.value, useSystemTheme_)]]"
+                   prefs.extensions.theme.id.value, useSystemTheme_)]]"
@@ -138,7 +138,7 @@
             pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
             label="$i18n{showBookmarksBar}">
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
@ -1,6 +1,6 @@
--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig	2019-07-24 18:58:11 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig	2019-10-21 19:06:23 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.js
-@@ -125,7 +125,7 @@ Polymer({
+@@ -130,7 +130,7 @@ Polymer({
     'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
     'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',
 
@ -9,8 +9,8 @@
     // NOTE: this pref only exists on Linux.
     'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
     // </if>
-@@ -228,7 +228,7 @@ Polymer({
-     this.browserProxy_.useDefaultTheme();
+@@ -238,7 +238,7 @@ Polymer({
+     this.appearanceBrowserProxy_.useDefaultTheme();
   },
 
 -  // <if expr="is_linux and not chromeos">
@ -18,7 +18,7 @@
   /**
    * @param {boolean} useSystemTheme
    * @private
-@@ -304,10 +304,10 @@ Polymer({
+@@ -315,10 +315,10 @@ Polymer({
     }
 
     let i18nId;
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incidentreportingservice.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incidentreportingservice.cc
@ -1,6 +1,6 @@
--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2019-04-30 22:22:35 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2019-10-21 19:06:23 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -716,7 +716,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
+@@ -713,7 +713,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
   environment_collection_pending_ = false;
 
 // Process::Current().CreationTime() is missing on some platforms.
--- a/www/chromium/files/patch-chrome_browser_search_localfilesntp__source.cc
+++ b/www/chromium/files/patch-chrome_browser_search_localfilesntp__source.cc
@ -1,16 +0,0 @@
--- chrome/browser/search/local_files_ntp_source.cc.orig	2019-03-11 22:00:54 UTC
-+++ chrome/browser/search/local_files_ntp_source.cc
-@@ -20,8 +20,13 @@
- #include "build/build_config.h"
- #include "chrome/common/url_constants.h"
- #include "content/public/browser/url_data_source.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#include <re2/stringpiece.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
- #include "third_party/re2/src/re2/stringpiece.h"
-+#endif
- 
- namespace {
- 
--- a/www/chromium/files/patch-chrome_browser_search_search__suggest_searchsuggestservice.cc
+++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_searchsuggestservice.cc
@ -0,0 +1,14 @@
+--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig	2019-09-09 21:55:10 UTC
+++ chrome/browser/search/search_suggest/search_suggest_service.cc
+@@ -17,7 +17,11 @@
+ #include "components/prefs/scoped_user_pref_update.h"
+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
+ #include "components/signin/public/identity_manager/identity_manager.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
+ #include "third_party/re2/src/re2/re2.h"
+#endif
+ 
+ namespace {
+ 
--- a/Show More
+++ b/Show More