www/chromium: Update to version 83.0.4103.61

Submitted by: Matthias Wolf <freebsd@rheinwolf.de> Reviewed by: rene Approved by: chromium@ (rene) Obtained from: https://github.com/gliaskos/freebsd-chromium MFH: 2020Q2 Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html Differential Revision: https://reviews.freebsd.org/D25102
author: Joseph Mingrone <jrm@FreeBSD.org> 2020-06-02 20:30:55 +0000
committer: Joseph Mingrone <jrm@FreeBSD.org> 2020-06-02 20:30:55 +0000
commit: 8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch)
tree: c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium
parent: b4ee67cd6bdd0a733edfee761f44188e836f6165 (diff)
download: ports-8f6dc7d1dd8b0ca59427d71524538aab9403ac23.tar.gz
ports-8f6dc7d1dd8b0ca59427d71524538aab9403ac23.zip
336 files changed, 2934 insertions, 2352 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 3026c28d50eb..81ffe89f8fde 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	81.0.4044.138
-PORTREVISION=	1
+PORTVERSION=	83.0.4103.61
 CATEGORIES?=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
@@ -90,7 +89,7 @@ USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xorgproto xrandr xrender xscrnsaver xtst
 USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
-SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
+SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
@@ -276,6 +275,11 @@ do-configure:
 	@${MKDIR} ${WRKDIR}/bin
 	${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java
 .endif
+
+	# Setup buildtools/freebsd
+	@${MKDIR} ${WRKSRC}/buildtools/freebsd
+	${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
+	${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
 .endif
 
 do-test-TEST-on:
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index ab30090cba60..f779df2b9aa1 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1588777393
-SHA256 (chromium-81.0.4044.138.tar.xz) = f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6
-SIZE (chromium-81.0.4044.138.tar.xz) = 785960928
-SHA256 (chromium-81.0.4044.138-testdata.tar.xz) = e2083a3c9ae5bd183ebaf3dc0b701c3fc6e990a6864852a2fa961e811c99ec32
-SIZE (chromium-81.0.4044.138-testdata.tar.xz) = 257018904
+TIMESTAMP = 1590142056
+SHA256 (chromium-83.0.4103.61.tar.xz) = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc
+SIZE (chromium-83.0.4103.61.tar.xz) = 802558244
+SHA256 (chromium-83.0.4103.61-testdata.tar.xz) = 06096007d6fd1a4adce3b9940a653086e380d0f2be3cf9e36d39956ba2f7363e
+SIZE (chromium-83.0.4103.61-testdata.tar.xz) = 257159920
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040
diff --git a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
index a3130315b68e..990d14c63379 100644
--- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,4 +1,4 @@
---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-04-03 04:13:08 UTC
+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2020-05-18 18:42:41 UTC
 +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -16,7 +16,7 @@
  #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 0af06e81260e..2d039eeec9c0 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- BUILD.gn.orig	2020-05-13 18:40:15 UTC
 +++ BUILD.gn
 @@ -418,7 +418,7 @@ group("gn_all") {
      ]
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -575,10 +569,6 @@ group("gn_all") {
+@@ -579,10 +573,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -652,7 +642,7 @@ group("gn_all") {
+@@ -656,7 +646,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)" ]
    }
  
-@@ -794,7 +784,6 @@ group("gn_all") {
+@@ -789,7 +779,6 @@ group("gn_all") {
        "//chrome/browser/vr:vr_common_perftests",
        "//chrome/browser/vr:vr_common_unittests",
        "//chrome/browser/vr:vr_pixeltests",
@@ -57,15 +57,7 @@
      ]
      if (is_desktop_linux && use_ozone) {
        deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -934,7 +923,6 @@ if (is_chromeos) {
-       "//ppapi/examples/video_decode",
-       "//sandbox/linux:chrome_sandbox",
-       "//sandbox/linux:sandbox_linux_unittests",
--      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
- 
-       # Blocked on https://github.com/catapult-project/catapult/issues/2297
-       #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1092,7 +1080,7 @@ if (!is_ios) {
+@@ -1071,7 +1060,7 @@ if (!is_ios) {
        ]
      }
  
@@ -74,7 +66,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1101,7 +1089,7 @@ if (!is_ios) {
+@@ -1080,7 +1069,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -83,7 +75,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") {
+@@ -1273,9 +1262,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
index d5bf99f6dba3..838875d71ad0 100644
--- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2020-03-16 18:40:27 UTC
+--- ash/display/mirror_window_controller.cc.orig	2020-05-13 18:39:35 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -276,7 +276,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {
          CloseAndDeleteHost(iter->second, true);
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 30f1110ebaff..a4d2485d983f 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,15 @@
---- base/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- base/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ base/BUILD.gn
-@@ -912,7 +912,7 @@ jumbo_component("base") {
+@@ -59,7 +59,7 @@ declare_args() {
+   # replacement base::Location::Current(). On by default in non-official builds
+   # for testing purposes.
+   # TODO(https://crbug.com/974061): remove this eventually.
+-  from_here_uses_location_builtins = !is_official_build
++  from_here_uses_location_builtins = !is_official_build && !is_bsd
+ 
+   # Unsafe developer build. Has developer-friendly features that may weaken or
+   # disable security measures like sandboxing or ASLR.
+@@ -929,7 +929,7 @@ jumbo_component("base") {
        "timer/hi_res_timer_manager_posix.cc",
      ]
  
@@ -9,7 +18,7 @@
        sources += [
          "profiler/stack_copier_signal.cc",
          "profiler/stack_copier_signal.h",
-@@ -921,6 +921,12 @@ jumbo_component("base") {
+@@ -938,6 +938,12 @@ jumbo_component("base") {
          "profiler/thread_delegate_posix.h",
        ]
      }
@@ -22,7 +31,7 @@
    }
  
    if (is_win) {
-@@ -1305,7 +1311,7 @@ jumbo_component("base") {
+@@ -1321,7 +1327,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.
@@ -31,7 +40,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1331,7 +1337,7 @@ jumbo_component("base") {
+@@ -1347,7 +1353,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -40,7 +49,7 @@
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1930,6 +1936,33 @@ jumbo_component("base") {
+@@ -1942,6 +1948,33 @@ jumbo_component("base") {
      }
    }
  
@@ -74,7 +83,7 @@
    # iOS
    if (is_ios) {
      sources -= [
-@@ -2880,7 +2913,7 @@ test("base_unittests") {
+@@ -2898,7 +2931,7 @@ test("base_unittests") {
        "posix/unix_domain_socket_unittest.cc",
        "task/thread_pool/task_tracker_posix_unittest.cc",
      ]
@@ -83,7 +92,7 @@
        sources += [ "profiler/stack_copier_signal_unittest.cc" ]
      }
    }
-@@ -3068,6 +3101,12 @@ test("base_unittests") {
+@@ -3087,6 +3120,12 @@ test("base_unittests") {
  
      manifest = "//build/config/fuchsia/tests.cmx"
    }
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index fbd28e22abe2..07ed8ef2f09e 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- 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.orig	2020-05-13 18:39:35 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -19,7 +19,7 @@
+@@ -22,7 +22,7 @@
  #if defined(OS_ANDROID)
  #include <sys/prctl.h>
  #endif
diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc
index 62317b93a5a1..2632ef5f664f 100644
--- 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-09-09 21:55:05 UTC
+--- base/debug/debugger_posix.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/debug/debugger_posix.cc
-@@ -90,7 +90,7 @@ bool BeingDebugged() {
+@@ -95,7 +95,7 @@ bool BeingDebugged() {
      KERN_PROC,
      KERN_PROC_PID,
      getpid()
@@ -9,7 +9,7 @@
      , sizeof(struct kinfo_proc),
      0
  #endif
-@@ -98,33 +98,35 @@ bool BeingDebugged() {
+@@ -103,33 +103,35 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 5e7e385e5e23..0faed44d1bb6 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig	2020-03-16 18:39:41 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/files/file_path_watcher_unittest.cc
-@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
+@@ -430,7 +430,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    VLOG(1) << "Waiting for file1 creation";
    ASSERT_TRUE(WaitForEvents());
  
@@ -9,7 +9,7 @@
    // Mac implementation does not detect files modified in a directory.
    ASSERT_TRUE(WriteFile(file1, "content v2"));
    VLOG(1) << "Waiting for file1 modification";
-@@ -808,7 +808,7 @@ enum Permission {
+@@ -803,7 +803,7 @@ enum Permission {
    Execute
  };
  
@@ -18,7 +18,7 @@
  bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
    struct stat stat_buf;
  
-@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -832,9 +832,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi
    }
    return chmod(path.value().c_str(), stat_buf.st_mode) == 0;
  }
@@ -30,7 +30,7 @@
  // Linux implementation of FilePathWatcher doesn't catch attribute changes.
  // http://crbug.com/78043
  // Windows implementation of FilePathWatcher catches attribute changes that
-@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
+@@ -869,7 +869,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) {
    ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true));
  }
  
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 34f2453a25de..bf29624ac4ec 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig	2020-03-16 18:40:27 UTC
+--- base/i18n/icu_util.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/i18n/icu_util.cc
-@@ -46,7 +46,7 @@
+@@ -49,7 +49,7 @@
  #endif
  
  #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -14,7 +14,7 @@
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
 -#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)
-+#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
-   // To respond to the timezone change properly, the default timezone
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST)
+   // To respond to the time zone change properly, the default time zone
    // cache in ICU has to be populated on starting up.
    // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc
index 216208c37181..97ea99e3d97b 100644
--- a/www/chromium/files/patch-base_linux__util.cc
+++ b/www/chromium/files/patch-base_linux__util.cc
@@ -1,20 +1,12 @@
---- base/linux_util.cc.orig	2019-12-16 21:50:40 UTC
+--- base/linux_util.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/linux_util.cc
-@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
-     "CrOS";
- #elif defined(OS_ANDROID)
-     "Android";
-+#elif defined(OS_BSD)
-+    "BSD";
- #else  // if defined(OS_LINUX)
-     "Unknown";
- #endif
-@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
- }
- 
- std::string GetLinuxDistro() {
--#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
-   return g_linux_distro;
- #elif defined(OS_LINUX)
-   LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
+@@ -78,6 +78,9 @@ class DistroNameGetter {
+  public:
+   DistroNameGetter() {
+     static const char* const kFilesToCheck[] = {"/etc/os-release",
++#if defined(OS_BSD)
++	                                        "/usr/local/etc/os-release",
++#endif
+                                                 "/usr/lib/os-release"};
+     for (const char* file : kFilesToCheck) {
+       if (ReadDistroFromOSReleaseFile(file))
diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc
new file mode 100644
index 000000000000..c43a0034dd90
--- /dev/null
+++ b/www/chromium/files/patch-base_location__unittest.cc
@@ -0,0 +1,11 @@
+--- base/location_unittest.cc.orig	2020-05-26 09:56:30 UTC
++++ base/location_unittest.cc
+@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) {
+   EXPECT_EQ(here.line_number(), previous_line + 1);
+   EXPECT_STREQ("TestBody", here.function_name());
+ #endif
+-#elif defined(OFFICIAL_BUILD)
++#elif defined(OFFICIAL_BUILD) && !defined(OS_BSD)
+ #error Location builtins must be supported in official builds.
+ #elif BUILDFLAG(FROM_HERE_USES_LOCATION_BUILTINS)
+ #error FROM_HERE requires location builtins to be supported.
diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
index c5f57c29c6bc..3cc2144905a4 100644
--- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
+++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
@@ -1,6 +1,6 @@
---- base/memory/platform_shared_memory_region_posix.cc.orig	2020-02-03 21:52:37 UTC
+--- base/memory/platform_shared_memory_region_posix.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/memory/platform_shared_memory_region_posix.cc
-@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const {
+@@ -69,7 +69,7 @@ FDPair ScopedFDPair::get() const {
    return {fd.get(), readonly_fd.get()};
  }
  
@@ -9,7 +9,7 @@
  // static
  ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
    PlatformSharedMemoryRegion region =
-@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
+@@ -78,7 +78,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion:
      return region.PassPlatformHandle().fd;
    return ScopedFD();
  }
@@ -18,7 +18,7 @@
  
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take(
-@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
+@@ -203,7 +203,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o
  // static
  PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
                                                                size_t size
@@ -27,7 +27,7 @@
                                                                ,
                                                                bool executable
  #endif
-@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
+@@ -232,7 +232,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
    // flag.
    FilePath directory;
    if (!GetShmemTempDir(
diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
index b9e757471f17..fcbc9bacbce2 100644
--- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
+++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc
@@ -1,4 +1,4 @@
---- base/profiler/stack_copier_signal.cc.orig	2020-04-10 00:33:01 UTC
+--- base/profiler/stack_copier_signal.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/profiler/stack_copier_signal.cc
 @@ -4,7 +4,14 @@
  
@@ -15,7 +15,7 @@
  #include <signal.h>
  #include <sys/ucontext.h>
  #include <syscall.h>
-@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent {
+@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent {
      // for a pthread mutex. So, also check the condition.
      while (true) {
        int res =
@@ -29,7 +29,7 @@
        if (futex_.load(std::memory_order_acquire) != 0)
          return true;
        if (res != 0)
-@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent {
+@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent {
  
    void Signal() {
      futex_.store(1, std::memory_order_release);
@@ -42,7 +42,7 @@
    }
  
   private:
-@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
+@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
      if (!scoped_sigaction.succeeded())
        return false;
  
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
index 686f7e90afb3..b71975a9d083 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2019-07-24 18:58:02 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2020-05-13 18:40:16 UTC
 +++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
  #include <intrin.h>
  #include <malloc.h>
  #include <windows.h>
diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
index 0d7ec24c9210..74d564e70740 100644
--- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
+++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
@@ -1,4 +1,4 @@
---- base/profiler/thread_delegate_posix.cc.orig	2020-04-03 04:10:36 UTC
+--- base/profiler/thread_delegate_posix.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/profiler/thread_delegate_posix.cc
 @@ -9,6 +9,9 @@
  #include "base/stl_util.h"
@@ -10,7 +10,7 @@
  
  namespace base {
  
-@@ -17,7 +20,12 @@
+@@ -17,7 +20,12 @@ namespace {
  uintptr_t GetThreadStackBaseAddressImpl(
      SamplingProfilerThreadToken thread_token) {
    pthread_attr_t attr;
@@ -23,7 +23,7 @@
    // See crbug.com/617730 for limitations of this approach on Linux.
    void* address;
    size_t size;
-@@ -93,16 +103,33 @@
+@@ -93,16 +101,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
    return {
        // Return the set of callee-save registers per the i386 System V ABI
        // section 2.2.3, plus the stack pointer.
@@ -57,7 +57,7 @@
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
-@@ -110,6 +137,7 @@
+@@ -110,6 +135,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
        reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
diff --git a/www/chromium/files/patch-base_stl__util.h b/www/chromium/files/patch-base_stl__util.h
new file mode 100644
index 000000000000..b203dbd723ef
--- /dev/null
+++ b/www/chromium/files/patch-base_stl__util.h
@@ -0,0 +1,47 @@
+--- base/stl_util.h.orig	2020-05-18 14:07:28 UTC
++++ base/stl_util.h
+@@ -561,14 +561,6 @@ size_t EraseIf(std::vector<T, Allocator>& container, P
+   return removed;
+ }
+ 
+-template <class T, class Allocator, class Value>
+-size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) {
+-  // Unlike std::forward_list::remove, this function template accepts
+-  // heterogeneous types and does not force a conversion to the container's
+-  // value type before invoking the == operator.
+-  return EraseIf(container, [&](const T& cur) { return cur == value; });
+-}
+-
+ template <class T, class Allocator, class Predicate>
+ size_t EraseIf(std::forward_list<T, Allocator>& container, Predicate pred) {
+   // Note: std::forward_list does not have a size() API, thus we need to use the
+@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list<T, Allocator>& contai
+ }
+ 
+ template <class T, class Allocator, class Value>
+-size_t Erase(std::list<T, Allocator>& container, const Value& value) {
+-  // Unlike std::list::remove, this function template accepts heterogeneous
+-  // types and does not force a conversion to the container's value type before
+-  // invoking the == operator.
++size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) {
++  // Unlike std::forward_list::remove, this function template accepts
++  // heterogeneous types and does not force a conversion to the container's
++  // value type before invoking the == operator.
+   return EraseIf(container, [&](const T& cur) { return cur == value; });
+ }
+ 
+@@ -592,6 +584,14 @@ size_t EraseIf(std::list<T, Allocator>& container, Pre
+   size_t old_size = container.size();
+   container.remove_if(pred);
+   return old_size - container.size();
++}
++
++template <class T, class Allocator, class Value>
++size_t Erase(std::list<T, Allocator>& container, const Value& value) {
++  // Unlike std::list::remove, this function template accepts heterogeneous
++  // types and does not force a conversion to the container's value type before
++  // invoking the == operator.
++  return EraseIf(container, [&](const T& cur) { return cur == value; });
+ }
+ 
+ template <class Key, class T, class Compare, class Allocator, class Predicate>
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 2159a51c6b6f..f35e63c372a9 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2020-03-16 18:39:41 UTC
+--- base/system/sys_info.h.orig	2020-05-13 18:39:35 UTC
 +++ base/system/sys_info.h
-@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo {
+@@ -197,6 +197,8 @@ class BASE_EXPORT SysInfo {
    // On Desktop this returns true when memory <= 512MB.
    static bool IsLowEndDevice();
  
@@ -9,7 +9,7 @@
   private:
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
    FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo {
+@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo {
    static bool IsLowEndDeviceImpl();
    static HardwareInfo GetHardwareInfoSync();
  
diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc
index 74f7f01726cc..3afe0098808a 100644
--- a/www/chromium/files/patch-base_test_test__suite.cc
+++ b/www/chromium/files/patch-base_test_test__suite.cc
@@ -1,6 +1,6 @@
---- base/test/test_suite.cc.orig	2020-03-23 15:30:45 UTC
+--- base/test/test_suite.cc.orig	2020-05-13 18:39:35 UTC
 +++ base/test/test_suite.cc
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
  #include "base/test/test_support_ios.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/test/fontconfig_util_linux.h"
  #endif
  
-@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() {
+@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() {
    testing::GTEST_FLAG(catch_exceptions) = false;
  #endif
    EnableTerminationOnHeapCorruption();
@@ -26,7 +26,7 @@
  
    // On Android, AtExitManager is created in
    // testing/android/native_test_wrapper.cc before main() is called.
-@@ -620,7 +620,7 @@ void TestSuite::Initialize() {
+@@ -623,7 +623,7 @@ void TestSuite::Initialize() {
    // TODO(jshin): Should we set the locale via an OS X locale API here?
    i18n::SetICUDefaultLocale("en_US");
  
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 5eadb70887bf..72706cf4aaef 100644
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- build/config/BUILD.gn.orig	2020-05-13 18:39:35 UTC
 +++ build/config/BUILD.gn
 @@ -133,7 +133,7 @@ config("debug") {
        # builds, and we have to tell it to turn it off.
@@ -19,7 +19,7 @@
      ]
    }
  }
-@@ -315,7 +313,7 @@ config("executable_config") {
+@@ -316,7 +314,7 @@ config("executable_config") {
        "//build/config/ios:ios_dynamic_flags",
        "//build/config/ios:ios_executable_flags",
      ]
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 76e9706a7967..940adc0febf5 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,24 +1,24 @@
---- build/config/compiler/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- build/config/compiler/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -137,7 +137,7 @@ declare_args() {
-   # TODO(vitalybuka):
+@@ -138,7 +138,7 @@ declare_args() {
    # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel.
    # 'use_xcode_clang' may call old clang.
--  init_stack_vars = !is_android && !use_xcode_clang && !is_official_build
-+  init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd
+   init_stack_vars =
+-      !is_android && !use_xcode_clang && (!is_official_build || is_linux)
++      !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd
  }
  
  declare_args() {
 @@ -298,7 +298,7 @@ config("compiler") {
+     }
  
      # Linker warnings.
-     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
--        !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
+-    if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") {
++    if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") {
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
-@@ -393,7 +393,7 @@ config("compiler") {
+     if (fatal_linker_warnings && (is_mac || is_ios)) {
+@@ -392,7 +392,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",
-@@ -486,7 +486,7 @@ config("compiler") {
+@@ -485,7 +485,7 @@ config("compiler") {
      }
    }
  
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" +
                  rebase_path("//tools/clang/crashreports", root_build_dir) ]
  
-@@ -767,7 +767,7 @@ config("compiler_cpu_abi") {
+@@ -755,7 +755,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" ]
        }
-@@ -1118,7 +1118,7 @@ config("compiler_deterministic") {
+@@ -1105,7 +1105,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,." ]
      }
-@@ -1507,7 +1507,7 @@ config("default_warnings") {
+@@ -1488,7 +1488,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 += [
-@@ -1741,7 +1741,7 @@ config("thin_archive") {
+@@ -1738,7 +1738,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" ]
-@@ -2334,7 +2334,7 @@ config("symbols") {
+@@ -2262,7 +2262,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) {
@@ -80,8 +80,8 @@
 +      cflags += [ "-g0" ]
      }
  
-     if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2355,7 +2355,7 @@ config("symbols") {
+     if (is_clang && !is_nacl && !use_xcode_clang) {
+@@ -2290,7 +2290,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" &&
diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni
index 5826499ed89a..a1d68d448cca 100644
--- a/www/chromium/files/patch-build_config_compiler_compiler.gni
+++ b/www/chromium/files/patch-build_config_compiler_compiler.gni
@@ -1,4 +1,4 @@
---- build/config/compiler/compiler.gni.orig	2020-03-16 18:40:27 UTC
+--- build/config/compiler/compiler.gni.orig	2020-05-13 18:40:16 UTC
 +++ build/config/compiler/compiler.gni
 @@ -47,7 +47,7 @@ declare_args() {
    # only two architectures that are currently checked in). Turn this off when
@@ -9,7 +9,7 @@
        (current_cpu == "x64" || current_cpu == "x86")
    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                                root_build_dir)
-@@ -200,7 +200,7 @@ declare_args() {
+@@ -190,7 +190,7 @@ declare_args() {
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.
    use_gold =
diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn
index 94faef049b08..e1ce0cbb1905 100644
--- a/www/chromium/files/patch-build_config_linux_BUILD.gn
+++ b/www/chromium/files/patch-build_config_linux_BUILD.gn
@@ -1,9 +1,9 @@
---- build/config/linux/BUILD.gn.orig	2019-03-11 22:00:52 UTC
+--- build/config/linux/BUILD.gn.orig	2020-05-13 18:39:36 UTC
 +++ build/config/linux/BUILD.gn
-@@ -28,7 +28,7 @@ config("runtime_library") {
-   }
+@@ -30,7 +30,7 @@ config("runtime_library") {
  
-   if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
+   if ((!(is_chromeos || chromeos_is_browser_only) ||
+        default_toolchain != "//build/toolchain/cros:target") &&
 -      (!use_custom_libcxx || current_cpu == "mipsel")) {
 +      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
      libs = [ "atomic" ]
diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni
index 83a58cad544a..8b68404769fb 100644
--- a/www/chromium/files/patch-build_config_sysroot.gni
+++ b/www/chromium/files/patch-build_config_sysroot.gni
@@ -1,15 +1,14 @@
---- build/config/sysroot.gni.orig	2019-03-11 22:00:52 UTC
+--- build/config/sysroot.gni.orig	2020-05-13 18:39:36 UTC
 +++ build/config/sysroot.gni
-@@ -15,9 +15,10 @@ declare_args() {
-   # The absolute path to directory containing linux sysroot images
-   target_sysroot_dir = "//build/linux"
+@@ -21,9 +21,9 @@ declare_args() {
  
+   # Controls default is_linux sysroot. If set to true, and sysroot
+   # is empty, default sysroot is calculated.
 -  use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-+  use_sysroot = !is_bsd && (
-+                current_cpu == "x86" || current_cpu == "x64" ||
++  use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" ||
                  current_cpu == "arm" || current_cpu == "arm64" ||
 -                current_cpu == "mipsel" || current_cpu == "mips64el"
 +                current_cpu == "mipsel" || current_cpu == "mips64el")
  }
  
- if (current_os == target_os && current_cpu == target_cpu &&
+ if (sysroot == "") {
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index 4d315485b923..ca744b0b239e 100644
--- 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	2020-03-16 18:40:27 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2020-05-13 18:40:16 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).
  #
-@@ -577,13 +582,23 @@ template("clang_toolchain") {
+@@ -589,13 +594,23 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index f2e64c64d738..865dd3526bf5 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig	2020-03-16 18:40:27 UTC
+--- cc/BUILD.gn.orig	2020-05-13 18:40:16 UTC
 +++ cc/BUILD.gn
-@@ -582,7 +582,7 @@ cc_test_static_library("test_support") {
+@@ -589,7 +589,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,11 +9,11 @@
      data_deps = [ "//third_party/mesa_headers" ]
    }
  }
-@@ -788,7 +788,6 @@ cc_test("cc_unittests") {
+@@ -790,7 +790,6 @@ cc_test("cc_unittests") {
    ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
 -    "//third_party/mesa_headers",
    ]
  
-   if (enable_vulkan) {
+   defines = []
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index d8e7bed84ae0..038910a7b63b 100644
--- 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	2020-03-16 18:40:27 UTC
+--- cc/trees/property_tree.cc.orig	2020-05-13 18:40:17 UTC
 +++ cc/trees/property_tree.cc
-@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1241,13 +1241,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
  
diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn
new file mode 100644
index 000000000000..3c86ba8309e7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_BUILD.gn
@@ -0,0 +1,11 @@
+--- chrome/app/BUILD.gn.orig	2020-05-18 10:34:00 UTC
++++ chrome/app/BUILD.gn
+@@ -138,7 +138,7 @@ static_library("test_support") {
+     "//v8:v8_headers",
+   ]
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
+     deps += [
+       "//components/crash/core/app",
diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
index 983a9acf8891..574ea4322784 100644
--- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,8 +1,8 @@
---- chrome/app/chrome_command_ids.h.orig	2020-02-03 21:53:28 UTC
+--- chrome/app/chrome_command_ids.h.orig	2020-05-13 18:39:36 UTC
 +++ chrome/app/chrome_command_ids.h
-@@ -62,7 +62,7 @@
- #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
- #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
+@@ -60,7 +60,7 @@
+ #define IDC_MAXIMIZE_WINDOW             34047
+ #define IDC_ALL_WINDOWS_FRONT           34048
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 88a9416974a2..774d4feeafec 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2020-03-16 18:40:27 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2020-05-13 18:40:17 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@
  #include "chrome/app/shutdown_signal_handlers_posix.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -142,12 +142,12 @@
+@@ -145,12 +145,12 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -22,18 +22,18 @@
 -    defined(OS_LINUX)
 +    defined(OS_LINUX) || defined(OS_BSD)
  #include "chrome/browser/policy/policy_path_parser.h"
- #include "components/crash/content/app/crashpad.h"
+ #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -246,7 +246,7 @@ bool UseHooks() {
+@@ -276,7 +276,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
  
  #endif  // defined(OS_WIN)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
  void AdjustLinuxOOMScore(const std::string& process_type) {
-   // Browsers and zygotes should still be killable, but killed last.
-   const int kZygoteScore = 0;
-@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+   int score = -1;
+ 
+@@ -316,13 +316,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty
    if (score > -1)
      base::AdjustOOMScore(base::GetCurrentProcId(), score);
  }
@@ -49,7 +49,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == service_manager::switches::kZygoteProcess ||
  #endif
-@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -361,7 +361,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
    return false;
  }
  
@@ -58,7 +58,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) ||
-@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -371,7 +371,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
      PLOG(FATAL) << "execlp failed";
    }
  }
@@ -67,7 +67,7 @@
  
  #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
  void SIGTERMProfilingShutdown(int signal) {
-@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -425,7 +425,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -76,7 +76,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.
-@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -437,7 +437,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -85,16 +85,25 @@
  #if defined(OS_MACOSX)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -483,7 +483,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);
+@@ -509,7 +509,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+   startup_metric_utils::RecordApplicationStartTime(now);
+ #endif
+ 
 -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
    // Record the startup process creation time on supported platforms.
    startup_metric_utils::RecordStartupProcessCreationTime(
        base::Process::Current().CreationTime());
-@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -701,7 +701,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+   v8_crashpad_support::SetUp();
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   if (!crash_reporter::IsCrashpadEnabled()) {
+     breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
+   }
+@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
      *exit_code = 0;
      return true;  // Got a --version switch; exit with a success error code.
    }
@@ -103,7 +112,7 @@
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -112,7 +121,16 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -916,7 +916,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ 
+   crash_reporter::InitializeCrashKeys();
+ 
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+   ChromeCrashReporterClient::Create();
+ #endif
+ 
+@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  #if defined(OS_WIN)
    child_process_logging::Init();
  #endif
@@ -121,16 +139,16 @@
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
-@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
-   InitializePDF();
- #endif
+@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+         locale;
+   }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != service_manager::switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1068,7 +1068,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      }
  #endif  // defined(OS_ANDROID)
    }
@@ -139,7 +157,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -1059,7 +1059,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1082,7 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
  void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
    // Note: If you are adding a new process type below, be sure to adjust the
    // AdjustLinuxOOMScore function too.
@@ -148,7 +166,7 @@
    AdjustLinuxOOMScore(process_type);
  #endif
  #if defined(OS_WIN)
-@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess(
+@@ -1128,7 +1128,7 @@ int ChromeMainDelegate::RunProcess(
      // This entry is not needed on Linux, where the NaCl loader
      // process is launched via nacl_helper instead.
  #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \
@@ -157,3 +175,21 @@
      {switches::kNaClLoaderProcess, NaClMain},
  #else
      {"<invalid>", NULL},  // To avoid constant array of size 0
+@@ -1156,7 +1156,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
+ #endif  // !defined(OS_ANDROID)
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+ void ChromeMainDelegate::ZygoteStarting(
+     std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
+         delegates) {
+@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ZygoteForked() {
+   crash_keys::SetCrashKeysFromCommandLine(*command_line);
+ }
+ 
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) && !defined(OS_BSD)
+ 
+ content::ContentClient* ChromeMainDelegate::CreateContentClient() {
+   return &chrome_content_client_;
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 7a0c0ed086dc..cb5d74e9cf99 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig	2020-03-16 18:40:27 UTC
+--- chrome/app/chromium_strings.grd.orig	2020-05-13 18:40:17 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -649,7 +649,7 @@ Chromium is unable to recover your settings.
+@@ -680,7 +680,7 @@ Chromium is unable to recover your settings.
        </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>
-@@ -750,7 +750,7 @@ Chromium is unable to recover your settings.
+@@ -781,7 +781,7 @@ Chromium is unable to recover your settings.
        </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>
-@@ -972,7 +972,7 @@ Chromium is unable to recover your settings.
+@@ -1003,7 +1003,7 @@ Chromium is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index fcae380a37c1..8b57ac697694 100644
--- 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	2020-03-16 18:40:27 UTC
+--- chrome/app/generated_resources.grd.orig	2020-05-13 18:40:17 UTC
 +++ chrome/app/generated_resources.grd
-@@ -5141,7 +5141,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5137,7 +5137,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>
-@@ -6861,7 +6861,7 @@ the Bookmarks menu.">
+@@ -6880,7 +6880,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>
-@@ -7822,7 +7822,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7806,7 +7806,7 @@ Please help our engineers fix this problem. Tell us wh
          Set as default
        </message>
  
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index 47ad7a871540..87f5ea15d159 100644
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig	2020-03-16 18:40:27 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2020-05-13 18:40:17 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -661,7 +661,7 @@ Google Chrome is unable to recover your settings.
+@@ -692,7 +692,7 @@ Google Chrome is unable to recover your settings.
        </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>
-@@ -762,7 +762,7 @@ Google Chrome is unable to recover your settings.
+@@ -793,7 +793,7 @@ Google Chrome is unable to recover your settings.
        </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>
-@@ -991,7 +991,7 @@ Google Chrome is unable to recover your settings.
+@@ -1022,7 +1022,7 @@ Google Chrome is unable to recover your settings.
        </message>
  
        <!-- Plugin Placeholders -->
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 18bd3350bdf8..73c0d4e40cc8 100644
--- 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	2020-03-16 18:40:29 UTC
+--- chrome/app/settings_strings.grdp.orig	2020-05-13 18:40:22 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -811,7 +811,7 @@
+@@ -111,7 +111,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>
-@@ -825,7 +825,7 @@
+@@ -125,7 +125,7 @@
        Use Classic
      </message>
    </if>
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
new file mode 100644
index 000000000000..a4c329d585b8
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -0,0 +1,22 @@
+--- chrome/browser/BUILD.gn.orig	2020-05-13 18:40:22 UTC
++++ chrome/browser/BUILD.gn
+@@ -4195,7 +4195,9 @@ jumbo_static_library("browser") {
+       configs += [ "//build/config/linux:x11" ]
+       deps += [ "//ui/gfx/x" ]
+     }
+-    deps += [ "//services/service_manager/zygote" ]
++    if (!is_bsd) {
++      deps += [ "//services/service_manager/zygote" ]
++    }
+ 
+     if (use_allocator == "tcmalloc") {
+       deps += [ "//chrome/common/performance_manager/mojom" ]
+@@ -4408,7 +4410,7 @@ jumbo_static_library("browser") {
+     ]
+   }
+ 
+-  if (is_posix && !is_mac) {
++  if (is_posix && !is_mac && !is_bsd) {
+     # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
+     sources += [
+       "//chrome/app/chrome_crash_reporter_client.cc",
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index aec113703d20..68863a9468ba 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2020-04-03 04:11:28 UTC
+--- chrome/browser/about_flags.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/about_flags.cc
-@@ -170,7 +170,7 @@
+@@ -173,7 +173,7 @@
  #include "ui/gl/gl_switches.h"
  #include "ui/native_theme/native_theme_features.h"
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -834,7 +834,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
+@@ -873,7 +873,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[
       heap_profiling::kMemlogSamplingRate5MB},
  };
  
@@ -18,16 +18,16 @@
  const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
      {"DocumentUseServerScore", "true"},
      {"DocumentUseClientScore", "false"},
-@@ -872,7 +872,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP
-      base::size(kOmniboxDocumentProviderClientScoring), nullptr},
-     {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring,
-      base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}};
+@@ -1038,7 +1038,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc
+         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 kOmniboxOnFocusSuggestionsParamSERP[] = {
      {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}};
-@@ -994,14 +994,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
+@@ -1154,14 +1154,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat
      {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6),
       nullptr}};
  
@@ -44,7 +44,7 @@
  
  const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = {
      {security_state::features::kMarkHttpAsFeatureParameterName,
-@@ -2031,13 +2031,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2264,13 +2264,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kCloudPrintXpsDescription, kOsWin,
       SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
  #endif  // OS_WIN
@@ -60,7 +60,7 @@
      {"enable-webgl-draft-extensions",
       flag_descriptions::kWebglDraftExtensionsName,
       flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -2074,14 +2074,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2307,14 +2307,14 @@ const FeatureEntry kFeatureEntries[] = {
                                      "OverrideTranslateTriggerInIndia")},
  #endif  // OS_ANDROID
  
@@ -77,7 +77,7 @@
  
  #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS)
      {"enable-native-notifications",
-@@ -2159,13 +2159,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2404,13 +2404,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS,
       FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)},
  #endif  // OS_CHROMEOS
@@ -93,7 +93,7 @@
  #if defined(OS_ANDROID)
      {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName,
       flag_descriptions::kCreditCardAssistDescription, kOsAndroid,
-@@ -2239,7 +2239,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2475,7 +2475,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)},
  #endif  // OS_ANDROID
@@ -102,7 +102,7 @@
      {"enable-save-data", flag_descriptions::kEnableSaveDataName,
       flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
       SINGLE_VALUE_TYPE(
-@@ -2907,7 +2907,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(
           omnibox::kHistoryQuickProviderAllowMidwordContinuations)},
  
@@ -111,16 +111,16 @@
      {"omnibox-experimental-keyword-mode",
       flag_descriptions::kOmniboxExperimentalKeywordModeName,
       flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2956,7 +2956,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOmniboxAutocompleteTitlesName,
-      flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)},
+@@ -3204,7 +3204,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion,
+                                     kOmniboxRichAutocompletionVariations,
+                                     "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,
-@@ -3182,13 +3182,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3416,13 +3416,13 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -136,8 +136,8 @@
  
  #if !defined(OS_ANDROID)
      {"ntp-confirm-suggestion-removals",
-@@ -3850,12 +3850,12 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(kClickToCallDetectionV2)},
+@@ -4052,7 +4052,7 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(kClickToCallUI)},
  #endif  // BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -145,22 +145,25 @@
      defined(OS_CHROMEOS)
      {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName,
       flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(kRemoteCopyReceiver)},
+@@ -4065,7 +4065,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kRemoteCopyProgressNotificationName,
+      flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)},
 -#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)
  
-     {"shared-clipboard-receiver",
-@@ -3899,7 +3899,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kSharingUseDeviceInfoDescription, kOsAll,
-      FEATURE_VALUE_TYPE(kSharingUseDeviceInfo)},
+     {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName,
+@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSharingDeriveVapidKeyDescription, kOsAll,
+      FEATURE_VALUE_TYPE(kSharingDeriveVapidKey)},
  
 -#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)
      {"sharing-peer-connection-receiver",
       flag_descriptions::kSharingPeerConnectionReceiverName,
-@@ -3910,7 +3910,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4118,7 +4118,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSharingPeerConnectionSenderName,
       flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)},
@@ -169,7 +172,7 @@
          // defined(OS_CHROMEOS)
  
      {"sharing-qr-code-generator",
-@@ -3985,13 +3985,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4193,13 +4193,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)},
  #endif
  
@@ -185,7 +188,7 @@
          // defined(OS_CHROMEOS)
  
      {"enable-audio-focus-enforcement",
-@@ -4436,7 +4436,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4654,7 +4654,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll,
       FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)},
  
@@ -194,7 +197,7 @@
      {"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
       flag_descriptions::kGlobalMediaControlsDescription,
       kOsWin | kOsMac | kOsLinux,
-@@ -4453,7 +4453,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4671,7 +4671,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kGlobalMediaControlsPictureInPictureDescription,
       kOsWin | kOsMac | kOsLinux | kOsCrOS,
       FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)},
diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index 45d6d7927deb..e27f41b91fab 100644
--- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,6 +1,6 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2019-09-09 21:55:09 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+@@ -86,7 +86,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
        return metrics::OmniboxInputType::QUERY;
  
      case ExternalProtocolHandler::UNKNOWN: {
@@ -9,9 +9,12 @@
        // 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::EMPTY;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-       // If block state is unknown, check if there is an application registered
-       // for the url scheme.
-       GURL url(scheme + "://");
+@@ -99,7 +99,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+           shell_integration::GetApplicationNameForProtocol(url);
+       return application_name.empty() ? metrics::OmniboxInputType::EMPTY
+                                       : metrics::OmniboxInputType::URL;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+     }
+   }
+   NOTREACHED();
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index 021a83b1c450..3c536250c00d 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,7 +1,7 @@
---- chrome/browser/browser_resources.grd.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/browser_resources.grd.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -54,7 +54,7 @@
-         <include name="IDR_DISCARDS_MOJO_PUBLIC_BASE_PROCESS_ID_MOJOM_LITE_JS" file="${root_gen_dir}\mojo\public\mojom\base\process_id.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
+@@ -63,7 +63,7 @@
+         <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
          <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
        </if>
 -      <if expr="is_win or is_macosx or (is_linux and not chromeos)">
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 80a27c8a8950..b39fb96034c4 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2020-03-17 09:35:03 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -97,7 +97,7 @@
+@@ -109,7 +109,7 @@
  #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h"
  #endif
  
@@ -9,8 +9,8 @@
      defined(OS_CHROMEOS)
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
  #include "chrome/browser/ui/webui/discards/discards_ui.h"
-@@ -471,7 +471,7 @@ void PopulateChromeWebUIFrameBinders(
-       map);
+@@ -532,7 +532,7 @@ void PopulateChromeWebUIFrameBinders(
+       media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map);
  #endif
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index 51bb283f651b..7f7a4d71321f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -224,9 +224,9 @@
+@@ -208,11 +208,11 @@
  #include "components/arc/metrics/stability_metrics_manager.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -10,9 +10,12 @@
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  
- #if defined(OS_LINUX)
- #include "components/crash/content/app/breakpad_linux.h"
-@@ -265,7 +265,7 @@
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+ #include "components/crash/core/app/breakpad_linux.h"
+ #include "components/crash/core/app/crashpad.h"
+ #endif
+@@ -246,7 +246,7 @@
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -21,7 +24,7 @@
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
  #endif
-@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -919,7 +919,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -30,7 +33,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 .
-@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -928,7 +928,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                   &user_native_messaging_dir));
      if (!base::PathExists(user_native_messaging_dir))
        base::CreateDirectory(user_native_messaging_dir);
@@ -39,7 +42,7 @@
    }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
-@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -966,7 +966,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -48,7 +51,7 @@
    metrics::DesktopSessionDurationTracker::Initialize();
    ProfileActivityMetricsRecorder::Initialize();
  #endif
-@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1119,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
        base::TimeDelta::FromMinutes(1));
  
  #if !defined(OS_ANDROID)
@@ -56,7 +59,7 @@
    if (base::FeatureList::IsEnabled(features::kWebUsb)) {
      web_usb_detector_.reset(new WebUsbDetector());
      base::PostTask(
-@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1127,6 +1128,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
          base::BindOnce(&WebUsbDetector::Initialize,
                         base::Unretained(web_usb_detector_.get())));
    }
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index f7f343f3e0b5..d7386b1bb87f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,14 +1,17 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2019-12-16 21:50:42 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2020-05-13 18:39:37 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -81,14 +81,16 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -83,6 +83,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
 +#if !defined(OS_BSD)
-   bool enabled = (crash_reporter::IsCrashpadEnabled() &&
-                   crash_reporter::GetUploadsEnabled()) ||
-                  breakpad::IsCrashReporterEnabled();
-   g_browser_process->metrics_service()->RecordBreakpadRegistration(enabled);
+   bool breakpad_registered;
+   if (crash_reporter::IsCrashpadEnabled()) {
+     // If we're using crashpad, there's no breakpad and crashpad is always
+@@ -100,10 +101,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() {
+   }
+   g_browser_process->metrics_service()->RecordBreakpadRegistration(
+       breakpad_registered);
 +#endif
  }
  
@@ -18,7 +21,7 @@
    bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
  #endif
  
-@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -111,7 +113,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 270f07c28cd5..0eed600fa6d3 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -390,7 +390,7 @@
+@@ -396,7 +396,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"
@@ -9,7 +9,7 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -444,7 +444,7 @@
+@@ -450,12 +450,12 @@
  #endif  //  !defined(OS_ANDROID)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,16 +18,22 @@
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #include "services/service_manager/sandbox/features.h"
  #endif
-@@ -477,7 +477,7 @@
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+ #include "components/crash/core/app/crash_switches.h"
+ #include "components/crash/core/app/crashpad.h"
+ #endif
+@@ -483,7 +483,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #if defined(USE_X11)
- #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h"
- #else
-@@ -820,11 +820,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
+ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
+ #endif
+ 
+@@ -789,11 +789,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
  }
  
  int GetCrashSignalFD(const base::CommandLine& command_line) {
@@ -41,7 +47,7 @@
  
    // Extensions have the same process type as renderers.
    if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
-@@ -1269,7 +1271,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1230,7 +1232,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
  #elif defined(OS_CHROMEOS)
    main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>(
        parameters, startup_data_);
@@ -50,16 +56,16 @@
    main_parts =
        std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_);
  #elif defined(OS_ANDROID)
-@@ -1295,7 +1297,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1256,7 +1258,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
      // Construct additional browser parts. Stages are called in the order in
      // which they are added.
  #if defined(TOOLKIT_VIEWS)
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #if defined(USE_X11)
-   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11());
+   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  #else
-@@ -2020,7 +2022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
+@@ -1979,7 +1981,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -68,7 +74,7 @@
  #if defined(OS_ANDROID)
    bool enable_crash_reporter = true;
  #else
-@@ -2288,7 +2290,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2256,7 +2258,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
    StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
        process_type, command_line);
  
@@ -77,7 +83,7 @@
    // 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)) {
-@@ -3564,7 +3566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3546,7 +3548,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -86,7 +92,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -3696,7 +3698,7 @@ void ChromeContentBrowserClient::BindCredentialManager
+@@ -3681,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager
  }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -95,7 +101,7 @@
  bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) {
    const base::Value* audio_sandbox_enabled_policy_value =
        policies.GetValue(policy::key::kAudioSandboxEnabled);
-@@ -3714,7 +3716,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&
+@@ -3699,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap&
  
  void ChromeContentBrowserClient::WillStartServiceManager() {
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -104,7 +110,7 @@
    if (startup_data_) {
      auto* chrome_feature_list_creator =
          startup_data_->chrome_feature_list_creator();
-@@ -3999,7 +4001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -3984,7 +3986,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index c8b5fce3597e..0f1e2915cb69 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -364,12 +364,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -369,12 +369,12 @@ class ChromeContentBrowserClient : public content::Con
    void OverridePageVisibilityState(
        content::RenderFrameHost* render_frame_host,
        content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
index 3a56c04bdb97..b57482f51663 100644
--- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
@@ -1,8 +1,8 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig	2020-03-17 09:36:38 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/dev_ui_browser_resources.grd
-@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa
-       <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-       <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js" flattenhtml="true" type="BINDATA" compress="gzip" />
+@@ -61,7 +61,7 @@ This file specifies browser resources for developer-fa
+       <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
+       <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
  
 -      <if expr="is_android or is_linux">
 +      <if expr="is_android or is_posix">
diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
new file mode 100644
index 000000000000..45d466568060
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2020-05-15 14:52:43 UTC
++++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
+@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
+ #if defined(OS_CHROMEOS)
+   return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
+       local_state);
+-#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   DCHECK(base::FeatureList::IsEnabled(policy::features::kCBCMServiceAccounts));
+   return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
+ #else
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
index 7de89e40fd17..981280a09128 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig	2019-12-16 21:50:42 UTC
+--- chrome/browser/download/download_commands.cc.orig	2020-05-13 18:39:37 UTC
 +++ chrome/browser/download/download_commands.cc
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  #include "net/base/url_util.h"
  #include "ui/base/clipboard/scoped_clipboard_writer.h"
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-@@ -153,7 +153,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+@@ -154,7 +154,7 @@ void DownloadCommands::ExecuteCommand(Command command)
    model_->ExecuteCommand(this, command);
  }
  
@@ -18,7 +18,7 @@
  
  Browser* DownloadCommands::GetBrowser() const {
    chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile());
-@@ -176,12 +176,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+@@ -177,12 +177,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
    return IsDownloadPdf() &&
           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                            : true);
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 4b367d9bc2e5..cc795d2eeee2 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/download/download_item_model.cc
-@@ -592,7 +592,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -595,7 +595,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();
-@@ -632,7 +632,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -635,7 +635,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
        bool is_checked = IsCommandChecked(download_commands,
                                           DownloadCommands::ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 4309d41da843..e3fe049c897a 100644
--- 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	2020-03-16 18:40:29 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1175,6 +1175,12 @@ jumbo_static_library("extensions") {
+@@ -1185,6 +1185,12 @@ jumbo_static_library("extensions") {
      deps += [ "//chrome/common:service_process_mojom" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
index 8620f64e57fd..8fb33a194cdc 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig	2020-03-18 08:39:42 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig	2020-05-13 18:39:37 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc
 @@ -8,7 +8,9 @@
  #include <gio/gio.h>
@@ -10,7 +10,7 @@
  
  #include <string>
  
-@@ -90,6 +92,7 @@ enterprise_reporting_private::SettingValue GetScreenlo
+@@ -91,6 +93,7 @@ enterprise_reporting_private::SettingValue GetScreenlo
  // Implements the logic from the native host installation script. First find the
  // root device identifier, then locate its parent and get its type.
  enterprise_reporting_private::SettingValue GetDiskEncrypted() {
@@ -18,7 +18,7 @@
    struct stat info;
    // First figure out the device identifier.
    stat("/", &info);
-@@ -109,6 +112,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr
+@@ -110,6 +113,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr
      return is_encrypted ? enterprise_reporting_private::SETTING_VALUE_ENABLED
                          : enterprise_reporting_private::SETTING_VALUE_DISABLED;
    }
@@ -26,7 +26,7 @@
    return enterprise_reporting_private::SETTING_VALUE_UNKNOWN;
  }
  
-@@ -120,7 +124,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de
+@@ -121,7 +125,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de
  
  DeviceInfo DeviceInfoFetcherLinux::Fetch() {
    DeviceInfo device_info;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
index 8a3736baf4ee..8b9aeec97746 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2020-04-03 04:11:29 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2020-05-18 18:39:09 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
  #include "base/win/registry.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -382,7 +382,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -384,7 +384,7 @@ base::FilePath GetEndpointVerificationDir() {
      return *GetEndpointVerificationDirOverride();
  #if defined(OS_WIN)
    if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path))
@@ -18,7 +18,7 @@
    std::unique_ptr<base::Environment> env(base::Environment::Create());
    path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
                                      base::nix::kDotConfigDir);
-@@ -393,7 +393,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -395,7 +395,7 @@ base::FilePath GetEndpointVerificationDir() {
    if (true)
  #endif
      return path;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
index 0b5c1a821007..ae3f09c5bb85 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2020-05-13 18:39:37 UTC
 +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
-@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
+@@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
  
  void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -8,7 +8,7 @@
    if (g_test_device_list.Get().get() != nullptr) {
      base::ThreadTaskRunnerHandle::Get()->PostTask(
          FROM_HERE,
-@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
+@@ -35,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
         base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
        base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
        std::move(callback));
diff --git 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
index 40176332dcff..587dbc716c43 100644
--- 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,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -160,7 +160,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -161,7 +161,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
    (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  
@@ -9,7 +9,7 @@
    (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
  #endif
-@@ -170,7 +170,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
    // Appearance settings.
    (*s_whitelist)[::prefs::kCurrentThemeID] =
        settings_api::PrefType::PREF_TYPE_STRING;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
index 7440fdc3cc94..2080e8e75364 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -1,4 +1,4 @@
---- 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.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
 @@ -29,7 +29,7 @@
  #include "extensions/browser/process_manager.h"
@@ -18,24 +18,22 @@
    if (extension) {
      enabled_by_permissions =
          extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
- }
+@@ -569,7 +569,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
  
- bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() {
+ ExtensionFunction::ResponseAction
+ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
    // 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
-@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run
+@@ -592,9 +592,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
            &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback,
            this));
-   return true;
+   return RespondLater();
 -#else   // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#else   // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   SetError("Not supported on the current OS");
-   SendResponse(false);
-   return false;
+   return RespondNow(Error("Not supported on the current OS"));
 -#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
  }
diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index fbddcf6c422b..1afd5afa82c4 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2020-02-03 21:52:39 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
  #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
  #include "ppapi/buildflags/buildflags.h"
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -96,7 +96,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
    extensions::IdentityAPI::GetFactoryInstance();
    extensions::InstallTrackerFactory::GetInstance();
    extensions::InstallVerifierFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 0252971d0ac9..a852eb590b63 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2020-04-03 04:11:29 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -3646,7 +3646,7 @@ const char kZeroStateFilesDescription[] =
+@@ -3723,7 +3723,7 @@ const char kZeroStateFilesDescription[] =
  
  #endif  // defined(OS_CHROMEOS)
  
@@ -9,7 +9,7 @@
  
  #if BUILDFLAG(USE_TCMALLOC)
  const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning";
-@@ -3655,7 +3655,7 @@ const char kDynamicTcmallocDescription[] =
+@@ -3732,7 +3732,7 @@ const char kDynamicTcmallocDescription[] =
      "utilization.";
  #endif  // BUILDFLAG(USE_TCMALLOC)
  
@@ -18,7 +18,7 @@
  
  // All views-based platforms --------------------------------------------------
  
-@@ -3680,13 +3680,13 @@ const char kReopenTabInProductHelpDescription[] =
+@@ -3757,13 +3757,13 @@ const char kReopenTabInProductHelpDescription[] =
  
  // Random platform combinations -----------------------------------------------
  
@@ -34,7 +34,7 @@
  
  #if BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
-@@ -3703,7 +3703,7 @@ const char kClickToCallDetectionV2Description[] =
+@@ -3775,7 +3775,7 @@ const char kClickToCallUIDescription[] =
  
  #endif  // BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
@@ -43,9 +43,9 @@
      defined(OS_CHROMEOS)
  
  const char kRemoteCopyReceiverName[] =
-@@ -3712,16 +3712,16 @@ const char kRemoteCopyReceiverDescription[] =
-     "Enables the remote copy feature to handle messages by writing content to "
-     "the clipboard and showing a notification to the user.";
+@@ -3796,16 +3796,16 @@ const char kRemoteCopyProgressNotificationDescription[
+     "Enables progress notifications to be shown for the remote copy feature "
+     "when receiving a message.";
  
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 027a0d85fea5..a51623b6f6ea 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,8 +1,8 @@
---- chrome/browser/flag_descriptions.h.orig	2020-04-03 04:11:29 UTC
+--- chrome/browser/flag_descriptions.h.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -21,9 +21,9 @@
- #include "ui/android/buildflags.h"
- #endif  // defined(OS_ANDROID)
+@@ -18,9 +18,9 @@
+ #include "ppapi/buildflags/buildflags.h"
+ #include "printing/buildflags/buildflags.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
@@ -12,7 +12,7 @@
  
  // This file declares strings used in chrome://flags. These messages are not
  // translated, because instead of end-users they target Chromium developers and
-@@ -2128,14 +2128,14 @@ extern const char kZeroStateFilesDescription[];
+@@ -2167,14 +2167,14 @@ extern const char kZeroStateFilesDescription[];
  
  #endif  // #if defined(OS_CHROMEOS)
  
@@ -29,7 +29,7 @@
  
  // All views-based platforms --------------------------------------------------
  
-@@ -2154,12 +2154,12 @@ extern const char kReopenTabInProductHelpDescription[]
+@@ -2193,12 +2193,12 @@ extern const char kReopenTabInProductHelpDescription[]
  
  // Random platform combinations -----------------------------------------------
  
@@ -44,7 +44,7 @@
  
  #if BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
-@@ -2171,21 +2171,21 @@ extern const char kClickToCallDetectionV2Description[]
+@@ -2207,7 +2207,7 @@ extern const char kClickToCallUIDescription[];
  
  #endif  // BUILDFLAG(ENABLE_CLICK_TO_CALL)
  
@@ -53,10 +53,12 @@
      defined(OS_CHROMEOS)
  
  extern const char kRemoteCopyReceiverName[];
- extern const char kRemoteCopyReceiverDescription[];
+@@ -2219,15 +2219,15 @@ extern const char kRemoteCopyImageNotificationDescript
+ extern const char kRemoteCopyProgressNotificationName[];
+ extern const char kRemoteCopyProgressNotificationDescription[];
  
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
++#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)
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc
index 2c4302248909..e64374c89640 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -1,6 +1,6 @@
---- chrome/browser/memory_details.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/memory_details.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/memory_details.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -9,7 +9,7 @@
  #include "services/service_manager/zygote/zygote_host_linux.h"
  #endif
  
-@@ -336,7 +336,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
        process.titles.push_back(title);
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc b/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
deleted file mode 100644
index 3bb3c96f9188..000000000000
--- a/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/browser/metrics/bluetooth_available_utility.cc.orig	2019-06-04 18:55:17 UTC
-+++ chrome/browser/metrics/bluetooth_available_utility.cc
-@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() {
-     return;
-   }
- 
-+#if !defined(OS_BSD)
-   device::BluetoothAdapterFactory::Get().GetAdapter(
-       base::BindOnce(&OnGetAdapter));
-+#endif
- }
- 
- }  // namespace bluetooth_utility
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index a1c3fbc542a8..94ff3ea4dd21 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -718,11 +718,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -679,11 +679,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -14,7 +14,7 @@
  
  #if BUILDFLAG(ENABLE_PLUGINS)
    plugin_metrics_provider_ = new PluginMetricsProvider(local_state);
-@@ -980,7 +980,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -941,7 +941,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
    }
  #endif
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
index 7994a85f8cec..d7993ef64a72 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/metrics/process_memory_metrics_emitter.cc
-@@ -438,7 +438,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -462,7 +462,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,7 +9,7 @@
    builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
                                     1024);
  #endif
-@@ -461,7 +461,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+@@ -485,7 +485,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
    MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) +
                                    process_name + ".SharedMemoryFootprint",
                                pmd.os_dump().shared_footprint_kb / 1024);
diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
index 21db21328ad3..cea7509438b9 100644
--- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig	2020-05-13 18:39:37 UTC
 +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc
-@@ -144,7 +144,7 @@ const struct {
+@@ -150,7 +150,7 @@ const struct {
      {base::DIR_APP_DATA, nullptr, true},
      {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true},
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index aace9f122f49..3a105c992e73 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -79,11 +79,11 @@
+@@ -74,11 +74,11 @@
  #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -12,9 +12,9 @@
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  
- #if defined(OS_WIN) || defined(OS_MACOSX)
- #include "content/public/common/network_service_util.h"
-@@ -160,10 +160,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+ #include "extensions/common/constants.h"
+@@ -137,10 +137,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->enable_negotiate_port =
        local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
  
@@ -27,7 +27,7 @@
  
  #if defined(OS_POSIX)
    auth_dynamic_params->ntlm_v2_enabled =
-@@ -429,10 +429,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -349,10 +349,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
                               auth_pref_callback);
  
@@ -40,7 +40,7 @@
  
  #if defined(OS_POSIX)
    pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
-@@ -485,10 +485,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -397,10 +397,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
    registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
                                 std::string());
@@ -53,9 +53,9 @@
  
  #if defined(OS_POSIX)
    registry->RegisterBooleanPref(
-@@ -610,7 +610,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
-       insecure_stub_resolver_enabled, secure_dns_mode,
-       std::move(dns_over_https_servers));
+@@ -485,7 +485,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+   // NetworkContext is created, but before anything has the chance to use it.
+   stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */);
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
index 7688028b44a2..413ef580529e 100644
--- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/notifications/notification_display_service_impl.cc
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
  #include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
  #endif
  
@@ -9,7 +9,25 @@
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #endif
  
-@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+@@ -49,7 +49,7 @@ namespace {
+ 
+ #if !defined(OS_CHROMEOS)
+ bool NativeNotificationsEnabled(Profile* profile) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (profile) {
+     PrefService* prefs = profile->GetPrefs();
+     if (!prefs->GetBoolean(prefs::kAllowNativeNotifications))
+@@ -131,7 +131,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer
+ // static
+ void NotificationDisplayServiceImpl::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true);
+ #endif
+ }
+@@ -148,7 +148,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
      AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
                             std::make_unique<PersistentNotificationHandler>());
  
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
index 889049cf9109..7f8e5da7b3be 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/password_store_factory.cc.orig	2019-10-21 19:06:22 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+@@ -189,7 +189,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
                          base::TimeDelta::FromSeconds(20));
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -8,4 +8,4 @@
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
        std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
-           IdentityManagerFactory::GetForProfile(profile));
+           profile);
diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
index b79d0d1d66d8..9f19ccc8e9f4 100644
--- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2019-09-16 07:21:37 UTC
+--- chrome/browser/policy/browser_signin_policy_handler.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/policy/browser_signin_policy_handler.cc
-@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
+@@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c
      }
      switch (static_cast<BrowserSigninMode>(int_value)) {
        case BrowserSigninMode::kForced:
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 8f82b5f2a44d..34dbb9264e81 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,18 +1,9 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -118,7 +118,7 @@
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MACOSX) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
- #endif
- 
-@@ -355,11 +355,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-   { key::kWebComponentsV0Enabled,
-     prefs::kWebComponentsV0Enabled,
+@@ -1162,11 +1162,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
+ #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
+ 
 -#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,
@@ -20,24 +11,20 @@
      base::Value::Type::BOOLEAN },
 -#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if defined(OS_POSIX)
-   { key::kNtlmV2Enabled,
-     prefs::kNtlmV2Enabled,
-@@ -1163,7 +1163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox,
+ 
+ #if !defined(OS_MACOSX)
+   { key::kFullscreenAllowed,
+@@ -1234,11 +1234,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
- #if defined(OS_WIN) || defined(OS_MACOSX) || \
--    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   { key::kAlternativeBrowserPath,
-     browser_switcher::prefs::kAlternativeBrowserPath,
-     base::Value::Type::STRING },
-@@ -1203,7 +1203,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,
+ #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   { key::kAllowNativeNotifications,
+     prefs::kAllowNativeNotifications,
      base::Value::Type::BOOLEAN },
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ #if defined(OS_CHROMEOS)
+   { key::kRequiredClientCertificateForUser,
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
index 816eeffdc37e..a78ccc8787f8 100644
--- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2020-02-03 21:52:40 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -250,6 +250,8 @@ class PolicyTestCase {
+@@ -296,6 +296,8 @@ class PolicyTestCase {
      const std::string os("chromeos");
  #elif defined(OS_LINUX)
      const std::string os("linux");
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index 7f9fbfc4cd49..249e569bfbf7 100644
--- 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	2020-03-16 18:40:29 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -360,7 +360,7 @@
+@@ -375,7 +375,7 @@
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -9,7 +9,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
  
-@@ -1022,7 +1022,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1078,7 +1078,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
index 0fc02f402f9c..e394a24d2267 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2019-12-16 21:50:42 UTC
+--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
-@@ -187,7 +187,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -133,7 +133,7 @@ const char* const kPersistentPrefNames[] = {
      prefs::kShowFullscreenToolbar,
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
index 48f0d0c5ddd2..871d0818daed 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_attributes_entry.cc.orig	2020-03-16 18:39:44 UTC
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/profiles/profile_attributes_entry.cc
-@@ -108,7 +108,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
+@@ -135,7 +135,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac
    if (is_force_signin_enabled_) {
      if (!IsAuthenticated())
        is_force_signin_profile_locked_ = true;
diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
index 4a46416a7065..dc127b2786f9 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1702,7 +1702,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1678,7 +1678,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,
-@@ -1744,7 +1744,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1720,7 +1720,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
-@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -2059,7 +2059,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
      case IDC_CHECK_SPELLING_WHILE_TYPING:
        return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
  
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
index 6512d38fe080..54afc4f48a1b 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
@@ -1,6 +1,6 @@
---- 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.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js
-@@ -19,7 +19,7 @@ cr.define('settings', function() {
+@@ -24,7 +24,7 @@ cr.define('settings', function() {
  
      useDefaultTheme() {}
  
@@ -9,7 +9,7 @@
      useSystemTheme() {}
  
      // </if>
-@@ -59,7 +59,7 @@ cr.define('settings', function() {
+@@ -64,7 +64,7 @@ cr.define('settings', function() {
        chrome.send('useDefaultTheme');
      }
  
diff --git 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
index 1470f1f0d2c0..f5bfbde5b327 100644
--- 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	2020-03-16 18:40:29 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -49,7 +49,7 @@
+@@ -52,7 +52,7 @@
            <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
                label="$i18n{themes}" sub-label="[[themeSublabel_]]"
                on-click="openThemeUrl_" external></cr-link-row>
@@ -9,7 +9,7 @@
            <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
              <div class="separator"></div>
              <cr-button id="useDefault" on-click="onUseDefaultTap_">
-@@ -57,7 +57,7 @@
+@@ -60,7 +60,7 @@
              </cr-button>
            </template>
  </if>
@@ -18,7 +18,7 @@
            <div class="settings-row continuation"
                hidden="[[!showThemesSecondary_(
                    prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -120,7 +120,7 @@
+@@ -123,7 +123,7 @@
              pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
              label="$i18n{showBookmarksBar}">
          </settings-toggle-button>
diff --git 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
index a080e83db65c..583cf7ad9097 100644
--- 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	2020-03-16 18:40:29 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.js
-@@ -104,7 +104,7 @@ Polymer({
+@@ -111,7 +111,7 @@ Polymer({
      'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
      'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',
  
@@ -9,7 +9,7 @@
      // NOTE: this pref only exists on Linux.
      'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
      // </if>
-@@ -190,7 +190,7 @@ Polymer({
+@@ -197,7 +197,7 @@ Polymer({
      this.appearanceBrowserProxy_.useDefaultTheme();
    },
  
@@ -18,7 +18,7 @@
    /**
     * @param {boolean} useSystemTheme
     * @private
-@@ -267,10 +267,10 @@ Polymer({
+@@ -274,10 +274,10 @@ Polymer({
      }
  
      let i18nId;
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
index 8771fedfa758..65cf38661bf6 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -671,7 +671,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
+@@ -672,7 +672,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
    environment_collection_pending_ = false;
  
  // Process::Current().CreationTime() is missing on some platforms.
diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
index bf751427bd2a..82bd8f1ca4f3 100644
--- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
+++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig	2019-12-16 21:50:43 UTC
+--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/search/search_suggest/search_suggest_service.cc
-@@ -20,7 +20,11 @@
+@@ -21,7 +21,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"
diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
index e1b209c81c94..f6af60886da6 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig	2020-02-07 12:34:27 UTC
+--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc
-@@ -10,12 +10,12 @@ const base::Feature kSharedClipboardReceiver{"SharedCl
+@@ -7,7 +7,7 @@
  const base::Feature kSharedClipboardUI{"SharedClipboardUI",
                                         base::FEATURE_DISABLED_BY_DEFAULT};
  
@@ -9,9 +9,10 @@
      defined(OS_CHROMEOS)
  const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver",
                                          base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -20,5 +20,5 @@ const base::Feature kRemoteCopyImageNotification{
  
- const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins = {
-     &kRemoteCopyReceiver, "RemoteCopyAllowedOrigins", ""};
+ const base::Feature kRemoteCopyProgressNotification{
+     "RemoteCopyProgressNotification", base::FEATURE_DISABLED_BY_DEFAULT};
 -#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)
diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
index 6a0e3079731b..03b665f6274a 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
+++ b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/sharing/shared_clipboard/feature_flags.h
-@@ -17,14 +17,14 @@ extern const base::Feature kSharedClipboardReceiver;
+@@ -14,7 +14,7 @@
  // Feature to allow shared clipboard gets processed.
  extern const base::Feature kSharedClipboardUI;
  
@@ -9,9 +9,10 @@
      defined(OS_CHROMEOS)
  // Feature to enable handling remote copy messages.
  extern const base::Feature kRemoteCopyReceiver;
+@@ -27,7 +27,7 @@ extern const base::Feature kRemoteCopyImageNotificatio
  
- // List of allowed origins to fetch images from, comma separated.
- extern const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins;
+ // Feature to enable progress notifications for remote copy messages.
+ extern const base::Feature kRemoteCopyProgressNotification;
 -#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)
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
index 0c3723e85860..dbd781ba75ac 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/sharing_device_registration.cc.orig	2020-03-26 18:39:48 UTC
+--- chrome/browser/sharing/sharing_device_registration.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/sharing/sharing_device_registration.cc
-@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
+@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
  }
  
  bool SharingDeviceRegistration::IsRemoteCopySupported() const {
@@ -8,8 +8,8 @@
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
    return base::FeatureList::IsEnabled(kRemoteCopyReceiver);
- #endif
-@@ -334,10 +334,10 @@ bool SharingDeviceRegistration::IsRemoteCopySupported(
+ #else
+@@ -337,7 +337,7 @@ bool SharingDeviceRegistration::IsRemoteCopySupported(
  }
  
  bool SharingDeviceRegistration::IsPeerConnectionSupported() const {
@@ -17,8 +17,4 @@
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
      defined(OS_CHROMEOS)
    return base::FeatureList::IsEnabled(kSharingPeerConnectionReceiver);
--#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)
- 
-   return false;
+ #else
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc
index 7e096df1b053..4eda832bcd52 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sharing/sharing_service.cc.orig	2020-03-30 09:34:43 UTC
+--- chrome/browser/sharing/sharing_service.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/sharing/sharing_service.cc
 @@ -30,7 +30,7 @@ namespace {
  SharingMessageSender::DelegateType GetSendDelegateType(
@@ -9,12 +9,12 @@
      defined(OS_CHROMEOS)
    // Messages other than SharedClipboard are always sent via FCM.
    if (message.payload_case() !=
-@@ -56,7 +56,7 @@ SharingMessageSender::DelegateType GetSendDelegateType
-   // logic once we wrap up the experiment and e.g. only send messages over a
-   // certain size via WebRTC.
-   return SharingMessageSender::DelegateType::kWebRtc;
+@@ -59,7 +59,7 @@ SharingMessageSender::DelegateType GetSendDelegateType
+ #else
+   // Only FCM is supported for non desktop OS.
+   return SharingMessageSender::DelegateType::kFCM;
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ||
          // defined(OS_CHROMEOS)
+ }
  
-   // Only FCM is supported for non desktop OS.
diff --git a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
deleted file mode 100644
index 50ed28cdeb0a..000000000000
--- a/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2020-03-16 18:40:29 UTC
-+++ chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() {
- #if defined(OS_ANDROID)
-   chrome::android::OpenDateAndTimeSettings();
- 
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   struct ClockCommand {
-     const char* const pathname;
-     const char* const argument;
-@@ -205,7 +205,7 @@ void SSLErrorControllerClient::Proceed() {
- }
- 
- bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \
-     defined(OS_WIN)
-   return true;
- #else
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index 155f4fdf474c..a9af585a25de 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2020-05-13 18:40:22 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -442,7 +442,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -445,7 +445,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
    }
  #endif  // defined(OS_CHROMEOS)
  
@@ -9,7 +9,7 @@
    // Dictionary sync is enabled by default.
    if (!disabled_types.Has(syncer::DICTIONARY)) {
      controllers.push_back(
-@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -453,7 +453,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
              syncer::DICTIONARY, model_type_store_factory,
              GetSyncableServiceForType(syncer::DICTIONARY), dump_stack));
    }
diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
index 9e2f7535e762..f0b784e8df46 100644
--- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig	2020-03-16 18:40:29 UTC
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
+@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
    const char product[] = "Chrome_Linux";
  #elif defined(OS_ANDROID)
    const char product[] = "Chrome_Android";
diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
new file mode 100644
index 000000000000..b685c32d3ede
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
@@ -0,0 +1,19 @@
+--- chrome/browser/ui/BUILD.gn.orig	2020-05-13 18:40:23 UTC
++++ chrome/browser/ui/BUILD.gn
+@@ -630,12 +630,15 @@ jumbo_static_library("ui") {
+     deps += [ "//components/autofill/content/browser/webauthn" ]
+   }
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     # TODO(crbug.com/753619): Enable crash reporting on Fuchsia.
+     deps += [
+       "//components/crash/core/app",
+       "//components/crash/core/browser",
+     ]
++  }
++  if (is_bsd) {
++    deps += [ "//components/crash/core/browser" ]
+   }
+ 
+   if (is_win || is_android || is_linux) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 1ee7f7ff4e27..12ef93a8d1c4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -82,7 +82,7 @@
- #include "chrome/browser/ui/browser_commands_chromeos.h"
+@@ -84,7 +84,7 @@
+ #include "components/session_manager/core/session_manager.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -252,7 +252,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -254,7 +254,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -18,7 +18,7 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -476,7 +476,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -480,7 +480,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -27,9 +27,9 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -961,7 +961,7 @@ void BrowserCommandController::InitCommandState() {
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
+@@ -979,7 +979,7 @@ void BrowserCommandController::InitCommandState() {
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true);
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true);
  #endif
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index e40b9803cffb..ade0df4b4404 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2020-02-03 21:53:29 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -87,7 +87,7 @@ static const char* kBadFlags[] = {
+@@ -88,7 +88,7 @@ static const char* kBadFlags[] = {
      extensions::switches::kExtensionsOnChromeURLs,
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index b3cf9e596cbe..1a746ea2edc2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2020-02-03 21:52:41 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
 @@ -82,7 +82,7 @@
  #include "chrome/browser/ui/user_manager.h"
@@ -18,7 +18,7 @@
    PrefService* service = g_browser_process->local_state();
    DCHECK(service);
  
-@@ -662,8 +662,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -675,8 +675,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
    }
  #endif  // OS_CHROMEOS
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 053ec7216342..50a60a1e455a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -132,7 +132,7 @@
- #include "components/zoom/zoom_controller.h"
- #endif  // defined(OS_ANDROID)
+@@ -143,7 +143,7 @@
+ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.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/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
  #endif
-@@ -347,11 +347,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -377,11 +377,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
deleted file mode 100644
index f348ce9eaf16..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2020-03-16 18:40:30 UTC
-+++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -684,7 +684,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
-       return app_menu_icon_controller_->GetTypeAndSeverity().type ==
-              AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
-     }
--#if !defined(OS_LINUX) || defined(USE_AURA)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
-     case IDC_BOOKMARK_THIS_TAB:
-       return !chrome::ShouldRemoveBookmarkThisTabUI(browser_->profile());
-     case IDC_BOOKMARK_ALL_TABS:
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index 47a25b7a998d..efd5afea53a3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2020-02-03 21:52:41 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -33,7 +33,7 @@
+@@ -32,7 +32,7 @@
  #include "ui/wm/core/wm_state.h"
  #endif  // defined(USE_AURA)
  
@@ -9,7 +9,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -43,7 +43,7 @@
+@@ -42,7 +42,7 @@
  #include "chrome/grit/generated_resources.h"
  #include "content/public/common/content_switches.h"
  #include "ui/base/l10n/l10n_util.h"
@@ -18,7 +18,7 @@
  
  // This connector is used in ui_devtools's TracingAgent to hook up with the
  // tracing service.
-@@ -105,7 +105,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
          devtools_server_->tracing_agent());
    }
  
@@ -27,7 +27,7 @@
    // On the Linux desktop, we want to prevent the user from logging in as root,
    // so that we don't destroy the profile. Now that we have some minimal ui
    // initialized, check to see if we're running as root and bail if we are.
-@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    base::RunLoop().RunUntilIdle();
  
    exit(EXIT_FAILURE);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
index 2e9f1501f8a7..b7b7502063f4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/download/download_item_view.cc.orig	2020-03-17 09:40:34 UTC
+--- chrome/browser/ui/views/download/download_item_view.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/download/download_item_view.cc
 @@ -234,7 +234,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do
    open_button_ = AddChildView(std::move(open_button));
@@ -9,7 +9,7 @@
    if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings))
      file_name_style = STYLE_EMPHASIZED;
  #endif
-@@ -1633,7 +1633,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty
+@@ -1635,7 +1635,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty
    if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings))
      return;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index c1d853c940c7..228b9c0b4c35 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,6 +1,14 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2019-10-21 19:06:24 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -46,7 +46,7 @@
+@@ -38,14 +38,14 @@
+ #include "components/user_manager/user_manager.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #include "ui/display/screen.h"
+ #endif
+ 
  namespace {
  
  bool IsUsingGtkTheme(Profile* profile) {
@@ -9,3 +17,12 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
+@@ -218,7 +218,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() 
+ 
+ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+   chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   auto workspace = display::Screen::GetScreen()->GetCurrentWorkspace();
+   BrowserList::MoveBrowsersInWorkspaceToFront(workspace.empty() ? GetWorkspace()
+                                                                 : workspace);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index cca78f0e9ece..c61a46cde03b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2020-05-13 18:39:38 UTC
 +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
 @@ -13,7 +13,7 @@
  #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
  #endif
  
 -#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/browser/ui/views/frame/desktop_linux_browser_frame_view.h"
+ #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h"
  #include "ui/views/linux_ui/linux_ui.h"
- #endif
- 
-@@ -32,7 +32,7 @@ OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView(
+@@ -27,7 +27,7 @@ namespace {
+ OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView(
+     BrowserFrame* frame,
      BrowserView* browser_view) {
- #if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS)
-   std::unique_ptr<views::NavButtonProvider> nav_button_provider;
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (ThemeServiceFactory::GetForProfile(browser_view->browser()->profile())
-           ->UsingSystemTheme() &&
-       views::LinuxUI::instance()) {
+   auto* linux_ui = views::LinuxUI::instance();
+   auto* profile = browser_view->browser()->profile();
+   auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index b69b8869760f..e8ae08d593f8 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1633,7 +1633,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
+@@ -1716,7 +1716,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
    const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
  
    bool must_regenerate_frame;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index 45d717c16389..07dc0d13cd21 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -417,7 +417,7 @@ bool HungRendererDialogView::Cancel() {
+@@ -425,7 +425,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() 
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index beabaf0792a0..0eb06acbe1e7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -584,7 +584,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -596,7 +596,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
    if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
      return;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 166112807cf0..29ce253e020b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -450,7 +450,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -449,7 +449,7 @@ void TabDragController::Init(TabDragContext* source_co
    //     synchronous on desktop Linux, so use that.
    // - Chrome OS
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -9,7 +9,7 @@
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -894,7 +894,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
      else
        SetCapture(target_context);
  
@@ -18,7 +18,7 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2082,7 +2082,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2081,7 +2081,7 @@ TabDragController::Liveness TabDragController::GetLoca
      if (dragged_window)
        exclude.insert(dragged_window);
    }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
index 473b7690ddfc..5d47c3dfcc09 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig	2020-02-03 21:52:41 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/webui/about_ui.cc
-@@ -561,7 +561,7 @@ std::string ChromeURLs() {
+@@ -560,7 +560,7 @@ std::string ChromeURLs() {
    return html;
  }
  
@@ -9,7 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -616,7 +616,7 @@ void AboutUIHTMLSource::StartDataRequest(
        response =
            ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
      }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 6fed2b7df1f6..a60772e10123 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -224,11 +224,11 @@
+@@ -232,11 +232,11 @@
  #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
  #endif
  
-@@ -337,7 +337,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -358,7 +358,7 @@ bool IsAboutUI(const GURL& url) {
  #if !defined(OS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
@@ -23,7 +23,7 @@
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
  #if defined(OS_CHROMEOS)
-@@ -669,7 +669,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -702,7 +702,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
@@ -32,7 +32,7 @@
    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
      return &NewWebUI<ConstrainedWebDialogUI>;
  #endif
-@@ -717,17 +717,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -750,17 +750,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
      return &NewWebUI<CastUI>;
    }
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 8df5419b8753..c542c05e37a5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,20 +1,11 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -333,7 +333,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
-     {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
-     {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
-     {"themes", IDS_SETTINGS_THEMES},
+@@ -285,7 +285,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+     {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL},
+     {"tiny", IDS_SETTINGS_TINY_FONT_SIZE},
+     {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -348,7 +348,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
-     {"changeHomePage", IDS_SETTINGS_CHANGE_HOME_PAGE},
-     {"themesGalleryUrl", IDS_THEMES_GALLERY_URL},
-     {"chooseFromWebStore", IDS_SETTINGS_WEB_STORE},
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-     {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
- #endif
- #if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
deleted file mode 100644
index abc103c98166..000000000000
--- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig	2020-02-07 12:36:50 UTC
-+++ chrome/browser/web_applications/components/web_app_file_handler_registration.cc
-@@ -15,7 +15,7 @@ namespace web_app {
- //
- // Note: Because OS_LINUX includes OS_CHROMEOS be sure to use the stub on
- // OS_CHROMEOS.
--#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if !defined(OS_WIN) && !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
- bool ShouldRegisterFileHandlersWithOs() {
-   return false;
- }
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
new file mode 100644
index 000000000000..7ad4185e39b5
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig	2020-05-15 14:57:06 UTC
++++ chrome/browser/web_applications/components/web_app_file_handler_registration.h
+@@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id,
+ // If a shim app was required, also removes the shim app.
+ void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ using RegisterMimeTypesOnLinuxCallback =
+     base::OnceCallback<bool(base::FilePath profile_path,
+                             std::string file_contents)>;
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
index 934359b14459..5ea618dc394f 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc
@@ -1,9 +1,9 @@
---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig	2020-03-17 09:41:50 UTC
+--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig	2020-05-13 18:39:39 UTC
 +++ chrome/browser/web_applications/components/web_app_shortcut.cc
-@@ -35,7 +35,7 @@ namespace {
+@@ -34,7 +34,7 @@ namespace {
+ 
+ #if defined(OS_MACOSX)
  const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512};
- const size_t kNumDesiredIconSizesForShortcut =
-     base::size(kDesiredIconSizesForShortcut);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
  // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn
index bf1e0b6e0415..f3d7249f1c4c 100644
--- a/www/chromium/files/patch-chrome_common_BUILD.gn
+++ b/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,11 +1,12 @@
---- chrome/common/BUILD.gn.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/BUILD.gn.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/BUILD.gn
-@@ -272,6 +272,10 @@ static_library("common") {
+@@ -277,6 +277,11 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  
 +  if (is_bsd) {
 +    sources -= [ "component_flash_hint_file_linux.cc" ]
++    deps -= [ "//components/crash/core/app" ]
 +  }
 +
    if (enable_extensions) {
diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h
index b290d11bd40c..c2b389d1ea34 100644
--- a/www/chromium/files/patch-chrome_common_channel__info.h
+++ b/www/chromium/files/patch-chrome_common_channel__info.h
@@ -1,6 +1,6 @@
---- chrome/common/channel_info.h.orig	2019-12-17 19:22:25 UTC
+--- chrome/common/channel_info.h.orig	2020-05-13 18:39:39 UTC
 +++ chrome/common/channel_info.h
-@@ -55,7 +55,7 @@ version_info::Channel GetChannelByName(const std::stri
+@@ -61,7 +61,7 @@ bool IsSideBySideCapable();
  std::string GetChannelSuffixForDataDir();
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 4591e746fab7..99096dbc73ed 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/chrome_features.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/chrome_features.cc
-@@ -86,13 +86,13 @@ const base::Feature kAsyncDns {
+@@ -66,13 +66,13 @@ const base::Feature kAsyncDns {
  #endif
  };
  
@@ -14,5 +14,5 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
  
- // Once the user declines a notification permission prompt in a WebContents,
- // automatically dismiss subsequent prompts in the same WebContents, from any
+ #if !defined(OS_ANDROID)
+ // Enables logging UKMs for background tab activity by TabActivityWatcher.
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index d23bca53bf82..ada0e33d9b7e 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/chrome_features.h.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/chrome_features.h
-@@ -68,10 +68,10 @@ extern const base::Feature kAppServiceShelf;
+@@ -59,10 +59,10 @@ extern const base::Feature kAppServiceIntentHandling;
  
  COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
  
@@ -11,5 +11,5 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
  
+ #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED)
  COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kBlockRepeatedNotificationPermissionPrompts;
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 0cf96df2deef..d71921c12f3a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/chrome_switches.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -846,7 +846,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
+@@ -850,7 +850,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
  const char kAllowNaClSocketAPI[]            = "allow-nacl-socket-api";
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 957faae8a127..11cee03187c3 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/chrome_switches.h.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/chrome_switches.h
-@@ -261,7 +261,7 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -259,7 +259,7 @@ extern const char kAllowNaClFileHandleAPI[];
  extern const char kAllowNaClSocketAPI[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni
index 5af21971a15e..dccc7c422ff9 100644
--- a/www/chromium/files/patch-chrome_common_features.gni
+++ b/www/chromium/files/patch-chrome_common_features.gni
@@ -1,11 +1,8 @@
---- chrome/common/features.gni.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/features.gni.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/features.gni
-@@ -49,9 +49,9 @@ declare_args() {
-                                 (is_desktop_linux && use_dbus) || is_chromeos
- 
-   enable_one_click_signin =
--      is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
-+      is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast)
+@@ -55,7 +55,7 @@ declare_args() {
+   # Enables password change in leaked password dialog, disabled by default.
+   enable_password_change_in_leaked_dialog = false
  
 -  enable_service_discovery = (enable_mdns && !is_android) || is_mac
 +  enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index edf68e0cec56..6dad9fb69c8c 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/pref_names.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/pref_names.cc
-@@ -1059,7 +1059,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
+@@ -1108,7 +1108,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
  // only using an account that belongs to one of the domains from this pref.
  const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
  
@@ -9,7 +9,7 @@
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1193,7 +1193,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1242,7 +1242,7 @@ const char kShowUpdatePromotionInfoBar[] =
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1621,7 +1621,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1677,7 +1677,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
@@ -27,7 +27,7 @@
  const char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -1917,12 +1917,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
+@@ -1973,12 +1973,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
  const char kAmbientAuthenticationInPrivateModesEnabled[] =
      "auth.ambient_auth_in_private_modes";
  
@@ -42,3 +42,12 @@
  
  #if defined(OS_POSIX)
  // Boolean that specifies whether NTLMv2 is enabled.
+@@ -2882,7 +2882,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit
+ const char kBlockAutoplayEnabled[] = "media.block_autoplay";
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Boolean that indicates if native notifications are allowed to be used in
+ // place of Chrome notifications.
+ const char kAllowNativeNotifications[] = "native_notifications.allowed";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 7f7af0082f1f..2c55a35a8212 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/pref_names.h.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/pref_names.h
-@@ -334,7 +334,7 @@ extern const char kHistoryMenuPromoShown[];
+@@ -346,7 +346,7 @@ extern const char kHistoryMenuPromoShown[];
  extern const char kForceGoogleSafeSearch[];
  extern const char kForceYouTubeRestrict[];
  extern const char kAllowedDomainsForApps[];
@@ -9,7 +9,7 @@
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -365,7 +365,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -377,7 +377,7 @@ extern const char kDefaultBrowserSettingEnabled[];
  #if defined(OS_MACOSX)
  extern const char kShowUpdatePromotionInfoBar[];
  #endif
@@ -18,7 +18,7 @@
  extern const char kUseCustomChromeFrame[];
  #endif
  #if BUILDFLAG(ENABLE_PLUGINS)
-@@ -532,7 +532,7 @@ extern const char kAppWindowPlacement[];
+@@ -545,7 +545,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];
@@ -27,7 +27,7 @@
  extern const char kOpenPdfDownloadInSystemReader[];
  #endif
  #if defined(OS_ANDROID)
-@@ -744,9 +744,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
+@@ -758,9 +758,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
  extern const char kGloballyScopeHTTPAuthCacheEnabled[];
  extern const char kAmbientAuthenticationInPrivateModesEnabled[];
  
@@ -39,3 +39,12 @@
  
  #if defined(OS_POSIX)
  extern const char kNtlmV2Enabled[];
+@@ -991,7 +991,7 @@ extern const char kAutoplayWhitelist[];
+ extern const char kBlockAutoplayEnabled[];
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ extern const char kAllowNativeNotifications[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index c9a01fc94ffe..e97e68ea823f 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/webui_url_constants.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/webui_url_constants.cc
-@@ -321,7 +321,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -320,7 +320,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
  const char kChromeUICastHost[] = "cast";
  #endif
  
@@ -9,7 +9,7 @@
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
  const char kChromeUIHatsHost[] = "hats";
-@@ -332,17 +332,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
+@@ -331,17 +331,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
  const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
  #endif
  
@@ -30,7 +30,7 @@
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
  #endif
  
-@@ -608,13 +608,13 @@ const char* const kChromeHostURLs[] = {
+@@ -623,13 +623,13 @@ const char* const kChromeHostURLs[] = {
      kChromeUIInternetDetailDialogHost,
      kChromeUIAssistantOptInHost,
  #endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index dc27881da387..d34bffc0a3ad 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig	2020-03-16 18:40:30 UTC
+--- chrome/common/webui_url_constants.h.orig	2020-05-13 18:40:25 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -275,7 +275,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
+@@ -283,7 +283,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
  extern const char kChromeUICastHost[];
  #endif
  
@@ -9,7 +9,7 @@
  extern const char kChromeUIDiscardsHost[];
  extern const char kChromeUIDiscardsURL[];
  extern const char kChromeUIHatsHost[];
-@@ -287,17 +287,17 @@ extern const char kChromeUIHatsURL[];
+@@ -295,17 +295,17 @@ extern const char kChromeUIHatsURL[];
  extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
index e6be28220164..fd37dba13424 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_content_renderer_client.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/renderer/chrome_content_renderer_client.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1053,7 +1053,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1059,7 +1059,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
        }
  
        case chrome::mojom::PluginStatus::kRestartRequired: {
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 67e371b45b43..acffc70ac0c9 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,8 +1,8 @@
---- chrome/test/BUILD.gn.orig	2020-03-16 18:40:30 UTC
+--- chrome/test/BUILD.gn.orig	2020-05-13 18:40:25 UTC
 +++ chrome/test/BUILD.gn
-@@ -6042,7 +6042,7 @@ test("chrome_app_unittests") {
+@@ -6109,7 +6109,7 @@ test("chrome_app_unittests") {
+     "//components/gwp_asan/buildflags",
      "//components/safe_browsing:buildflags",
-     "//components/tracing",
    ]
 -  if (!is_fuchsia) {
 +  if (!is_fuchsia && !is_bsd) {
diff --git a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
index d09f2d1d0fd1..1132b9852246 100644
--- a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
+++ b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc
@@ -1,15 +1,15 @@
---- chrome/test/base/chrome_test_launcher.cc.orig	2020-04-06 07:46:40 UTC
+--- chrome/test/base/chrome_test_launcher.cc.orig	2020-05-13 18:39:39 UTC
 +++ chrome/test/base/chrome_test_launcher.cc
-@@ -59,7 +59,7 @@
+@@ -61,7 +61,7 @@
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h"
+ #include "chrome/browser/upgrade_detector/installed_version_poller.h"
  #include "testing/gtest/include/gtest/gtest.h"
- #endif
-@@ -221,7 +221,7 @@ int LaunchChromeTests(size_t parallel_jobs,
+@@ -231,7 +231,7 @@ int LaunchChromeTests(size_t parallel_jobs,
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
index f4de4bb39b0c..fbb31dab945d 100644
--- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
+++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
@@ -1,4 +1,4 @@
---- chrome/test/base/in_process_browser_test.cc.orig	2020-04-03 04:11:30 UTC
+--- chrome/test/base/in_process_browser_test.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/test/base/in_process_browser_test.cc
 @@ -77,6 +77,10 @@
  #include "chrome/test/base/scoped_bundle_swizzler_mac.h"
@@ -20,7 +20,7 @@
  #include "ui/views/test/test_desktop_screen_x11.h"
  #endif
  
-@@ -253,7 +257,7 @@ void InProcessBrowserTest::SetUp() {
+@@ -258,7 +262,7 @@ void InProcessBrowserTest::SetUp() {
    // Cookies). Without this on Mac and Linux, many tests will hang waiting for a
    // user to approve KeyChain/kwallet access. On Windows this is not needed as
    // OS APIs never block.
@@ -29,7 +29,7 @@
    OSCryptMocker::SetUp();
  #endif
  
-@@ -308,7 +312,7 @@ void InProcessBrowserTest::TearDown() {
+@@ -320,7 +324,7 @@ void InProcessBrowserTest::TearDown() {
    com_initializer_.reset();
  #endif
    BrowserTestBase::TearDown();
diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
index 97a81118bddd..93b8bc2e291b 100644
--- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
+++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
@@ -1,6 +1,6 @@
---- chrome/test/base/testing_browser_process.h.orig	2019-09-09 21:55:11 UTC
+--- chrome/test/base/testing_browser_process.h.orig	2020-05-13 18:40:25 UTC
 +++ chrome/test/base/testing_browser_process.h
-@@ -116,8 +116,8 @@ class TestingBrowserProcess : public BrowserProcess {
+@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess {
    DownloadRequestLimiter* download_request_limiter() override;
    StartupData* startup_data() override;
  
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
index 79b4cc08b788..bf350970aa84 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome_launcher.cc.orig	2020-03-16 18:40:30 UTC
+--- chrome/test/chromedriver/chrome_launcher.cc.orig	2020-05-13 18:40:25 UTC
 +++ chrome/test/chromedriver/chrome_launcher.cc
-@@ -69,6 +69,10 @@
+@@ -70,6 +70,10 @@
  #include "chrome/test/chromedriver/keycode_text_conversion.h"
  #endif
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index 06032792b186..4b91ace351f3 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2020-03-16 18:40:30 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2020-05-13 18:40:25 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
  #include "ui/base/ui_base_switches.h"
  #include "ui/gl/gl_switches.h"
  
@@ -9,7 +9,7 @@
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
+@@ -269,7 +269,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
  
  #endif  // defined(USE_AURA)
  
@@ -18,7 +18,7 @@
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -279,7 +279,7 @@ base::FilePath GetApplicationFontsDir() {
+@@ -285,7 +285,7 @@ base::FilePath GetApplicationFontsDir() {
    }
  }
  
@@ -27,7 +27,7 @@
  
  }  // namespace
  
-@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {cc::switches::kDisableThreadedAnimation, ""},
  #endif  // defined(OS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -36,7 +36,7 @@
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -324,7 +324,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {switches::kEnableHardwareOverlays, "cast"},
  #endif
  #endif
@@ -45,7 +45,7 @@
      // It's better to start GPU process on demand. For example, for TV platforms
      // cast starts in background and can't render until TV switches to cast
      // input.
-@@ -459,7 +459,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -465,7 +465,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index ceca4fa67274..e04700bca62b 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2020-03-16 18:40:30 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2020-05-13 18:40:25 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -450,7 +450,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
diff --git a/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc
deleted file mode 100644
index d141e1f0a1cb..000000000000
--- a/www/chromium/files/patch-chromecast_media_base_monotonic__clock.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- chromecast/media/base/monotonic_clock.cc.orig	2019-10-30 15:55:35 UTC
-+++ chromecast/media/base/monotonic_clock.cc
-@@ -9,9 +9,9 @@
- #include "base/time/time.h"
- #include "build/build_config.h"
- 
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- #include "chromecast/media/base/buildflags.h"
--#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
-+#endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- 
- #if defined(OS_FUCHSIA)
- #include <zircon/syscalls.h>
-@@ -20,7 +20,7 @@
- namespace chromecast {
- namespace media {
- 
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- int64_t MonotonicClockNow() {
-   timespec now = {0, 0};
- #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
index 079d79856b84..5bfd53bc2903 100644
--- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
+++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chromecast/renderer/cast_content_renderer_client.cc.orig	2020-03-17 09:46:13 UTC
+--- chromecast/renderer/cast_content_renderer_client.cc.orig	2020-05-13 18:40:25 UTC
 +++ chromecast/renderer/cast_content_renderer_client.cc
-@@ -208,7 +208,7 @@ void CastContentRendererClient::RenderFrameCreated(
+@@ -204,7 +204,7 @@ void CastContentRendererClient::RenderFrameCreated(
    dispatcher->OnRenderFrameCreated(render_frame);
  #endif
  
diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn
new file mode 100644
index 000000000000..0ec0a354b754
--- /dev/null
+++ b/www/chromium/files/patch-components_BUILD.gn
@@ -0,0 +1,18 @@
+--- components/BUILD.gn.orig	2020-05-18 11:10:39 UTC
++++ components/BUILD.gn
+@@ -286,9 +286,13 @@ test("components_unittests") {
+     ]
+ 
+     if (!is_fuchsia) {
++      if (!is_bsd) {
++        deps += [
++          "//components/crash/content/browser:unit_tests",
++          "//components/crash/core/app:unit_tests",
++        ]
++      }
+       deps += [
+-        "//components/crash/content/browser:unit_tests",
+-        "//components/crash/core/app:unit_tests",
+         "//components/data_reduction_proxy/content/common:unit_tests",
+         "//components/data_reduction_proxy/core/browser:unit_tests",
+         "//components/data_reduction_proxy/core/common:unit_tests",
diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
index 25ba63628ba8..7ab0bc75df5d 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/autofill_external_delegate.cc.orig	2020-03-16 18:40:30 UTC
+--- components/autofill/core/browser/autofill_external_delegate.cc.orig	2020-05-13 18:40:26 UTC
 +++ components/autofill/core/browser/autofill_external_delegate.cc
-@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
+@@ -117,7 +117,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
  
      // Append the "Hide Suggestions" menu item for only Autofill Address and
      // Autocomplete popups.
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index 76d3e7dee3ed..fa689f4c147d 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig	2020-03-16 18:40:30 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig	2020-05-13 18:40:26 UTC
 +++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1856,10 +1856,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
+@@ -1907,7 +1907,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar
  
  bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
  // The feature is only for Linux, Windows and Mac.
@@ -8,8 +8,13 @@
 +#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || \
      defined(OS_CHROMEOS)
    return false;
+ #else
+@@ -1931,7 +1931,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+ 
+   // The option should only be shown if the user has not already opted-in.
+   return !is_opted_in;
 -#endif  // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) ||
 +#endif  // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) ||
          // defined(OS_CHROMEOS)
+ }
  
-   // This option should only be shown for users that have not enabled the Sync
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index 016f6de85d3c..59b55704914a 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2020-03-16 18:40:30 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2020-05-13 18:40:26 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -122,7 +122,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
+@@ -101,7 +101,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
  
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -8,4 +8,4 @@
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    // The new user consent UI is fully launched on MacOS, Windows and Linux.
    return true;
- #endif
+ #else
diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
deleted file mode 100644
index 2d01264b0bad..000000000000
--- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn
+++ /dev/null
@@ -1,52 +0,0 @@
---- components/crash/content/app/BUILD.gn.orig	2020-03-16 18:40:30 UTC
-+++ components/crash/content/app/BUILD.gn
-@@ -49,17 +49,20 @@ static_library("app") {
-     "crashpad_win.cc",
-   ]
- 
--  if (is_mac || is_win || is_android || is_linux) {
-+  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
-     sources += [ "crashpad.cc" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     sources += [
-       "breakpad_linux.cc",
-       "breakpad_linux.h",
-       "breakpad_linux_impl.h",
-     ]
-   }
-+  if (is_bsd) {
-+    sources -= [ "crashpad_linux.cc" ]
-+  }
- 
-   defines = [ "CRASH_IMPLEMENTATION" ]
- 
-@@ -69,7 +72,7 @@ static_library("app") {
-     "//build:branding_buildflags",
-   ]
- 
--  if (is_mac || is_win || is_android || is_linux) {
-+  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
-     deps += [
-       "//third_party/crashpad/crashpad/client",
-       "//third_party/crashpad/crashpad/util",
-@@ -95,7 +98,7 @@ static_library("app") {
-     ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     deps += [ "//third_party/breakpad:client" ]
-   }
- 
-@@ -126,7 +129,7 @@ static_library("app") {
-     libs = [ "log" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     data_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ]
-   }
- }
diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad.cc b/www/chromium/files/patch-components_crash_content_app_crashpad.cc
deleted file mode 100644
index f709f5f3087d..000000000000
--- a/www/chromium/files/patch-components_crash_content_app_crashpad.cc
+++ /dev/null
@@ -1,43 +0,0 @@
---- components/crash/content/app/crashpad.cc.orig	2019-04-30 22:22:41 UTC
-+++ components/crash/content/app/crashpad.cc
-@@ -104,6 +104,12 @@ void InitializeCrashpadImpl(bool initial_client,
-                             const base::FilePath& exe_path,
-                             const std::vector<std::string>& initial_arguments,
-                             bool embedded_handler) {
-+
-+#if defined(OS_BSD)
-+  NOTIMPLEMENTED();
-+  return;
-+#endif
-+
-   static bool initialized = false;
-   DCHECK(!initialized);
-   initialized = true;
-@@ -124,7 +130,7 @@ void InitializeCrashpadImpl(bool initial_client,
-     DCHECK(browser_process || process_type == "Chrome Installer" ||
-            process_type == "notification-helper" ||
-            process_type == "GCPW Installer" || process_type == "GCPW DLL");
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-     DCHECK(browser_process);
- #else
- #error Port.
-@@ -192,7 +198,7 @@ void InitializeCrashpadImpl(bool initial_client,
-   // other "main, first process" to initialize things. There is no "relauncher"
-   // on Windows, so this is synonymous with initial_client.
-   const bool should_initialize_database_and_set_upload_policy = initial_client;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   const bool should_initialize_database_and_set_upload_policy = browser_process;
- #endif
-   if (should_initialize_database_and_set_upload_policy) {
-@@ -272,7 +278,9 @@ bool GetUploadsEnabled() {
- 
- #if !defined(OS_ANDROID)
- void DumpWithoutCrashing() {
-+#if !defined(OS_BSD)
-   CRASHPAD_SIMULATE_CRASH();
-+#endif
- }
- #endif
- 
diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad.h b/www/chromium/files/patch-components_crash_content_app_crashpad.h
deleted file mode 100644
index caf10f1a4f6a..000000000000
--- a/www/chromium/files/patch-components_crash_content_app_crashpad.h
+++ /dev/null
@@ -1,66 +0,0 @@
---- components/crash/content/app/crashpad.h.orig	2019-12-19 16:46:22 UTC
-+++ components/crash/content/app/crashpad.h
-@@ -22,7 +22,7 @@
- #include <windows.h>
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <signal.h>
- #endif
- 
-@@ -37,7 +37,7 @@ class CrashReportDatabase;
- 
- namespace crash_reporter {
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // TODO(jperaza): Remove kEnableCrashpad and IsCrashpadEnabled() when Crashpad
- // is fully enabled on Linux.
- extern const char kEnableCrashpad[];
-@@ -146,11 +146,11 @@ void RequestSingleCrashUpload(const std::string& local
- 
- void DumpWithoutCrashing();
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- // Logs message and immediately crashes the current process without triggering a
- // crash dump.
- void CrashWithoutDumping(const std::string& message);
--#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- 
- // Returns the Crashpad database path, only valid in the browser.
- base::FilePath GetCrashpadDatabasePath();
-@@ -188,7 +188,7 @@ bool DumpWithoutCrashingForClient(CrashReporterClient*
- void WhitelistMemoryRange(void* begin, size_t size);
- #endif  // OS_ANDROID
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Install a handler that gets a chance to handle faults before Crashpad. This
- // is used by V8 for trap-based bounds checks.
- void SetFirstChanceExceptionHandler(bool (*handler)(int, siginfo_t*, void*));
-@@ -196,7 +196,7 @@ void SetFirstChanceExceptionHandler(bool (*handler)(in
- // Gets the socket and process ID of the Crashpad handler connected to this
- // process, valid if this function returns `true`.
- bool GetHandlerSocket(int* sock, pid_t* pid);
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_BSD
- 
- namespace internal {
- 
-@@ -212,11 +212,11 @@ DWORD WINAPI DumpProcessForHungInputThread(void* param
- 
- #endif  // defined(OS_WIN)
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- // Starts the handler process with an initial client connected on fd.
- // Returns `true` on success.
- bool StartHandlerForClient(int fd);
--#endif  // OS_LINUX || OS_ANDROID
-+#endif  // OS_LINUX || OS_ANDROID || OS_BSD
- 
- // The platform-specific portion of InitializeCrashpad(). On Windows, if
- // |user_data_dir| is non-empty, the user data directory will be passed to the
diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc b/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc
deleted file mode 100644
index 20d5d6295eb7..000000000000
--- a/www/chromium/files/patch-components_crash_content_app_crashpad__linux.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- components/crash/content/app/crashpad_linux.cc.orig	2020-03-16 18:39:48 UTC
-+++ components/crash/content/app/crashpad_linux.cc
-@@ -5,7 +5,9 @@
- #include "components/crash/content/app/crashpad.h"
- 
- #include <pthread.h>
-+#if !defined(OS_BSD)
- #include <sys/prctl.h>
-+#endif
- 
- #include <limits>
- 
-@@ -67,9 +69,11 @@ void SetPtracerAtFork() {
-   if (!GetHandlerSocket(nullptr, &pid)) {
-     return;
-   }
-+#if !defined(OS_BSD)
-   if (pid > 0 && prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) {
-     PLOG(ERROR) << "prctl";
-   }
-+#endif
- }
- 
- namespace internal {
diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index def54d6eaffa..f174c6f26bc3 100644
--- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,4 +1,4 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2020-03-16 18:40:30 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2020-05-13 18:39:41 UTC
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
 @@ -33,7 +33,7 @@
  #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
@@ -9,7 +9,7 @@
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/metrics/histogram_macros.h"
-@@ -182,7 +182,7 @@ int64_t GetDefaultMemoryLimit() {
+@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() {
      max_default_memory_limit /= 8;
  #endif
  
diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc
index dbb0a0dd18dd..c9e1747454b6 100644
--- a/www/chromium/files/patch-components_download_internal_common_base__file.cc
+++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc
@@ -1,6 +1,6 @@
---- components/download/internal/common/base_file.cc.orig	2019-12-16 21:50:45 UTC
+--- components/download/internal/common/base_file.cc.orig	2020-05-13 18:39:41 UTC
 +++ components/download/internal/common/base_file.cc
-@@ -603,7 +603,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url,
+@@ -604,7 +604,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url,
  
  }  // namespace
  
@@ -9,7 +9,7 @@
  
  DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync(
      const std::string& client_guid,
-@@ -621,7 +621,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn
+@@ -622,7 +622,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn
  
    return QuarantineFileResultToReason(result);
  }
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index 22cb98c234a2..05cf37119ae4 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig	2019-10-21 19:06:29 UTC
+--- components/metrics/metrics_log.cc.orig	2020-05-13 18:40:26 UTC
 +++ components/metrics/metrics_log.cc
-@@ -202,7 +202,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -210,7 +210,7 @@ void MetricsLog::RecordCoreSystemProfile(
  // OperatingSystemVersion refers to the ChromeOS release version.
  #if defined(OS_CHROMEOS)
    os->set_kernel_version(base::SysInfo::KernelVersion());
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index 658b31ad44fb..7c0b6f73c193 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig	2020-03-16 18:40:30 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig	2020-05-13 18:40:26 UTC
 +++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -718,7 +718,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -719,7 +719,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
    }
  #endif  // #if !defined(OS_ANDROID)
  
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index 5eca40e4b2ae..94b59296c6ce 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig	2020-03-16 18:40:31 UTC
+--- components/policy/resources/policy_templates.json.orig	2020-05-13 18:40:26 UTC
 +++ components/policy/resources/policy_templates.json
-@@ -1088,7 +1088,7 @@
+@@ -1114,7 +1114,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1118,7 +1118,7 @@
+@@ -1144,7 +1144,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1145,7 +1145,7 @@
+@@ -1171,7 +1171,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -27,7 +27,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1944,7 +1944,7 @@
+@@ -1995,7 +1995,7 @@
        'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -36,7 +36,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -3807,7 +3807,7 @@
+@@ -3913,7 +3913,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -45,7 +45,7 @@
        'features': {
          'dynamic_refresh': False,
          'per_profile': False,
-@@ -3861,7 +3861,7 @@
+@@ -3967,7 +3967,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -54,7 +54,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -7329,7 +7329,7 @@
+@@ -7491,7 +7491,7 @@
        'owners': ['file://src/net/cert/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -8621,7 +8621,7 @@
+@@ -8868,7 +8868,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -9297,7 +9297,7 @@
+@@ -9591,7 +9591,7 @@
        'owners': ['file://components/policy/resources/OWNERS'],
        'type': 'main',
        'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
index de779e766d99..c7fbd8abeebb 100644
--- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
+++ b/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py
@@ -1,5 +1,5 @@
---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2019-03-11 22:00:54 UTC
-+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
+--- components/safe_browsing/core/resources/gen_file_type_proto.py.orig	2019-03-11 22:00:54 UTC
++++ components/safe_browsing/core/resources/gen_file_type_proto.py
 @@ -31,6 +31,7 @@ def PlatformTypes():
      "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID,
      "chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS,
diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
new file mode 100644
index 000000000000..01dbabc11844
--- /dev/null
+++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc
@@ -0,0 +1,30 @@
+--- components/security_interstitials/content/utils.cc.orig	2020-05-15 15:04:01 UTC
++++ components/security_interstitials/content/utils.cc
+@@ -31,12 +31,18 @@ void LaunchDateAndTimeSettings() {
+ #if defined(OS_ANDROID)
+   JNIEnv* env = base::android::AttachCurrentThread();
+   Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   struct ClockCommand {
+     const char* const pathname;
+     const char* const argument;
+   };
+   static const ClockCommand kClockCommands[] = {
++#if defined(OS_BSD)
++      // GNOME
++      {"/usr/local/bin/gnome-control-center", "datetime"},
++      // KDE
++      {"/usr/local/bin/kcmshell4", "clock"},
++#else
+       // Unity
+       {"/usr/bin/unity-control-center", "datetime"},
+       // GNOME
+@@ -50,6 +56,7 @@ void LaunchDateAndTimeSettings() {
+       {"/usr/bin/kcmshell4", "clock"},
+       {"/usr/local/bin/kcmshell4", "clock"},
+       {"/opt/bin/kcmshell4", "clock"},
++#endif
+   };
+ 
+   base::CommandLine command(base::FilePath(""));
diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
index d84c48a27037..cef84cb98706 100644
--- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
+++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
@@ -1,6 +1,6 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig	2020-02-26 13:13:33 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig	2020-05-13 18:39:42 UTC
 +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "mojo/public/cpp/bindings/receiver.h"
  
@@ -9,7 +9,7 @@
  #include "components/services/font/public/cpp/font_loader.h"
  #include "third_party/skia/include/core/SkRefCnt.h"
  #endif
-@@ -68,7 +68,7 @@ class PaintPreviewCompositorCollectionImpl
+@@ -74,7 +74,7 @@ class PaintPreviewCompositorCollectionImpl
                   std::unique_ptr<PaintPreviewCompositorImpl>>
        compositors_;
  
diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
index 5b6a93f948a3..96e78d637267 100644
--- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,6 +1,6 @@
---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2020-03-17 09:48:11 UTC
+--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2020-05-13 18:40:30 UTC
 +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -262,7 +262,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -271,7 +271,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
    // that case, the Linux-only list should be revisited and potentially
    // removed.
diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
index 33f3999ba526..9728dca829de 100644
--- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
+++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
@@ -1,6 +1,6 @@
---- components/url_matcher/regex_set_matcher.cc.orig	2019-03-11 22:00:57 UTC
+--- components/url_matcher/regex_set_matcher.cc.orig	2020-05-13 18:39:42 UTC
 +++ components/url_matcher/regex_set_matcher.cc
-@@ -11,8 +11,13 @@
+@@ -12,8 +12,13 @@
  #include "base/logging.h"
  #include "base/strings/string_util.h"
  #include "components/url_matcher/substring_set_matcher.h"
diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc
index ad1c4166adfc..b3b8c74652fa 100644
--- a/www/chromium/files/patch-components_viz_common_features.cc
+++ b/www/chromium/files/patch-components_viz_common_features.cc
@@ -1,16 +1,7 @@
---- components/viz/common/features.cc.orig	2020-03-17 09:49:01 UTC
+--- components/viz/common/features.cc.orig	2020-05-13 18:39:42 UTC
 +++ components/viz/common/features.cc
-@@ -17,7 +17,7 @@
- namespace features {
- 
- // Use Skia's readback API instead of GLRendererCopier.
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback",
+@@ -20,7 +20,7 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForG
                                            base::FEATURE_ENABLED_BY_DEFAULT};
- #else
-@@ -26,7 +26,7 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForG
- #endif
  
  // Use the SkiaRenderer.
 -#if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
deleted file mode 100644
index a3cbc1921992..000000000000
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2020-03-17 09:50:06 UTC
-+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -224,7 +224,7 @@ void SkiaOutputSurfaceImpl::Reshape(const gfx::Size& s
-   if (characterization_.isValid()) {
-     // TODO(vasilyt): We temporary keep old code for linux to not interferee
-     // with M81. Remove this after.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     sk_sp<SkColorSpace> sk_color_space = color_space.ToSkColorSpace();
-     if (!SkColorSpace::Equals(characterization_.colorSpace(),
-                               sk_color_space.get())) {
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index a31cdeada8fc..fb803c369cbe 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2020-02-03 21:53:31 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig	2020-05-13 18:39:42 UTC
 +++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
+@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
    base::TimeTicks now = base::TimeTicks::Now();
    base::TimeDelta interval_to_next_refresh =
        now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
@@ -9,7 +9,7 @@
    if (needs_swap_size_notifications_)
      client_->DidSwapWithSize(pixel_size);
  #endif
-@@ -147,7 +147,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -143,7 +143,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
    return gfx::OVERLAY_TRANSFORM_NONE;
  }
  
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index 78a386e1b26f..1e19845eca9c 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig	2020-03-16 18:40:31 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig	2020-05-13 18:39:42 UTC
 +++ components/viz/service/display_embedder/software_output_surface.h
-@@ -50,7 +50,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -49,7 +49,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
        UpdateVSyncParametersCallback callback) override;
    void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
    gfx::OverlayTransform GetDisplayTransform() override;
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index f52c82d287af..b6be9b242a36 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2020-03-16 18:40:31 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2020-05-13 18:40:30 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -50,7 +50,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
        params->send_swap_size_notifications);
  
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -418,7 +418,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -431,7 +431,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
  #if defined(OS_ANDROID)
    if (display_client_)
      display_client_->DidCompleteSwapWithSize(pixel_size);
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 0cd42362caa3..c9067e1bd917 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2020-03-16 18:40:31 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2020-05-13 18:40:30 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -149,7 +149,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
+@@ -151,7 +151,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp
    base::TimeDelta preferred_frame_interval_ =
        FrameRateDecider::UnspecifiedFrameInterval();
  
diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
index 59a258fd3b15..cf5ae3fedb21 100644
--- a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc
@@ -1,6 +1,6 @@
---- components/viz/test/fake_output_surface.cc.orig	2020-04-06 07:59:49 UTC
+--- components/viz/test/fake_output_surface.cc.orig	2020-05-13 18:39:42 UTC
 +++ components/viz/test/fake_output_surface.cc
-@@ -114,7 +114,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra
+@@ -111,7 +111,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra
                                           : gfx::OVERLAY_TRANSFORM_NONE;
  }
  
diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.h b/www/chromium/files/patch-components_viz_test_fake__output__surface.h
index 5da27a2de0cd..d4118ff7d302 100644
--- a/www/chromium/files/patch-components_viz_test_fake__output__surface.h
+++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.h
@@ -1,6 +1,6 @@
---- components/viz/test/fake_output_surface.h.orig	2020-04-06 08:00:10 UTC
+--- components/viz/test/fake_output_surface.h.orig	2020-05-13 18:39:42 UTC
 +++ components/viz/test/fake_output_surface.h
-@@ -84,7 +84,7 @@ class FakeOutputSurface : public OutputSurface {
+@@ -83,7 +83,7 @@ class FakeOutputSurface : public OutputSurface {
        UpdateVSyncParametersCallback callback) override;
    void SetDisplayTransformHint(gfx::OverlayTransform transform) override;
    gfx::OverlayTransform GetDisplayTransform() override;
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index dc4a030d4d3f..c812e72af8e8 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2020-03-16 18:40:31 UTC
+--- content/app/content_main_runner_impl.cc.orig	2020-05-13 18:40:30 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -101,17 +101,17 @@
+@@ -102,17 +102,17 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -21,7 +21,7 @@
  #include "base/native_library.h"
  #include "base/rand_util.h"
  #include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
  #include "content/public/common/content_client.h"
  #endif
  
@@ -30,7 +30,7 @@
  
  #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
  #include "content/child/field_trial.h"
-@@ -298,7 +298,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -300,7 +300,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -39,7 +39,7 @@
  
  #if BUILDFLAG(ENABLE_PLUGINS)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -395,7 +395,7 @@ void PreSandboxInit() {
+@@ -397,7 +397,7 @@ void PreSandboxInit() {
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -48,7 +48,7 @@
  
  }  // namespace
  
-@@ -462,7 +462,7 @@ int RunZygote(ContentMainDelegate* delegate) {
+@@ -465,7 +465,7 @@ int RunZygote(ContentMainDelegate* delegate) {
    delegate->ZygoteStarting(&zygote_fork_delegates);
    media::InitializeMediaLibrary();
  
@@ -57,7 +57,7 @@
    PreSandboxInit();
  #endif
  
-@@ -622,11 +622,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
+@@ -625,11 +625,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
                     base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !OS_ANDROID
  
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
new file mode 100644
index 000000000000..8c9efaa976a8
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -0,0 +1,12 @@
+--- content/browser/BUILD.gn.orig	2020-05-19 08:29:25 UTC
++++ content/browser/BUILD.gn
+@@ -2004,6 +2004,9 @@ jumbo_source_set("browser") {
+       "//third_party/blink/public/mojom:memory_usage_monitor_linux_mojo_bindings",
+     ]
+   }
++  if (is_bsd) {
++    deps -= [ "//services/service_manager/zygote" ]
++  }
+ 
+   if (is_desktop_linux) {
+     sources += [ "speech/tts_linux.cc" ]
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index d390038358d3..cf7d07e695bb 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,4 +1,4 @@
---- content/browser/browser_main_loop.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/browser_main_loop.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/browser_main_loop.cc
 @@ -242,6 +242,13 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
@@ -14,19 +14,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -613,6 +620,11 @@ int BrowserMainLoop::EarlyInitialization() {
-   // by now since a thread to start the ServiceManager has been created
-   // before the browser main loop starts.
-   DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
-+#elif defined(OS_BSD)
-+  SandboxHostLinux::GetInstance()->Init();
-+  base::FileHandleMappingVector fds_to_map;
-+  const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket();
-+  fds_to_map.push_back(std::make_pair(sfd, service_manager::GetSandboxFD()));
- #endif
- 
- #if defined(USE_X11)
-@@ -658,7 +670,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -658,7 +665,7 @@ int BrowserMainLoop::EarlyInitialization() {
    }
  #endif  // !defined(OS_MACOSX)
  
@@ -35,7 +23,7 @@
      defined(OS_ANDROID)
    // We use quite a few file descriptors for our IPC as well as disk the disk
    // cache,and the default limit on the Mac is low (256), so bump it up.
-@@ -668,7 +680,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -668,7 +675,7 @@ int BrowserMainLoop::EarlyInitialization() {
    // users can easily hit this limit with many open tabs. Bump up the limit to
    // an arbitrarily high number. See https://crbug.com/539567
    base::IncreaseFdLimitTo(8192);
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index 49d1b92ec5ea..5ef3bf43c843 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig	2020-02-03 21:52:45 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2020-05-13 18:39:42 UTC
 +++ content/browser/child_process_launcher_helper_linux.cc
-@@ -17,7 +17,9 @@
+@@ -18,7 +18,9 @@
  #include "content/public/common/sandboxed_process_launcher_delegate.h"
  #include "services/service_manager/sandbox/linux/sandbox_linux.h"
  #include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
@@ -10,7 +10,21 @@
  #include "services/service_manager/zygote/host/zygote_communication_linux.h"
  #include "services/service_manager/zygote/host/zygote_host_impl_linux.h"
  
-@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -50,11 +52,13 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+   options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
+       base::GlobalDescriptors::kBaseDescriptor);
+ 
++#if !defined(OS_BSD)
+   if (GetProcessType() == switches::kRendererProcess) {
+     const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
+     options->fds_to_remap.push_back(
+         std::make_pair(sandbox_fd, service_manager::GetSandboxFD()));
+   }
++#endif
+ 
+   options->environment = delegate_->GetEnvironment();
+ 
+@@ -69,6 +73,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
      int* launch_result) {
    *is_synchronous_launch = true;
  
@@ -18,17 +32,17 @@
    service_manager::ZygoteHandle zygote_handle =
        base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
            ? nullptr
-@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -82,7 +87,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          GetProcessType());
      *launch_result = LAUNCH_RESULT_SUCCESS;
  
 -#if !defined(OS_OPENBSD)
      if (handle) {
-       // This is just a starting score for a renderer or extension (the
-       // only types of processes that will be started this way).  It will
-@@ -92,13 +94,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+       // It could be a renderer process or an utility process.
+       int oom_score = content::kMiscOomScore;
+@@ -92,13 +96,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
        service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
-           handle, kLowestRendererOomScore);
+           handle, oom_score);
      }
 -#endif
  
@@ -41,7 +55,7 @@
  
    Process process;
    process.process = base::LaunchProcess(*command_line(), options);
-@@ -116,10 +118,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -116,10 +120,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
      const ChildProcessLauncherHelper::Process& process,
      bool known_dead) {
    ChildProcessTerminationInfo info;
@@ -56,7 +70,7 @@
      info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
                                                        &info.exit_code);
    } else {
-@@ -143,13 +149,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -143,13 +151,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
    DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
new file mode 100644
index 000000000000..645022d83e96
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc
@@ -0,0 +1,11 @@
+--- content/browser/compositor/viz_process_transport_factory.cc.orig	2020-05-15 15:06:49 UTC
++++ content/browser/compositor/viz_process_transport_factory.cc
+@@ -109,7 +109,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+   HostDisplayClient& operator=(const HostDisplayClient&) = delete;
+ 
+   // viz::HostDisplayClient:
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   void DidCompleteSwapWithNewSize(const gfx::Size& size) override {
+     compositor_->OnCompleteSwapWithNewSize(size);
+   }
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 78851da5e325..52ac6ac0bf74 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/gpu/gpu_process_host.cc
-@@ -1086,7 +1086,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
+@@ -1099,7 +1099,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
    std::unique_ptr<base::CommandLine> cmd_line =
        std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
  #else
diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc
index 1e117219d0e9..1ac54277ca6c 100644
--- a/www/chromium/files/patch-content_browser_media_media__internals.cc
+++ b/www/chromium/files/patch-content_browser_media_media__internals.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_internals.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/media/media_internals.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/media/media_internals.cc
-@@ -531,7 +531,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+@@ -560,7 +560,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
      device_dict->SetString("id", descriptor.device_id);
      device_dict->SetString("name", descriptor.GetNameAndModel());
      device_dict->Set("formats", std::move(format_list));
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
index 91932a38a5e5..2b17bdaa451a 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_message_filter.cc.orig	2019-12-16 21:50:47 UTC
+--- content/browser/renderer_host/render_message_filter.cc.orig	2020-05-13 18:39:43 UTC
 +++ content/browser/renderer_host/render_message_filter.cc
 @@ -70,7 +70,7 @@
  #if defined(OS_MACOSX)
@@ -9,8 +9,8 @@
  #include "base/linux_util.h"
  #include "base/threading/platform_thread.h"
  #endif
-@@ -149,7 +149,7 @@ void RenderMessageFilter::CreateFullscreenWidget(
-   std::move(callback).Run(route_id);
+@@ -117,7 +117,7 @@ void RenderMessageFilter::GenerateRoutingID(
+   std::move(callback).Run(render_widget_helper_->GetNextRoutingID());
  }
  
 -#if defined(OS_LINUX)
@@ -18,7 +18,7 @@
  void RenderMessageFilter::SetThreadPriorityOnFileThread(
      base::PlatformThreadId ns_tid,
      base::ThreadPriority priority) {
-@@ -170,7 +170,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
+@@ -138,7 +138,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
  }
  #endif
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
index f50e2f2912d6..f7211a9cd845 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
@@ -1,8 +1,8 @@
---- content/browser/renderer_host/render_message_filter.h.orig	2019-12-16 21:50:47 UTC
+--- content/browser/renderer_host/render_message_filter.h.orig	2020-05-13 18:39:43 UTC
 +++ content/browser/renderer_host/render_message_filter.h
-@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter
-                               mojo::PendingRemote<mojom::Widget> widget,
-                               CreateFullscreenWidgetCallback callback) override;
+@@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter
+   // mojom::RenderMessageFilter:
+   void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override;
    void HasGpuProcess(HasGpuProcessCallback callback) override;
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index f27d90720f9b..bc0f8ce7d525 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -241,7 +241,7 @@
+@@ -242,7 +242,7 @@
  #include "content/browser/gpu/gpu_data_manager_impl.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  #include <sys/time.h>
  
-@@ -1176,7 +1176,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1199,7 +1199,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1187,7 +1187,7 @@ size_t GetPlatformProcessLimit() {
+@@ -1210,7 +1210,7 @@ size_t GetPlatformProcessLimit() {
  #else
    // TODO(https://crbug.com/104689): Implement on other platforms.
    return kUnknownPlatformProcessLimit;
@@ -27,7 +27,7 @@
  }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
-@@ -1256,7 +1256,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
+@@ -1304,7 +1304,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
          return;
      }
  
@@ -36,7 +36,7 @@
      if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
        ConnectToFontService(std::move(font_receiver));
        return;
-@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -1724,7 +1724,7 @@ bool RenderProcessHostImpl::Init() {
    renderer_prefix =
        browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 616427da0032..f17c155d5c40 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig	2020-03-16 18:40:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
-@@ -458,10 +458,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -469,10 +469,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
      is_for_guests_only_ = is_for_guests_only;
    }
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index 06332b50ef27..8558a81751a7 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
 @@ -206,7 +206,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
@@ -7,5 +7,5 @@
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    prefs->system_font_family_name = gfx::Font().GetFontName();
- #endif
- }
+ #elif defined(OS_FUCHSIA)
+   // Make Blink's "focus ring" invisible. The focus ring is a hairline border
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 99de1314b9ec..5cff6dfbbbca 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2020-03-16 18:40:31 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -115,7 +115,7 @@
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
@@ -9,16 +9,16 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
-@@ -2171,7 +2171,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2187,7 +2187,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    return NeedsInputGrab();
- #endif
+ #else
    return false;
-@@ -2340,7 +2340,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2357,7 +2357,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 7321b9e2f949..459ab2bcbe82 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2020-02-03 21:53:31 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -611,7 +611,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -641,7 +641,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
index 68b512d069c4..c20c0bafc0a9 100644
--- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
+++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
@@ -1,6 +1,6 @@
---- content/browser/scheduler/responsiveness/jank_monitor.cc.orig	2020-02-03 21:53:31 UTC
+--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig	2020-05-13 18:39:43 UTC
 +++ content/browser/scheduler/responsiveness/jank_monitor.cc
-@@ -321,7 +321,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
+@@ -322,7 +322,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
      // in context menus, among others). Simply ignore the mismatches for now.
      // See https://crbug.com/929813 for the details of why the mismatch
      // happens.
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
index 8360a7efdc5e..2a5cb1bbdcf8 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host.cc.orig	2020-03-16 18:40:32 UTC
+--- content/browser/utility_process_host.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/browser/utility_process_host.cc
-@@ -210,7 +210,7 @@ UtilityProcessHost::UtilityProcessHost()
+@@ -247,7 +247,7 @@ UtilityProcessHost::UtilityProcessHost()
  
  UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
      : sandbox_type_(service_manager::SandboxType::kUtility),
diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn
new file mode 100644
index 000000000000..88966886db74
--- /dev/null
+++ b/www/chromium/files/patch-content_child_BUILD.gn
@@ -0,0 +1,16 @@
+--- content/child/BUILD.gn.orig	2020-05-19 08:30:28 UTC
++++ content/child/BUILD.gn
+@@ -147,8 +147,12 @@ target(link_target_type, "child") {
+     deps += [
+       "//components/services/font/public/cpp",
+       "//components/services/font/public/mojom",
+-      "//services/service_manager/zygote",
+     ]
++    if (!is_bsd) {
++      deps += [
++        "//services/service_manager/zygote",
++      ]
++    }
+   }
+ 
+   if (is_win) {
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 3d0913b5242b..bab8939d35c6 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2020-03-16 18:40:32 UTC
+--- content/common/BUILD.gn.orig	2020-05-13 18:40:31 UTC
 +++ content/common/BUILD.gn
-@@ -356,6 +356,12 @@ source_set("common") {
+@@ -344,6 +344,12 @@ source_set("common") {
      libs += [ "android" ]
    }
  
diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc
index d842b3145b5d..c3c6b860525d 100644
--- a/www/chromium/files/patch-content_common_user__agent.cc
+++ b/www/chromium/files/patch-content_common_user__agent.cc
@@ -1,6 +1,6 @@
---- content/common/user_agent.cc.orig	2020-03-16 18:40:32 UTC
+--- content/common/user_agent.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/common/user_agent.cc
-@@ -140,6 +140,14 @@ std::string BuildOSCpuInfo(bool include_android_build_
+@@ -160,6 +160,14 @@ std::string BuildOSCpuInfo(bool include_android_build_
  #endif
    );
  
diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn
index 538b4bc2f7bc..f51961d30857 100644
--- a/www/chromium/files/patch-content_gpu_BUILD.gn
+++ b/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,6 +1,15 @@
---- content/gpu/BUILD.gn.orig	2020-03-16 18:40:32 UTC
+--- content/gpu/BUILD.gn.orig	2020-05-13 18:39:43 UTC
 +++ content/gpu/BUILD.gn
-@@ -128,7 +128,7 @@ target(link_target_type, "gpu_sources") {
+@@ -96,7 +96,7 @@ target(link_target_type, "gpu_sources") {
+     ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     deps += [ "//services/service_manager/zygote" ]
+   }
+ 
+@@ -130,7 +130,7 @@ target(link_target_type, "gpu_sources") {
  
    # Use DRI on desktop Linux builds.
    if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index ba08acddf473..e187a3b4ecb9 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig	2020-03-16 18:40:32 UTC
+--- content/gpu/gpu_main.cc.orig	2020-05-13 18:40:31 UTC
 +++ content/gpu/gpu_main.cc
 @@ -84,7 +84,7 @@
  #include "ui/gfx/x/x11_switches.h"                       // nogncheck
@@ -18,7 +18,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -162,7 +162,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
    bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
                                  const gpu::GPUInfo* gpu_info,
                                  const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
      return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
  #elif defined(OS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -288,7 +288,7 @@ int GpuMain(const MainFunctionParams& parameters) {
      main_thread_task_executor =
          std::make_unique<base::SingleThreadTaskExecutor>(
              gpu_preferences.message_pump_type);
@@ -36,7 +36,7 @@
  #error "Unsupported Linux platform."
  #elif defined(OS_MACOSX)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -442,7 +442,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -434,7 +434,7 @@ int GpuMain(const MainFunctionParams& parameters) {
  
  namespace {
  
@@ -45,7 +45,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
-@@ -479,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -471,7 +471,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
  
    return res;
  }
diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc
index 22a460c346ac..12681a7c6faa 100644
--- a/www/chromium/files/patch-content_public_app_content__main__delegate.cc
+++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc
@@ -1,11 +1,11 @@
---- content/public/app/content_main_delegate.cc.orig	2020-03-16 18:40:32 UTC
+--- content/public/app/content_main_delegate.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/app/content_main_delegate.cc
-@@ -39,13 +39,13 @@ bool ContentMainDelegate::DelaySandboxInitialization(
-   return false;
+@@ -27,13 +27,13 @@ int ContentMainDelegate::RunProcess(
+   return -1;
  }
  
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
  
  void ContentMainDelegate::ZygoteStarting(
      std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h
index 06f339f70e30..7fdad01e5ccf 100644
--- a/www/chromium/files/patch-content_public_app_content__main__delegate.h
+++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h
@@ -1,15 +1,15 @@
---- content/public/app/content_main_delegate.h.orig	2020-03-16 18:40:32 UTC
+--- content/public/app/content_main_delegate.h.orig	2020-05-13 18:40:32 UTC
 +++ content/public/app/content_main_delegate.h
-@@ -72,7 +72,7 @@ class CONTENT_EXPORT ContentMainDelegate {
-   // want it at all.
-   virtual bool DelaySandboxInitialization(const std::string& process_type);
+@@ -60,7 +60,7 @@ class CONTENT_EXPORT ContentMainDelegate {
+   // Called right before the process exits.
+   virtual void ProcessExiting(const std::string& process_type) {}
  
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
    // Tells the embedder that the zygote process is starting, and allows it to
    // specify one or more zygote delegates if it wishes by storing them in
    // |*delegates|.
-@@ -82,7 +82,7 @@ class CONTENT_EXPORT ContentMainDelegate {
+@@ -70,7 +70,7 @@ class CONTENT_EXPORT ContentMainDelegate {
  
    // Called every time the zygote process forks.
    virtual void ZygoteForked() {}
diff --git a/www/chromium/files/patch-content_public_common_BUILD.gn b/www/chromium/files/patch-content_public_common_BUILD.gn
new file mode 100644
index 000000000000..20976e3b5b5b
--- /dev/null
+++ b/www/chromium/files/patch-content_public_common_BUILD.gn
@@ -0,0 +1,11 @@
+--- content/public/common/BUILD.gn.orig	2020-05-19 08:31:27 UTC
++++ content/public/common/BUILD.gn
+@@ -254,7 +254,7 @@ jumbo_source_set("common_sources") {
+     deps += [ "//content/public/android:jni" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     deps += [ "//services/service_manager/zygote" ]
+   }
+ 
diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
index 3fa7b395b5ef..d58b41972528 100644
--- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
+++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
@@ -1,6 +1,6 @@
---- content/public/common/common_param_traits_macros.h.orig	2020-03-16 18:40:32 UTC
+--- content/public/common/common_param_traits_macros.h.orig	2020-05-13 18:40:32 UTC
 +++ content/public/common/common_param_traits_macros.h
-@@ -326,7 +326,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
+@@ -312,7 +312,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
    IPC_STRUCT_TRAITS_MEMBER(accept_languages)
    IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
diff --git a/www/chromium/files/patch-content_public_common_content__constants.cc b/www/chromium/files/patch-content_public_common_content__constants.cc
new file mode 100644
index 000000000000..fcf1b26ac67d
--- /dev/null
+++ b/www/chromium/files/patch-content_public_common_content__constants.cc
@@ -0,0 +1,11 @@
+--- content/public/common/content_constants.cc.orig	2020-05-15 15:08:32 UTC
++++ content/public/common/content_constants.cc
+@@ -46,7 +46,7 @@ const int kDefaultDetachableCancelDelayMs = 30000;
+ const char kCorsExemptPurposeHeaderName[] = "Purpose";
+ const char kCorsExemptRequestedWithHeaderName[] = "X-Requested-With";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const int kLowestRendererOomScore = 300;
+ const int kHighestRendererOomScore = 1000;
+ 
diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h
new file mode 100644
index 000000000000..d26794df95f9
--- /dev/null
+++ b/www/chromium/files/patch-content_public_common_content__constants.h
@@ -0,0 +1,11 @@
+--- content/public/common/content_constants.h.orig	2020-05-15 15:08:45 UTC
++++ content/public/common/content_constants.h
+@@ -65,7 +65,7 @@ CONTENT_EXPORT extern const int kDefaultDetachableCanc
+ CONTENT_EXPORT extern const char kCorsExemptPurposeHeaderName[];
+ CONTENT_EXPORT extern const char kCorsExemptRequestedWithHeaderName[];
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // The OOM score adj constants
+ // The highest and lowest assigned OOM score adjustment (oom_score_adj) for
+ // renderers and extensions used by the OomPriority Manager.
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index ebaa5f3fdb2a..0c55648ee2b6 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,7 +1,7 @@
---- content/public/common/content_features.cc.orig	2020-03-16 18:40:32 UTC
+--- content/public/common/content_features.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/common/content_features.cc
 @@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
- const base::Feature kAudioServiceOutOfProcess{
+ const base::Feature kAudioServiceOutOfProcess {
    "AudioServiceOutOfProcess",
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ -9,7 +9,7 @@
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
        base::FEATURE_DISABLED_BY_DEFAULT
-@@ -693,7 +693,7 @@ const base::Feature kWebAssemblyThreads {
+@@ -707,7 +707,7 @@ const base::Feature kWebAssemblyThreads {
  };
  
  // Enable WebAssembly trap handler.
@@ -18,7 +18,7 @@
      defined(ARCH_CPU_X86_64)
  const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -723,7 +723,7 @@ const base::Feature kWebAuth{"WebAuthentication",
+@@ -737,7 +737,7 @@ const base::Feature kWebAuth{"WebAuthentication",
  // https://w3c.github.io/webauthn
  const base::Feature kWebAuthCable {
    "WebAuthenticationCable",
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 4f1ae111a366..e791fd32cebb 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2020-03-16 18:40:32 UTC
+--- content/public/common/content_switches.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/common/content_switches.cc
-@@ -997,7 +997,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
+@@ -1003,7 +1003,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
  // Enable indication that browser is controlled by automation.
  const char kEnableAutomation[] = "enable-automation";
  
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index 1a705f45ae7f..5206b024e54f 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2020-03-16 18:40:32 UTC
+--- content/public/common/content_switches.h.orig	2020-05-13 18:40:32 UTC
 +++ content/public/common/content_switches.h
-@@ -278,7 +278,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
+@@ -280,7 +280,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
  CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
  #endif
  
diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc
index dd60982ba019..78ee754a2085 100644
--- a/www/chromium/files/patch-content_public_test_browser__test__base.cc
+++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc
@@ -1,6 +1,6 @@
---- content/public/test/browser_test_base.cc.orig	2020-04-03 04:11:32 UTC
+--- content/public/test/browser_test_base.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/test/browser_test_base.cc
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
  #include "ui/gl/gl_implementation.h"
  #include "ui/gl/gl_switches.h"
  
@@ -9,7 +9,7 @@
  #include "ui/platform_window/common/platform_window_defaults.h"  // nogncheck
  #endif
  
-@@ -98,6 +98,10 @@
+@@ -99,6 +99,10 @@
  #include "ui/views/test/event_generator_delegate_mac.h"
  #endif
  
@@ -20,7 +20,7 @@
  #if defined(OS_POSIX)
  #include "base/process/process_handle.h"
  #endif
-@@ -184,7 +188,7 @@ BrowserTestBase::BrowserTestBase()
+@@ -185,7 +189,7 @@ BrowserTestBase::BrowserTestBase()
           "a new browser test suite that runs on Android, please add it to "
           "//build/android/pylib/gtest/gtest_test_instance.py.";
    g_instance_already_created = true;
diff --git a/www/chromium/files/patch-content_public_test_content__browser__test.cc b/www/chromium/files/patch-content_public_test_content__browser__test.cc
index cc6012d2f89e..9fc68f4a88c5 100644
--- a/www/chromium/files/patch-content_public_test_content__browser__test.cc
+++ b/www/chromium/files/patch-content_public_test_content__browser__test.cc
@@ -1,6 +1,6 @@
---- content/public/test/content_browser_test.cc.orig	2020-04-06 08:25:58 UTC
+--- content/public/test/content_browser_test.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/test/content_browser_test.cc
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
  #include "base/mac/foundation_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -83,7 +83,7 @@ void ContentBrowserTest::SetUp() {
+@@ -82,7 +82,7 @@ void ContentBrowserTest::SetUp() {
  #endif
  
    // LinuxInputMethodContextFactory has to be initialized.
@@ -18,7 +18,7 @@
    ui::InitializeInputMethodForTesting();
  #endif
  
-@@ -96,7 +96,7 @@ void ContentBrowserTest::TearDown() {
+@@ -95,7 +95,7 @@ void ContentBrowserTest::TearDown() {
    BrowserTestBase::TearDown();
  
    // LinuxInputMethodContextFactory has to be shutdown.
diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
index 5b12d835bc18..a4b6aaad576b 100644
--- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc
+++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
@@ -1,6 +1,6 @@
---- content/public/test/mock_render_thread.cc.orig	2019-12-16 21:51:26 UTC
+--- content/public/test/mock_render_thread.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/public/test/mock_render_thread.cc
-@@ -73,7 +73,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
+@@ -51,7 +51,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
      std::move(callback).Run(false);
    }
  
diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn
new file mode 100644
index 000000000000..7872976772af
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_BUILD.gn
@@ -0,0 +1,18 @@
+--- content/renderer/BUILD.gn.orig	2020-05-19 08:32:02 UTC
++++ content/renderer/BUILD.gn
+@@ -463,10 +463,11 @@ target(link_target_type, "renderer") {
+   }
+ 
+   if (is_linux) {
+-    deps += [
+-      "//components/services/font/public/cpp",
+-      "//services/service_manager/zygote",
+-    ]
++    deps += [ "//components/services/font/public/cpp" ]
++
++    if (!is_bsd) {
++      deps += [ "//services/service_manager/zygote" ]
++    }
+   }
+ 
+   if (is_mac) {
diff --git a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
index c1a03f802347..8df687e61704 100644
--- a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
+++ b/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
@@ -1,6 +1,6 @@
---- content/renderer/media/audio/audio_device_factory.cc.orig	2019-06-04 18:55:23 UTC
+--- content/renderer/media/audio/audio_device_factory.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/renderer/media/audio/audio_device_factory.cc
-@@ -35,7 +35,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
+@@ -36,7 +36,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
  namespace {
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index c0badaab0886..e71a59eb44df 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig	2020-03-16 18:40:32 UTC
+--- content/renderer/render_process_impl.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/renderer/render_process_impl.cc
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
  #if defined(OS_WIN)
  #include "base/win/win_util.h"
  #endif
@@ -9,7 +9,7 @@
  #include "v8/include/v8-wasm-trap-handler-posix.h"
  #endif
  namespace {
-@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -162,7 +162,7 @@ RenderProcessImpl::RenderProcessImpl()
  
    SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
                          "--no-wasm-trap-handler");
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index c231b5944895..a535ade11d96 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2020-03-16 18:40:32 UTC
+--- content/renderer/render_thread_impl.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -172,12 +172,21 @@
+@@ -176,12 +176,21 @@
  #include "mojo/public/cpp/bindings/message_dumper.h"
  #endif
  
@@ -22,7 +22,7 @@
  using base::ThreadRestrictions;
  using blink::WebDocument;
  using blink::WebFrame;
-@@ -731,7 +740,7 @@ void RenderThreadImpl::Init() {
+@@ -738,7 +747,7 @@ void RenderThreadImpl::Init() {
    DCHECK(parsed_num_raster_threads) << string_value;
    DCHECK_GT(num_raster_threads, 0);
  
@@ -31,7 +31,7 @@
    categorized_worker_pool_->SetBackgroundingCallback(
        main_thread_scheduler_->DefaultTaskRunner(),
        base::BindOnce(
-@@ -754,7 +763,7 @@ void RenderThreadImpl::Init() {
+@@ -761,7 +770,7 @@ void RenderThreadImpl::Init() {
    base::DiscardableMemoryAllocator::SetInstance(
        discardable_memory_allocator_.get());
  
@@ -40,7 +40,7 @@
    if (base::FeatureList::IsEnabled(
            blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
      render_message_filter()->SetThreadPriority(
-@@ -1136,7 +1145,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1147,7 +1156,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
  #else
        cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 5aa4c9e85488..4d33c7856bc3 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2020-02-03 21:53:31 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2020-05-13 18:39:43 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
 @@ -30,7 +30,7 @@
  #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
@@ -9,7 +9,7 @@
  #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
  #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
  #endif
-@@ -218,7 +218,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -219,7 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
  
    scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
  
@@ -18,7 +18,7 @@
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  
-@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -243,7 +243,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
    mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
  
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 6a640a666c6a..9e5b6bdb5be3 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,29 @@
---- content/shell/BUILD.gn.orig	2020-03-16 18:40:32 UTC
+--- content/shell/BUILD.gn.orig	2020-05-13 18:40:32 UTC
 +++ content/shell/BUILD.gn
-@@ -932,7 +932,7 @@ group("content_shell_crash_test") {
+@@ -90,7 +90,7 @@ static_library("content_shell_app") {
+     "//content/public/app:both",
+     "//v8",
+   ]
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [
+       "//components/crash/core/app",
+       "//components/crash/core/app:test_support",
+@@ -366,6 +366,13 @@ static_library("content_shell_lib") {
+     ]
+     deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ]
+   }
++  if (is_bsd) {
++    deps -= [
++      "//components/crash/content/browser",
++      "//components/crash/core/app",
++      "//components/crash/core/app:test_support",
++    ]
++  }
+ 
+   # Annoyingly, this target and web_test_support have circular includes.
+   allow_circular_includes_from = [ "//content/test:web_test_support" ]
+@@ -948,7 +955,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
index 9e3e50211c22..a2bfc6210d23 100644
--- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- content/shell/app/shell_main_delegate.cc.orig	2020-03-16 18:40:32 UTC
+--- content/shell/app/shell_main_delegate.cc.orig	2020-05-13 18:39:43 UTC
 +++ content/shell/app/shell_main_delegate.cc
-@@ -306,7 +306,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit
+@@ -181,7 +181,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit
  }
  
  void ShellMainDelegate::PreSandboxStartup() {
@@ -9,7 +9,7 @@
    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
    // cpu_brand info.
    base::CPU cpu_info;
-@@ -325,7 +325,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -200,7 +200,7 @@ void ShellMainDelegate::PreSandboxStartup() {
      // Reporting for sub-processes will be initialized in ZygoteForked.
      if (process_type != service_manager::switches::kZygoteProcess) {
        crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index dc97f7778f08..29998c1f9152 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2019-12-16 21:51:26 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/shell/browser/shell_browser_main_parts.cc
-@@ -47,7 +47,7 @@
+@@ -46,7 +46,7 @@
  #if defined(USE_AURA) && defined(USE_X11)
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
@@ -9,7 +9,7 @@
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  #if defined(OS_CHROMEOS)
-@@ -123,7 +123,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
+@@ -122,7 +122,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
  #if defined(USE_X11)
    ui::SetDefaultX11ErrorHandlers();
  #endif
diff --git a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
index c2e390ce3a41..a62ed57b34b6 100644
--- a/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
+++ b/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
@@ -1,4 +1,4 @@
---- content/shell/test_runner/test_runner.cc.orig	2020-03-16 18:40:32 UTC
+--- content/shell/test_runner/test_runner.cc.orig	2020-05-13 18:40:32 UTC
 +++ content/shell/test_runner/test_runner.cc
 @@ -62,7 +62,7 @@
  #include "ui/gfx/geometry/size.h"
@@ -18,7 +18,7 @@
    blink::WebFontRenderStyle::SetSubpixelPositioning(false);
  #endif
  
-@@ -2111,7 +2111,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
+@@ -2112,7 +2112,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
  }
  
  void TestRunner::SetTextSubpixelPositioning(bool value) {
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
new file mode 100644
index 000000000000..6c2671632c68
--- /dev/null
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -0,0 +1,34 @@
+--- content/test/BUILD.gn.orig	2020-05-19 08:32:40 UTC
++++ content/test/BUILD.gn
+@@ -1337,15 +1337,22 @@ test("content_browsertests") {
+   }
+ 
+   if (is_linux) {
+-    sources += [
+-      "../browser/utility_process_sandbox_browsertest.cc",
+-      "../zygote/zygote_browsertest.cc",
+-    ]
+-    deps += [
+-      "//services/service_manager/tests:interfaces",
+-      "//services/service_manager/zygote",
+-      "//ui/gfx:test_support",
+-    ]
++    if (is_bsd) {
++      deps += [
++        "//services/service_manager/tests:interfaces",
++        "//ui/gfx:test_support",
++      ]
++    } else {
++      sources += [
++        "../browser/utility_process_sandbox_browsertest.cc",
++        "../zygote/zygote_browsertest.cc",
++      ]
++      deps += [
++        "//services/service_manager/tests:interfaces",
++        "//services/service_manager/zygote",
++        "//ui/gfx:test_support",
++      ]
++    }
+ 
+     if (use_atk) {
+       sources += [
diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn
index 6c7ec5a20c2c..2bd5d6e7dc76 100644
--- a/www/chromium/files/patch-content_utility_BUILD.gn
+++ b/www/chromium/files/patch-content_utility_BUILD.gn
@@ -1,6 +1,6 @@
---- content/utility/BUILD.gn.orig	2020-03-18 12:50:25 UTC
+--- content/utility/BUILD.gn.orig	2020-05-13 18:40:32 UTC
 +++ content/utility/BUILD.gn
-@@ -78,7 +78,7 @@ jumbo_source_set("utility") {
+@@ -82,7 +82,7 @@ jumbo_source_set("utility") {
      deps += [ "//services/proxy_resolver:lib" ]
    }
  
@@ -8,4 +8,4 @@
 +  if (is_linux && !is_bsd) {
      deps += [ "//content/utility/soda:soda_sandbox_hook" ]
    }
- }
+ 
diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json
index 554abd741ba8..28c322e87eba 100644
--- a/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ b/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,4 +1,4 @@
---- extensions/common/api/_permission_features.json.orig	2020-02-03 21:53:31 UTC
+--- extensions/common/api/_permission_features.json.orig	2020-05-18 18:40:23 UTC
 +++ extensions/common/api/_permission_features.json
 @@ -135,7 +135,7 @@
      {
@@ -9,16 +9,16 @@
        "whitelist": [
          "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
          "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
-@@ -468,7 +468,7 @@
-   }, {
-     "channel": "stable",
-     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
+@@ -481,7 +481,7 @@
+       "platform_app",
+       "login_screen_extension"
+     ],
 -    "platforms": ["chromeos", "mac", "win", "linux"],
 +    "platforms": ["chromeos", "mac", "win", "linux", "bsd"],
      "whitelist": [
        "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -499,7 +499,7 @@
+@@ -520,7 +520,7 @@
    "networkingPrivate": {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/chromium/files/patch-extensions_common_feature__switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc
index 9cac45bedcb2..a83f1aa327b9 100644
--- a/www/chromium/files/patch-extensions_common_feature__switch.cc
+++ b/www/chromium/files/patch-extensions_common_feature__switch.cc
@@ -1,6 +1,6 @@
---- extensions/common/feature_switch.cc.orig	2019-10-21 19:06:34 UTC
+--- extensions/common/feature_switch.cc.orig	2020-05-13 18:39:44 UTC
 +++ extensions/common/feature_switch.cc
-@@ -42,11 +42,11 @@ class CommonSwitches {
+@@ -39,11 +39,11 @@ class CommonSwitches {
                           FeatureSwitch::DEFAULT_ENABLED),
          load_media_router_component_extension(
              kLoadMediaRouterComponentExtensionFlag,
diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn
new file mode 100644
index 000000000000..7c0cc29f2729
--- /dev/null
+++ b/www/chromium/files/patch-extensions_shell_BUILD.gn
@@ -0,0 +1,11 @@
+--- extensions/shell/BUILD.gn.orig	2020-05-18 11:01:17 UTC
++++ extensions/shell/BUILD.gn
+@@ -193,7 +193,7 @@ source_set("app_shell_lib") {
+     }
+   }
+ 
+-  if (is_desktop_linux) {
++  if (is_desktop_linux && !is_bsd) {
+     sources += [
+       "app/shell_crash_reporter_client.cc",
+       "app/shell_crash_reporter_client.h",
diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
index 3756044745e9..4f5857ab6651 100644
--- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,15 +1,15 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2020-03-16 18:40:32 UTC
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
-@@ -50,7 +50,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
+@@ -54,7 +54,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
  uint32_t GetPlatformSpecificTextureTarget() {
  #if defined(OS_MACOSX)
-   return GL_TEXTURE_RECTANGLE_ARB;
+   return macos_specific_texture_target;
 -#elif defined(OS_ANDROID) || defined(OS_LINUX)
 +#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
    return GL_TEXTURE_EXTERNAL_OES;
  #elif defined(OS_WIN) || defined(OS_FUCHSIA)
    return GL_TEXTURE_2D;
-@@ -72,7 +72,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer
+@@ -84,7 +84,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer
  
  GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget(
      gfx::BufferFormat format) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
index 04701c95d5c1..0d0324bb5b46 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig	2020-03-16 18:40:32 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/command_buffer/service/external_vk_image_backing.cc
-@@ -27,7 +27,7 @@
+@@ -29,7 +29,7 @@
  #include "ui/gl/buildflags.h"
  #include "ui/gl/gl_context.h"
  
@@ -9,28 +9,28 @@
  #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
  #endif
  
-@@ -35,7 +35,7 @@
+@@ -37,7 +37,7 @@
  #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
  #endif
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
- #endif
- 
-@@ -630,7 +630,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #define GL_DEDICATED_MEMORY_OBJECT_EXT 0x9581
+ #define GL_TEXTURE_TILING_EXT 0x9580
+ #define GL_TILING_TYPES_EXT 0x9583
+@@ -510,7 +510,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
  ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
                                      MemoryTypeTracker* tracker,
                                      WGPUDevice wgpuDevice) {
 -#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
-   if (!wgpu_format_) {
-     DLOG(ERROR) << "Format not supported for Dawn";
-     return nullptr;
-@@ -653,14 +653,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+   auto wgpu_format = viz::ToWGPUFormat(format());
+ 
+   if (wgpu_format == WGPUTextureFormat_Undefined) {
+@@ -529,14 +529,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+ 
    return std::make_unique<ExternalVkImageDawnRepresentation>(
-       manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd,
-       image_info.fAlloc.fSize, memory_type_index_.value());
+       manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd));
 -#else  // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN)
 +#else  // (!defined(OS_LINUX) && !defined(OS_BSD)) || !BUILDFLAG(USE_DAWN)
    NOTIMPLEMENTED_LOG_ONCE();
@@ -39,62 +39,44 @@
  }
  
  GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+     defined(OS_WIN)
    GrVkImageInfo image_info;
    bool result = backend_texture_.getVkImageInfo(&image_info);
-   DCHECK(result);
-@@ -710,7 +710,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna
- #elif defined(OS_FUCHSIA)
-   NOTIMPLEMENTED_LOG_ONCE();
-   return 0;
--#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
-+#else  // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA)
+@@ -545,7 +545,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna
+   gl::GLApi* api = gl::g_current_gl_context;
+   GLuint memory_object = 0;
+   if (!use_separate_gl_texture()) {
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+     auto memory_fd = image_->GetMemoryFd();
+     if (!memory_fd.is_valid()) {
+       return 0;
+@@ -608,7 +608,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna
+   }
+   api->glBindTextureFn(GL_TEXTURE_2D, old_texture_binding);
+   return texture_service_id;
+-#else  // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#else  // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
  #error Unsupported OS
  #endif
  }
-@@ -724,7 +724,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
+@@ -622,7 +622,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
      return nullptr;
    }
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+     defined(OS_WIN)
    if (!texture_) {
      GLuint texture_service_id = ProduceGLTextureInternal();
-     if (!texture_service_id)
-@@ -755,7 +755,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
- #elif defined(OS_FUCHSIA)
-   NOTIMPLEMENTED_LOG_ONCE();
-   return nullptr;
--#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
-+#else  // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA)
- #error Unsupported OS
- #endif
- }
-@@ -770,7 +770,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
+@@ -666,7 +666,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
      return nullptr;
    }
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \
+     defined(OS_WIN)
    if (!texture_passthrough_) {
      GLuint texture_service_id = ProduceGLTextureInternal();
-     if (!texture_service_id)
-@@ -790,7 +790,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
- #elif defined(OS_FUCHSIA)
-   NOTIMPLEMENTED_LOG_ONCE();
-   return nullptr;
--#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
-+#else  // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA)
- #error Unsupported OS
- #endif
- }
-@@ -808,7 +808,7 @@ ExternalVkImageBacking::ProduceSkia(
-                                                              tracker);
- }
- 
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_BSD)
- int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) {
-   VkMemoryGetFdInfoKHR get_fd_info;
-   get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
index 38283056309d..70b970e2aab2 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/external_vk_image_backing.h.orig	2020-03-16 18:40:32 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.h.orig	2020-05-13 18:40:32 UTC
 +++ gpu/command_buffer/service/external_vk_image_backing.h
-@@ -132,7 +132,7 @@ class ExternalVkImageBacking final : public ClearTrack
-                          base::Optional<WGPUTextureFormat> wgpu_format,
-                          base::Optional<uint32_t> memory_type_index);
+@@ -151,7 +151,7 @@ class ExternalVkImageBacking final : public ClearTrack
  
--#ifdef OS_LINUX
-+#if defined(OS_LINUX) || defined(OS_BSD)
+  private:
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
    // Extract file descriptor from image
    int GetMemoryFd(const GrVkImageInfo& image_info);
  #endif
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
index b94f6df0650f..98f0ab0fa3fe 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
@@ -1,20 +1,11 @@
---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig	2020-02-03 21:53:31 UTC
+--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/command_buffer/service/external_vk_image_gl_representation.cc
-@@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
- #if defined(OS_FUCHSIA)
-   NOTIMPLEMENTED_LOG_ONCE();
-   return 0;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
+@@ -188,7 +188,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
+     SemaphoreHandle handle) {
+   if (!handle.is_valid())
+     return 0;
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
    if (handle.vk_handle_type() !=
        VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
      DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
-@@ -194,7 +194,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk
-                                 fd.release());
- 
-   return gl_semaphore;
--#else  // !defined(OS_FUCHSIA) && !defined(OS_LINUX)
-+#else  // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD)
- #error Unsupported OS
- #endif
- }
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index e666e762ba6a..5e9abb45b5fb 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,4 +1,4 @@
---- gpu/config/gpu_control_list.cc.orig	2020-02-03 21:52:47 UTC
+--- gpu/config/gpu_control_list.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/config/gpu_control_list.cc
 @@ -16,7 +16,11 @@
  #include "base/values.h"
@@ -12,7 +12,7 @@
  
  namespace gpu {
  namespace {
-@@ -213,7 +217,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
+@@ -221,7 +225,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
  GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
  #if defined(OS_CHROMEOS)
    return kGLTypeGL;
@@ -21,7 +21,7 @@
    return kGLTypeGL;
  #elif defined(OS_MACOSX)
    return kGLTypeGL;
-@@ -713,7 +717,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -789,7 +793,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
    return kOsAndroid;
  #elif defined(OS_FUCHSIA)
    return kOsFuchsia;
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 2dff9b7c455a..fe83facc0c4c 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig	2020-03-16 18:40:32 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
+@@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
  #endif
  }
  
@@ -9,7 +9,7 @@
  bool CanAccessNvidiaDeviceFile() {
    bool res = true;
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-@@ -120,7 +120,7 @@ bool CanAccessNvidiaDeviceFile() {
+@@ -103,7 +103,7 @@ bool CanAccessNvidiaDeviceFile() {
    }
    return res;
  }
@@ -18,7 +18,7 @@
  
  class GpuWatchdogInit {
   public:
-@@ -170,7 +170,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -161,7 +161,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    gpu_info_.subpixel_font_rendering = true;
  #endif
  
@@ -27,7 +27,7 @@
    if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
        gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
      return false;
-@@ -221,7 +221,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -213,7 +213,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    delayed_watchdog_enable = true;
  #endif
  
@@ -36,7 +36,7 @@
    // PreSandbox is mainly for resource handling and not related to the GPU
    // driver, it doesn't need the GPU watchdog. The loadLibrary may take long
    // time that killing and restarting the GPU process will not help.
-@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -45,7 +45,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -267,7 +267,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
          watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
      attempted_startsandbox = true;
    }
@@ -54,7 +54,7 @@
  
    base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
  
-@@ -299,14 +299,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -291,14 +291,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
    if (gl_initialized && use_swiftshader &&
        gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
@@ -71,7 +71,7 @@
    }
  
    if (!gl_initialized) {
-@@ -332,7 +332,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -324,7 +324,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      }
    }
  
@@ -80,7 +80,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -370,7 +370,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -375,7 +375,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (use_swiftshader) {
@@ -89,7 +89,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -384,7 +384,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
                << "failed";
            return false;
          }
@@ -98,7 +98,7 @@
        }
      } else {  // use_swiftshader == true
        switch (gpu_preferences_.use_vulkan) {
-@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -445,7 +445,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_);
  
@@ -107,7 +107,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -464,7 +464,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        return false;
      }
    }
@@ -116,7 +116,7 @@
  
    if (use_swiftshader) {
      AdjustInfoToSwiftShader();
-@@ -637,7 +637,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -631,7 +631,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
  
    InitializePlatformOverlaySettings(&gpu_info_);
  
@@ -125,7 +125,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -657,7 +657,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -651,7 +651,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
        }
      }
    }
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
index bcadfa7d9e7b..9cd7f68d1d12 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig	2020-03-16 18:40:32 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig	2020-05-13 18:39:44 UTC
 +++ gpu/ipc/service/gpu_watchdog_thread.cc
-@@ -63,7 +63,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve
+@@ -64,7 +64,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve
    base::UmaHistogramEnumeration("GPU.WatchdogThread.V1.Timeout", timeout_event);
  }
  
@@ -9,7 +9,7 @@
  const base::FilePath::CharType kTtyFilePath[] =
      FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
  #endif
-@@ -81,7 +81,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
+@@ -82,7 +82,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
        arm_cpu_time_(),
  #endif
        suspension_counter_(this)
@@ -18,7 +18,7 @@
        ,
        host_tty_(-1)
  #endif
-@@ -103,7 +103,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
+@@ -104,7 +104,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
    DCHECK(result);
  #endif
  
@@ -27,7 +27,7 @@
    tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
    UpdateActiveTTY();
    host_tty_ = active_tty_;
-@@ -251,7 +251,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
+@@ -252,7 +252,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
  
    base::PowerMonitor::RemoveObserver(this);
  
@@ -36,7 +36,7 @@
    if (tty_file_)
      fclose(tty_file_);
  #endif
-@@ -434,7 +434,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
+@@ -435,7 +435,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
      return;
  #endif
  
@@ -45,7 +45,7 @@
    // Don't crash if we're not on the TTY of our host X11 server.
    UpdateActiveTTY();
    if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) {
-@@ -609,7 +609,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
+@@ -610,7 +610,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
  }
  #endif
  
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
index e81e9e60d43d..7351a28516f2 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig	2020-03-16 18:40:32 UTC
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig	2020-05-13 18:40:32 UTC
 +++ gpu/ipc/service/gpu_watchdog_thread.h
-@@ -207,7 +207,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
    base::ThreadTicks GetWatchedThreadTime();
  #endif
  
@@ -9,7 +9,7 @@
    void UpdateActiveTTY();
  #endif
  
-@@ -265,7 +265,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
+@@ -271,7 +271,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
    // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded.
    bool is_watchdog_start_histogram_recorded = false;
  
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index a6794bea5437..8307d489546e 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2020-03-16 18:40:32 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2020-05-13 18:40:32 UTC
 +++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -782,7 +782,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -828,7 +828,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
    }
  #endif  // defined(OS_ANDROID)
  
@@ -9,24 +9,24 @@
    if (gfx::HasExtension(enabled_extensions,
                          VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) {
      vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(
-@@ -801,9 +801,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -847,9 +847,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
        return false;
      }
    }
 -#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 +#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
    if (gfx::HasExtension(enabled_extensions,
                          VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) {
      vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
-@@ -823,7 +823,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -869,7 +869,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
        return false;
      }
    }
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
  #if defined(OS_FUCHSIA)
    if (gfx::HasExtension(enabled_extensions,
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index 5684a3f44924..4210be5d6669 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,26 +1,26 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2020-03-16 18:40:32 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2020-05-13 18:40:32 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -180,15 +180,15 @@ struct VulkanFunctionPointers {
-       vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
+@@ -227,15 +227,15 @@ struct VulkanFunctionPointers {
+       vkGetAndroidHardwareBufferPropertiesANDROIDFn;
  #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_LINUX) || defined(OS_ANDROID)
 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr;
-   PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr;
+   VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHRFn;
+   VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHRFn;
 -#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 +#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
-   PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr;
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHRFn;
+   VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHRFn;
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
  #if defined(OS_FUCHSIA)
-   PFN_vkImportSemaphoreZirconHandleFUCHSIA
-@@ -378,18 +378,18 @@ struct VulkanFunctionPointers {
+   VulkanFunction<PFN_vkImportSemaphoreZirconHandleFUCHSIA>
+@@ -447,18 +447,18 @@ struct VulkanFunctionPointers {
        ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
  #endif  // defined(OS_ANDROID)
  
@@ -33,13 +33,20 @@
 -#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 +#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
  #define vkGetMemoryFdPropertiesKHR \
    gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
  #if defined(OS_FUCHSIA)
  #define vkImportSemaphoreZirconHandleFUCHSIA \
+@@ -493,4 +493,4 @@ struct VulkanFunctionPointers {
+   gpu::GetVulkanFunctionPointers()->vkGetSwapchainImagesKHRFn
+ #define vkQueuePresentKHR gpu::GetVulkanFunctionPointers()->vkQueuePresentKHRFn
+ 
+-#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
+\ No newline at end of file
++#endif  // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn
new file mode 100644
index 000000000000..fa47a25a5bf7
--- /dev/null
+++ b/www/chromium/files/patch-headless_BUILD.gn
@@ -0,0 +1,56 @@
+--- headless/BUILD.gn.orig	2020-05-18 11:07:20 UTC
++++ headless/BUILD.gn
+@@ -267,7 +267,7 @@ jumbo_source_set("headless_shared_sources") {
+   sources += generated_devtools_api
+   sources += get_target_outputs(":protocol_sources")
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     sources += [
+       "lib/headless_crash_reporter_client.cc",
+       "lib/headless_crash_reporter_client.h",
+@@ -286,7 +286,7 @@ jumbo_source_set("headless_shared_sources") {
+     "//url",
+   ]
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [ "//components/crash/content/browser" ]
+   }
+   if (is_component_build && is_win) {
+@@ -442,7 +442,7 @@ jumbo_component("headless_non_renderer") {
+       "//v8",
+     ]
+ 
+-    if (!is_fuchsia) {
++    if (!is_fuchsia && !is_bsd) {
+       deps += [ "//components/crash/content/browser" ]
+     }
+     if (is_win) {
+@@ -589,7 +589,7 @@ test("headless_unittests") {
+     "//testing/gtest",
+   ]
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [ "//components/crash/content/browser" ]
+   }
+ 
+@@ -673,7 +673,7 @@ test("headless_browsertests") {
+     "//ui/base/clipboard",
+   ]
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [ "//components/crash/content/browser" ]
+   }
+ 
+@@ -801,7 +801,7 @@ jumbo_static_library("headless_shell_lib") {
+     public_deps += [ ":headless_non_renderer" ]
+   }
+ 
+-  if (!is_fuchsia) {
++  if (!is_fuchsia && !is_bsd) {
+     deps += [ "//components/crash/content/browser" ]
+   }
+ 
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index dbae7f502c62..807983d43e60 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig	2019-12-16 21:51:26 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig	2020-05-13 18:40:32 UTC
 +++ headless/lib/browser/headless_request_context_manager.cc
-@@ -26,7 +26,7 @@ namespace headless {
+@@ -27,7 +27,7 @@ namespace headless {
  
  namespace {
  
@@ -9,7 +9,7 @@
  static char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
+@@ -57,7 +57,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
    return traffic_annotation;
  }
  
@@ -18,7 +18,7 @@
  ::network::mojom::CryptConfigPtr BuildCryptConfigOnce(
      const base::FilePath& user_data_path) {
    static bool done_once = false;
-@@ -197,7 +197,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
+@@ -205,7 +205,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
      proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>(
          base::ThreadTaskRunnerHandle::Get());
    }
diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index b6d23a82eac8..a084e43deae5 100644
--- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,5 +1,23 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2020-03-16 18:39:51 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2020-05-13 18:40:32 UTC
 +++ headless/lib/headless_content_main_delegate.cc
+@@ -322,7 +322,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+     const base::CommandLine& command_line) {
+   if (command_line.HasSwitch(::switches::kDisableBreakpad))
+     return;
+-#if defined(OS_FUCHSIA)
++#if defined(OS_FUCHSIA) || defined(OS_BSD)
+   // TODO(fuchsia): Implement this when crash reporting/Breakpad are available
+   // in Fuchsia. (crbug.com/753619)
+   NOTIMPLEMENTED();
+@@ -351,7 +351,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+   crash_reporter::InitializeCrashpadWithEmbeddedHandler(
+       process_type.empty(), process_type, "", base::FilePath());
+ #endif  // defined(HEADLESS_USE_BREAKPAD)
+-#endif  // defined(OS_FUCHSIA)
++#endif  // defined(OS_FUCHSIA) || defined(OS_BSD)
+ }
+ 
+ 
 @@ -405,7 +405,7 @@ int HeadlessContentMainDelegate::RunProcess(
  }
  #endif  // !defined(CHROME_MULTIPLE_DLL_CHILD)
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 2e46acb021a0..344755d951da 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig	2020-03-16 18:40:33 UTC
+--- media/BUILD.gn.orig	2020-05-13 18:40:32 UTC
 +++ media/BUILD.gn
-@@ -63,6 +63,9 @@ config("media_config") {
+@@ -65,6 +65,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc
new file mode 100644
index 000000000000..85573fb29e7a
--- /dev/null
+++ b/www/chromium/files/patch-media_audio_audio__features.cc
@@ -0,0 +1,11 @@
+--- media/audio/audio_features.cc.orig	2020-05-15 15:14:56 UTC
++++ media/audio/audio_features.cc
+@@ -11,7 +11,7 @@ namespace features {
+ // detected. It will be restarted when needed.
+ const base::Feature kAudioServiceOutOfProcessKillAtHang{
+   "AudioServiceOutOfProcessKillAtHang",
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+       base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+       base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc
index d2289293450b..5ce5289c442e 100644
--- a/www/chromium/files/patch-media_base_audio__latency.cc
+++ b/www/chromium/files/patch-media_base_audio__latency.cc
@@ -1,6 +1,6 @@
---- media/base/audio_latency.cc.orig	2019-03-11 22:00:59 UTC
+--- media/base/audio_latency.cc.orig	2020-05-13 18:39:45 UTC
 +++ media/base/audio_latency.cc
-@@ -106,7 +106,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
+@@ -113,7 +113,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
      return frames_per_buffer;
    }
  
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index ed61b97adc9d..41c7e0da8d45 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,6 +1,6 @@
---- media/base/media_switches.cc.orig	2020-03-17 10:01:08 UTC
+--- media/base/media_switches.cc.orig	2020-05-13 18:40:32 UTC
 +++ media/base/media_switches.cc
-@@ -331,7 +331,7 @@ const base::Feature kFallbackAfterDecodeError{"Fallbac
+@@ -346,7 +346,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
  const base::Feature kGlobalMediaControls {
    "GlobalMediaControls",
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/www/chromium/files/patch-media_base_status.cc b/www/chromium/files/patch-media_base_status.cc
new file mode 100644
index 000000000000..984c997749f1
--- /dev/null
+++ b/www/chromium/files/patch-media_base_status.cc
@@ -0,0 +1,12 @@
+--- media/base/status.cc.orig	2020-05-22 09:19:37 UTC
++++ media/base/status.cc
+@@ -66,7 +66,9 @@ Status&& Status::AddCause(Status&& cause) && {
+ 
+ void Status::AddFrame(const base::Location& location) {
+   DCHECK(data_);
++#if SUPPORTS_LOCATION_BUILTINS
+   data_->frames.push_back(MediaSerialize(location));
++#endif
+ }
+ 
+ Status OkStatus() {
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 430d0f3c5bb5..8e84e08c288c 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2019-12-16 21:50:49 UTC
+--- media/base/video_frame.cc.orig	2020-05-13 18:39:45 UTC
 +++ media/base/video_frame.cc
 @@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
+@@ -259,7 +259,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
    return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
  }
  
@@ -27,7 +27,7 @@
  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
  // thus to have several VideoFrames share the same set of DMABUF FDs.
  class VideoFrame::DmabufHolder
-@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder
+@@ -277,7 +277,7 @@ class VideoFrame::DmabufHolder
    friend class base::RefCountedThreadSafe<DmabufHolder>;
    ~DmabufHolder() = default;
  };
@@ -36,7 +36,7 @@
  
  // static
  bool VideoFrame::IsValidConfig(VideoPixelFormat format,
-@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -590,7 +590,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -45,7 +45,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      const VideoFrameLayout& layout,
-@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -726,7 +726,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
      }
    }
  
@@ -54,7 +54,7 @@
    DCHECK(frame->dmabuf_fds_);
    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
    wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
+@@ -1059,7 +1059,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
                          : mailbox_holders_[texture_index];
  }
  
@@ -63,7 +63,7 @@
  const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
    DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
  
-@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1142,7 +1142,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
        storage_type_(storage_type),
        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
        natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index d37ffac67837..dc6f83903ec6 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig	2020-03-16 18:40:33 UTC
+--- media/base/video_frame.h.orig	2020-05-13 18:40:32 UTC
 +++ media/base/video_frame.h
 @@ -39,9 +39,9 @@
  #include "base/mac/scoped_cftyperef.h"
@@ -21,7 +21,7 @@
      // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
      // based on the idea of using this same enum value for both DMA
      // buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -244,7 +244,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
        ReleaseMailboxCB mailbox_holder_release_cb,
        base::TimeDelta timestamp);
  
@@ -30,7 +30,7 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -480,7 +480,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // mailbox, the caller must wait for the included sync point.
    const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
  
@@ -39,7 +39,7 @@
    // Returns a vector containing the backing DmaBufs for this frame. The number
    // of returned DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
-@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -654,7 +654,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
    std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
diff --git a/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc b/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc
new file mode 100644
index 000000000000..1dcee4bc61f2
--- /dev/null
+++ b/www/chromium/files/patch-media_blink_webmediaplayer__impl.cc
@@ -0,0 +1,15 @@
+--- media/blink/webmediaplayer_impl.cc.orig	2020-05-22 09:58:28 UTC
++++ media/blink/webmediaplayer_impl.cc
+@@ -280,7 +280,11 @@ void CreateAllocation(base::trace_event::ProcessMemory
+ 
+   auto* std_allocator = base::trace_event::MemoryDumpManager::GetInstance()
+                             ->system_allocator_pool_name();
+-  pmd->AddSuballocation(dump->guid(), std_allocator);
++  if (std_allocator == nullptr) {
++    pmd->AddSuballocation(dump->guid(), std::string());
++  } else {
++    pmd->AddSuballocation(dump->guid(), std_allocator);
++  }
+ }
+ 
+ }  // namespace
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
index 7dcb8b174ae1..f20fd7f94ed5 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_buffer_pool_impl.cc.orig	2019-12-16 21:50:49 UTC
+--- media/capture/video/video_capture_buffer_pool_impl.cc.orig	2020-05-13 18:39:45 UTC
 +++ media/capture/video/video_capture_buffer_pool_impl.cc
-@@ -59,7 +59,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
+@@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
      int buffer_id) {
  // This requires platforms where base::SharedMemoryHandle is backed by a
  // file descriptor.
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
index b36124fab651..d386237ba83c 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig	2019-12-16 21:50:49 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2020-05-13 18:39:45 UTC
 +++ media/capture/video/video_capture_device_client.cc
-@@ -297,7 +297,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -301,7 +301,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
  // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
  // Windows RGB24 defines blue at lowest byte,
  // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
index b208560a307d..76130e60b14a 100644
--- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
+++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
@@ -1,7 +1,7 @@
---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2020-03-16 18:40:33 UTC
+--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig	2020-05-13 18:39:45 UTC
 +++ media/mojo/clients/mojo_video_encode_accelerator.cc
 @@ -132,7 +132,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
-             frame->layout().num_planes());
+   DCHECK_EQ(num_planes, frame->layout().num_planes());
    DCHECK(vea_.is_bound());
  
 -#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
index 46396d067968..cdd5cc2b0933 100644
--- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
+++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
@@ -1,4 +1,4 @@
---- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2020-02-24 18:39:18 UTC
+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig	2020-05-13 18:40:32 UTC
 +++ media/mojo/mojom/video_frame_mojom_traits.cc
 @@ -20,9 +20,9 @@
  #include "ui/gfx/mojom/buffer_types_mojom_traits.h"
@@ -12,19 +12,19 @@
  
  namespace mojo {
  
-@@ -60,7 +60,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
-             mojo_frame->PlaneOffset(media::VideoFrame::kVPlane)));
+@@ -62,7 +62,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
+             std::move(offsets)));
    }
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
-     std::vector<mojo::ScopedHandle> dmabuf_fds;
+     std::vector<mojo::PlatformHandle> dmabuf_fds;
  
-@@ -161,7 +161,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
-         shared_buffer_data.u_offset(), shared_buffer_data.v_offset(),
-         shared_buffer_data.y_stride(), shared_buffer_data.u_stride(),
-         shared_buffer_data.v_stride(), timestamp);
+@@ -165,7 +165,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
+         shared_buffer_data.TakeFrameData(),
+         shared_buffer_data.frame_data_size(), std::move(offsets),
+         std::move(strides), timestamp);
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    } else if (data.is_dmabuf_data()) {
diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
index ea181aa1b1f3..dc7f9d176260 100644
--- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
+++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
@@ -1,6 +1,6 @@
---- media/mojo/services/gpu_mojo_media_client.cc.orig	2020-03-16 18:40:33 UTC
+--- media/mojo/services/gpu_mojo_media_client.cc.orig	2020-05-13 18:40:32 UTC
 +++ media/mojo/services/gpu_mojo_media_client.cc
-@@ -64,7 +64,7 @@ namespace media {
+@@ -62,7 +62,7 @@ namespace media {
  namespace {
  
  #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \
@@ -9,12 +9,12 @@
  gpu::CommandBufferStub* GetCommandBufferStub(
      scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
      base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
-@@ -263,7 +263,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+@@ -279,7 +279,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
                                  command_buffer_id->route_id));
        }
  
 -#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
 +#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-       video_decoder = VdaVideoDecoder::Create(
-           task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
-           gpu_preferences_, gpu_workarounds_,
+ #if defined(OS_WIN)
+       // Don't instantiate the DXVA decoder if it's not supported.
+       if (gpu_workarounds_.disable_dxva_video_decoder)
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 2696770beb1c..c5d655bc2cef 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2020-03-16 18:40:33 UTC
+--- net/BUILD.gn.orig	2020-05-13 18:40:32 UTC
 +++ net/BUILD.gn
 @@ -103,7 +103,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1247,6 +1247,16 @@ component("net") {
+@@ -1254,6 +1254,16 @@ component("net") {
        ]
      }
  
@@ -26,7 +26,7 @@
      if (is_mac) {
        sources += [
          "base/network_notification_thread_mac.cc",
-@@ -1373,7 +1383,7 @@ component("net") {
+@@ -1384,7 +1394,7 @@ component("net") {
        }
      }
  
@@ -35,7 +35,7 @@
        sources += [
          "base/network_change_notifier_posix.cc",
          "base/network_change_notifier_posix.h",
-@@ -1406,7 +1416,7 @@ component("net") {
+@@ -1417,7 +1427,7 @@ component("net") {
      }
  
      # Use getifaddrs() on POSIX platforms, except Linux and Android.
diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc
index 306de5e6d980..c3c6ce4fee5c 100644
--- a/www/chromium/files/patch-net_base_features.cc
+++ b/www/chromium/files/patch-net_base_features.cc
@@ -1,6 +1,6 @@
---- net/base/features.cc.orig	2020-03-17 10:02:15 UTC
+--- net/base/features.cc.orig	2020-05-13 18:40:32 UTC
 +++ net/base/features.cc
-@@ -88,7 +88,7 @@ const base::FeatureParam<int>
+@@ -92,7 +92,7 @@ const base::Feature kBlockExternalRequestsFromNonSecur
  #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
  const base::Feature kCertVerifierBuiltinFeature {
    "CertVerifierBuiltin",
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
index 21bd683f8187..d2dc0e74e27d 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig	2019-06-04 18:55:27 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2020-05-13 18:39:46 UTC
 +++ net/dns/dns_config_service_posix_unittest.cc
 @@ -2,8 +2,6 @@
  // Use of this source code is governed by a BSD-style license that can be
@@ -9,7 +9,7 @@
  #include <memory>
  
  #include "base/cancelable_callback.h"
-@@ -50,7 +48,7 @@ const char* const kNameserversIPv4[] = {
+@@ -51,7 +49,7 @@ const char* const kNameserversIPv4[] = {
      "1.0.0.1",
  };
  
@@ -18,7 +18,7 @@
  const char* const kNameserversIPv6[] = {
      NULL,
      "2001:DB8:0::42",
-@@ -86,7 +84,7 @@ void InitializeResState(res_state res) {
+@@ -87,7 +85,7 @@ void InitializeResState(res_state res) {
      ++res->nscount;
    }
  
@@ -27,7 +27,7 @@
    // Install IPv6 addresses, replacing the corresponding IPv4 addresses.
    unsigned nscount6 = 0;
    for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
-@@ -107,7 +105,7 @@ void InitializeResState(res_state res) {
+@@ -108,7 +106,7 @@ void InitializeResState(res_state res) {
  }
  
  void CloseResState(res_state res) {
@@ -36,7 +36,7 @@
    for (int i = 0; i < res->nscount; ++i) {
      if (res->_u._ext.nsaddrs[i] != NULL)
        free(res->_u._ext.nsaddrs[i]);
-@@ -132,7 +130,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
+@@ -133,7 +131,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
      config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
    }
  
diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc
index be75a59fbd52..cb4c2beba91c 100644
--- a/www/chromium/files/patch-net_dns_dns__util.cc
+++ b/www/chromium/files/patch-net_dns_dns__util.cc
@@ -1,6 +1,6 @@
---- net/dns/dns_util.cc.orig	2019-10-21 19:06:38 UTC
+--- net/dns/dns_util.cc.orig	2020-05-13 18:39:46 UTC
 +++ net/dns/dns_util.cc
-@@ -38,6 +38,8 @@ const uint16_t kFlagNamePointer = 0xc000;
+@@ -39,6 +39,8 @@ const uint16_t kFlagNamePointer = 0xc000;
  
  }  // namespace
  
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
index ef8a51424888..5babc0608b02 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
@@ -1,24 +1,24 @@
---- net/proxy_resolution/proxy_resolution_service.cc.orig	2020-02-03 21:52:49 UTC
-+++ net/proxy_resolution/proxy_resolution_service.cc
-@@ -49,7 +49,7 @@
+--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig	2020-05-15 15:16:32 UTC
++++ net/proxy_resolution/configured_proxy_resolution_service.cc
+@@ -47,7 +47,7 @@
  #elif defined(OS_MACOSX)
  #include "net/proxy_resolution/proxy_config_service_mac.h"
  #include "net/proxy_resolution/proxy_resolver_mac.h"
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  #include "net/proxy_resolution/proxy_config_service_linux.h"
  #elif defined(OS_ANDROID)
  #include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -63,7 +63,7 @@ namespace net {
+@@ -61,7 +61,7 @@ namespace net {
  namespace {
  
  #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+    ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
      net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
        semantics {
-@@ -1556,7 +1556,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
+@@ -1435,7 +1435,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
               << "profile_io_data.cc::CreateProxyConfigService and this should "
               << "be used only for examples.";
    return std::make_unique<UnsetProxyConfigService>();
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index cd644766442f..46b4163d20c8 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2020-03-16 18:40:33 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2020-05-13 18:39:46 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -6,7 +6,9 @@
  
@@ -18,7 +18,7 @@
  // This is the KDE version that reads kioslaverc and simulates gsettings.
  // Doing this allows the main Delegate code, as well as the unit tests
  // for it, to stay the same - and the settings map fairly well besides.
-@@ -1000,6 +1003,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1001,6 +1004,7 @@ class SettingGetterImplKDE : public ProxyConfigService
  
    DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
  };
@@ -26,7 +26,7 @@
  
  }  // namespace
  
-@@ -1214,8 +1218,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1215,8 +1219,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE3:
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index c0cfba258179..ab7b488ba777 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig	2019-09-09 21:55:22 UTC
+--- net/socket/udp_socket_posix.cc.orig	2020-05-13 18:39:46 UTC
 +++ net/socket/udp_socket_posix.cc
-@@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
+@@ -70,7 +70,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
  const base::TimeDelta kActivityMonitorMsThreshold =
      base::TimeDelta::FromMilliseconds(100);
  
@@ -9,7 +9,7 @@
  // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS
  // requires passing IPv4 address instead of interface index. This function
  // resolves IPv4 address by interface index. The |address| is returned in
-@@ -98,7 +98,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
+@@ -99,7 +99,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
    return OK;
  }
  
@@ -18,7 +18,7 @@
  
  #if defined(OS_MACOSX) && !defined(OS_IOS)
  
-@@ -644,13 +644,13 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -645,13 +645,13 @@ int UDPSocketPosix::SetDoNotFragment() {
  }
  
  void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -34,7 +34,7 @@
  }
  
  int UDPSocketPosix::AllowAddressReuse() {
-@@ -665,17 +665,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -666,17 +666,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
    int value = broadcast ? 1 : 0;
    int rv;
@@ -57,7 +57,7 @@
    rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));
  
    return rv == 0 ? OK : MapSystemError(errno);
-@@ -935,7 +938,7 @@ int UDPSocketPosix::SetMulticastOptions() {
+@@ -936,7 +939,7 @@ int UDPSocketPosix::SetMulticastOptions() {
    if (multicast_interface_ != 0) {
      switch (addr_family_) {
        case AF_INET: {
@@ -66,7 +66,7 @@
          ip_mreq mreq = {};
          int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
                                              &mreq.imr_interface.s_addr);
-@@ -947,7 +950,11 @@ int UDPSocketPosix::SetMulticastOptions() {
+@@ -948,7 +951,11 @@ int UDPSocketPosix::SetMulticastOptions() {
          mreq.imr_address.s_addr = htonl(INADDR_ANY);
  #endif  //  !defined(OS_MACOSX)
          int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
@@ -78,7 +78,7 @@
          if (rv)
            return MapSystemError(errno);
          break;
-@@ -1009,7 +1016,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
+@@ -1010,7 +1017,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
  
@@ -87,7 +87,7 @@
        ip_mreq mreq = {};
        int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
                                            &mreq.imr_interface.s_addr);
-@@ -1057,9 +1064,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
+@@ -1058,9 +1065,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
      case IPAddress::kIPv4AddressSize: {
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
index 65d641ec320d..0f6aa920f7ed 100644
--- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
+++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
@@ -1,6 +1,6 @@
---- net/tools/quic/quic_http_proxy_backend.cc.orig	2019-10-21 19:06:39 UTC
+--- net/tools/quic/quic_http_proxy_backend.cc.orig	2020-05-13 18:39:46 UTC
 +++ net/tools/quic/quic_http_proxy_backend.cc
-@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
+@@ -162,7 +162,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
    // Enable HTTP2, but disable QUIC on the backend
    context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */);
  
diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h
index bd4fbd669d4c..41aa176d8ffe 100644
--- a/www/chromium/files/patch-net_url__request_url__fetcher.h
+++ b/www/chromium/files/patch-net_url__request_url__fetcher.h
@@ -1,6 +1,6 @@
---- net/url_request/url_fetcher.h.orig	2019-10-30 16:19:33 UTC
+--- net/url_request/url_fetcher.h.orig	2020-05-13 18:40:33 UTC
 +++ net/url_request/url_fetcher.h
-@@ -113,7 +113,7 @@ class NET_EXPORT URLFetcher {
+@@ -114,7 +114,7 @@ class NET_EXPORT URLFetcher {
    // The unannotated Create() methods are not available on desktop Linux +
    // Windows. They are available on other platforms, since we only audit network
    // annotations on Linux & Windows.
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index 0144efb4a529..6d7cdded4fdf 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,16 +1,16 @@
---- net/url_request/url_request_context_builder.cc.orig	2020-03-16 18:40:33 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2020-05-13 18:40:33 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -507,7 +507,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
 -#if !defined(OS_LINUX) && !defined(OS_ANDROID)
 +#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
      // TODO(willchan): Switch to using this code when
-     // ProxyResolutionService::CreateSystemProxyConfigService()'s signature
-     // doesn't suck.
-@@ -516,7 +516,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
-           ProxyResolutionService::CreateSystemProxyConfigService(
+     // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s
+     // signature doesn't suck.
+@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+           ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
                base::ThreadTaskRunnerHandle::Get().get());
      }
 -#endif  // !defined(OS_LINUX) && !defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index c1b3c3d2c8a3..3cb711ca1ddb 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,4 +1,4 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2020-03-16 18:40:33 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2020-05-13 18:40:33 UTC
 +++ pdf/pdfium/pdfium_engine.cc
 @@ -52,7 +52,7 @@
  #include "ui/gfx/geometry/rect.h"
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -377,7 +377,7 @@ void InitializeSDK(bool enable_v8) {
+@@ -361,7 +361,7 @@ void InitializeSDK(bool enable_v8) {
    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
    FPDF_InitLibraryWithConfig(&config);
  
@@ -18,7 +18,7 @@
    InitializeLinuxFontMapper();
  #endif
  
-@@ -411,7 +411,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
+@@ -402,7 +402,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
    IFSDK_PAUSE::user = nullptr;
    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
  
@@ -27,7 +27,7 @@
    // PreviewModeClient does not know its pp::Instance.
    SetLastInstance(client_->GetPluginInstance());
  #endif
-@@ -878,7 +878,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
+@@ -864,7 +864,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
  
    KillFormFocus();
  
@@ -36,7 +36,7 @@
    SetLastInstance(client_->GetPluginInstance());
  #endif
  
-@@ -2861,7 +2861,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -2853,7 +2853,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
    DCHECK(image_data);
  
    last_progressive_start_time_ = base::Time::Now();
@@ -45,7 +45,7 @@
    SetLastInstance(client_->GetPluginInstance());
  #endif
  
-@@ -3357,7 +3357,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3349,7 +3349,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
      FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
    }
    most_visible_page_ = index;
diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc
index d2a35b8d8d01..d0d8bf080bb8 100644
--- a/www/chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,6 +1,6 @@
---- remoting/host/host_attributes.cc.orig	2019-09-09 21:55:22 UTC
+--- remoting/host/host_attributes.cc.orig	2020-05-13 18:40:33 UTC
 +++ remoting/host/host_attributes.cc
-@@ -124,7 +124,7 @@ std::string GetHostAttributes() {
+@@ -120,7 +120,7 @@ std::string GetHostAttributes() {
        media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
index 4773f4846b88..65db5a7293fb 100644
--- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,4 +1,4 @@
---- remoting/host/remoting_me2me_host.cc.orig	2020-03-16 18:40:33 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2020-05-13 18:40:33 UTC
 +++ remoting/host/remoting_me2me_host.cc
 @@ -118,13 +118,13 @@
  #include "remoting/host/mac/permission_utils.h"
@@ -39,7 +39,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif
-@@ -582,10 +582,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
+@@ -579,10 +579,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
    enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
    if (enable_window_capture_) {
  
@@ -52,7 +52,7 @@
  
      // uint32_t is large enough to hold window IDs on all platforms.
      uint32_t window_id;
-@@ -780,7 +780,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -777,7 +777,7 @@ void HostProcess::CreateAuthenticatorFactory() {
      DCHECK(third_party_auth_config_.token_url.is_valid());
      DCHECK(third_party_auth_config_.token_validation_url.is_valid());
  
@@ -61,7 +61,7 @@
      if (!cert_watcher_) {
        cert_watcher_.reset(new CertificateWatcher(
            base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode),
-@@ -866,7 +866,7 @@ void HostProcess::StartOnUiThread() {
+@@ -863,7 +863,7 @@ void HostProcess::StartOnUiThread() {
        base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
        base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));
  
@@ -70,7 +70,7 @@
    // If an audio pipe is specific on the command-line then initialize
    // AudioCapturerLinux to capture from it.
    base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
-@@ -875,7 +875,7 @@ void HostProcess::StartOnUiThread() {
+@@ -872,7 +872,7 @@ void HostProcess::StartOnUiThread() {
      remoting::AudioCapturerLinux::InitializePipeReader(
          context_->audio_task_runner(), audio_pipe_name);
    }
@@ -79,7 +79,7 @@
  
  #if defined(OS_POSIX)
    base::FilePath security_key_socket_name =
-@@ -930,7 +930,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -927,7 +927,7 @@ void HostProcess::ShutdownOnUiThread() {
    // It is now safe for the HostProcess to be deleted.
    self_ = nullptr;
  
@@ -88,7 +88,7 @@
    // Cause the global AudioPipeReader to be freed, otherwise the audio
    // thread will remain in-use and prevent the process from exiting.
    // TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1529,7 +1529,7 @@ void HostProcess::StartHost() {
+@@ -1526,7 +1526,7 @@ void HostProcess::StartHost() {
    host_->AddExtension(std::make_unique<TestEchoExtension>());
  
    // TODO(simonmorris): Get the maximum session duration from a policy.
@@ -97,7 +97,7 @@
    host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
  #endif
  
-@@ -1698,7 +1698,7 @@ void HostProcess::OnCrash(const std::string& function_
+@@ -1695,7 +1695,7 @@ void HostProcess::OnCrash(const std::string& function_
  int HostProcessMain() {
    HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
  
diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
index 34c07b2c400d..3336d67349a3 100644
--- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd
+++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd
@@ -1,6 +1,6 @@
---- remoting/resources/remoting_strings.grd.orig	2020-02-03 21:53:32 UTC
+--- remoting/resources/remoting_strings.grd.orig	2020-05-13 18:39:46 UTC
 +++ remoting/resources/remoting_strings.grd
-@@ -1393,7 +1393,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -880,7 +880,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
            Open Screen Recording Preferences
          </message>
        </if>
@@ -9,7 +9,7 @@
          <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
            Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
          </message>
-@@ -1409,7 +1409,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
+@@ -896,7 +896,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
          <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
            Launch the default XSession
          </message>
diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
new file mode 100644
index 000000000000..677f72959ac8
--- /dev/null
+++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc
@@ -0,0 +1,20 @@
+--- services/device/serial/serial_device_enumerator.cc.orig	2020-05-15 15:19:57 UTC
++++ services/device/serial/serial_device_enumerator.cc
+@@ -9,7 +9,7 @@
+ #include "base/unguessable_token.h"
+ #include "build/build_config.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "services/device/serial/serial_device_enumerator_linux.h"
+ #elif defined(OS_MACOSX)
+ #include "services/device/serial/serial_device_enumerator_mac.h"
+@@ -22,7 +22,7 @@ namespace device {
+ // static
+ std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
+     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   return std::make_unique<SerialDeviceEnumeratorLinux>();
+ #elif defined(OS_MACOSX)
+   return std::make_unique<SerialDeviceEnumeratorMac>();
diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
index e05dd930bc94..0e541369c70d 100644
--- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
+++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
@@ -1,6 +1,17 @@
---- services/device/serial/serial_io_handler_posix.cc.orig	2019-04-30 22:22:56 UTC
+--- services/device/serial/serial_io_handler_posix.cc.orig	2020-05-13 18:39:47 UTC
 +++ services/device/serial/serial_io_handler_posix.cc
-@@ -66,7 +66,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
+@@ -36,6 +36,10 @@ struct termios2 {
+ 
+ #endif  // defined(OS_LINUX)
+ 
++#if defined(OS_BSD)
++#include <sys/serial.h>
++#endif
++
+ #if defined(OS_MACOSX)
+ #include <IOKit/serial/ioss.h>
+ #endif
+@@ -66,7 +70,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)
      BITRATE_TO_SPEED_CASE(38400)
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index be4d33bb2644..e7682ef424cc 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig	2020-03-16 18:40:34 UTC
+--- services/network/BUILD.gn.orig	2020-05-13 18:40:33 UTC
 +++ services/network/BUILD.gn
-@@ -260,7 +260,6 @@ jumbo_component("network_service") {
+@@ -264,7 +264,6 @@ jumbo_component("network_service") {
  
    if (is_linux) {
      deps += [
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
index 888674c04595..a7929f91058c 100644
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ b/www/chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig	2020-03-16 18:40:34 UTC
+--- services/network/network_context.cc.orig	2020-05-13 18:40:33 UTC
 +++ services/network/network_context.cc
-@@ -1758,7 +1758,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC
+@@ -1805,7 +1805,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC
  
      net::CookieCryptoDelegate* crypto_delegate = nullptr;
      if (params_->enable_encrypted_cookies) {
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 1e69f01166a8..8ed8a125c504 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig	2020-03-16 18:40:34 UTC
+--- services/network/network_service.cc.orig	2020-05-13 18:40:33 UTC
 +++ services/network/network_service.cc
-@@ -63,7 +63,7 @@
+@@ -67,7 +67,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/os_crypt/key_storage_config_linux.h"
  #endif
  
-@@ -627,7 +627,7 @@ void NetworkService::OnCertDBChanged() {
+@@ -630,7 +630,7 @@ void NetworkService::OnCertDBChanged() {
    net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
  }
  
diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h
index 5f21c0217c3a..4645795c9a67 100644
--- a/www/chromium/files/patch-services_network_network__service.h
+++ b/www/chromium/files/patch-services_network_network__service.h
@@ -1,6 +1,6 @@
---- services/network/network_service.h.orig	2020-03-16 18:40:34 UTC
+--- services/network/network_service.h.orig	2020-05-13 18:40:33 UTC
 +++ services/network/network_service.h
-@@ -150,7 +150,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -156,7 +156,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
        base::span<const uint8_t> config,
        mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override;
    void OnCertDBChanged() override;
diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-services_service__manager_embedder_main.cc
index 9c935b9f16e1..c57bcf0c5be2 100644
--- a/www/chromium/files/patch-services_service__manager_embedder_main.cc
+++ b/www/chromium/files/patch-services_service__manager_embedder_main.cc
@@ -1,6 +1,6 @@
---- services/service_manager/embedder/main.cc.orig	2019-10-21 19:06:40 UTC
+--- services/service_manager/embedder/main.cc.orig	2020-05-13 18:39:47 UTC
 +++ services/service_manager/embedder/main.cc
-@@ -272,7 +272,7 @@ int Main(const MainParams& params) {
+@@ -275,7 +275,7 @@ int Main(const MainParams& params) {
  #endif
      base::EnableTerminationOnOutOfMemory();
  
diff --git a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
deleted file mode 100644
index 56f27b3a6704..000000000000
--- a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- services/service_manager/embedder/set_process_title_linux.cc.orig	2019-03-11 22:01:02 UTC
-+++ services/service_manager/embedder/set_process_title_linux.cc
-@@ -49,6 +49,8 @@
- extern char** environ;
- 
- static char** g_main_argv = NULL;
-+
-+#if !defined(OS_FREEBSD)
- static char* g_orig_argv0 = NULL;
- 
- void setproctitle(const char* fmt, ...) {
-@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) {
-   va_end(ap);
-   g_main_argv[1] = NULL;
- }
-+#endif
- 
- // A version of this built into glibc would not need this function, since
- // it could stash the argv pointer in __libc_start_main(). But we need it.
diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc
index 95e322cffb48..84d77a3074f4 100644
--- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc
+++ b/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc
@@ -1,4 +1,4 @@
---- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig	2019-03-11 22:01:02 UTC
+--- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig	2020-05-13 18:39:47 UTC
 +++ services/service_manager/zygote/host/zygote_host_impl_linux.cc
 @@ -72,6 +72,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
  }
@@ -24,7 +24,7 @@
    int fds[2];
    CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
    CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
-@@ -210,9 +213,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -213,9 +216,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
  
    AddZygotePid(pid);
    return pid;
diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
index c1871f137977..d643ceecc85f 100644
--- a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
+++ b/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
@@ -1,4 +1,4 @@
---- services/service_manager/zygote/zygote_main_linux.cc.orig	2020-02-03 21:53:32 UTC
+--- services/service_manager/zygote/zygote_main_linux.cc.orig	2020-05-13 18:39:47 UTC
 +++ services/service_manager/zygote/zygote_main_linux.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
@@ -36,7 +36,7 @@
    sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
  
    auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
-@@ -238,6 +245,9 @@ bool ZygoteMain(
+@@ -240,6 +247,9 @@ bool ZygoteMain(
  
    // This function call can return multiple times, once per fork().
    return zygote.ProcessRequests();
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
index 06d34c96b6cd..eba213a1112c 100644
--- a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
@@ -1,11 +1,11 @@
---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2020-03-17 10:16:22 UTC
+--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2020-05-13 18:40:33 UTC
 +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
-@@ -362,7 +362,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall
-     }
- #endif
+@@ -476,7 +476,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall
  
+ // static
+ void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) {
 -#if defined(OS_ANDROID) || defined(OS_LINUX)
 +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     // Linux ELF module IDs are 160bit integers, which we need to mangle
-     // down to 128bit integers to match the id that Breakpad outputs.
-     // Example on version '66.0.3359.170' x64:
+   // Linux ELF module IDs are 160bit integers, which we need to mangle
+   // down to 128bit integers to match the id that Breakpad outputs.
+   // Example on version '66.0.3359.170' x64:
diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
index 31c7ab5e263a..53310cf132a5 100644
--- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
+++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
@@ -1,6 +1,6 @@
---- services/video_capture/broadcasting_receiver.cc.orig	2019-12-16 21:51:28 UTC
+--- services/video_capture/broadcasting_receiver.cc.orig	2020-05-13 18:39:47 UTC
 +++ services/video_capture/broadcasting_receiver.cc
-@@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
+@@ -39,7 +39,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
  void CloneSharedBufferToRawFileDescriptorHandle(
      const mojo::ScopedSharedBufferHandle& source,
      media::mojom::VideoBufferHandlePtr* target) {
@@ -9,7 +9,7 @@
    // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file
    // descriptor can be extracted which is then mojo-wrapped.
    base::subtle::PlatformSharedMemoryRegion platform_region =
-@@ -183,7 +183,7 @@ void BroadcastingReceiver::BufferContext::
+@@ -182,7 +182,7 @@ void BroadcastingReceiver::BufferContext::
      ConvertRawFileDescriptorToSharedBuffer() {
    DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
  
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 330949cb3773..c181f9dab7c6 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig	2020-03-16 18:42:05 UTC
+--- third_party/angle/BUILD.gn.orig	2020-05-13 18:41:47 UTC
 +++ third_party/angle/BUILD.gn
-@@ -384,6 +384,7 @@ angle_static_library("angle_gpu_info_util") {
+@@ -362,6 +362,7 @@ angle_static_library("angle_gpu_info_util") {
          "X11",
          "Xi",
          "Xext",
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index 48998ce95915..c2ec46d08158 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,6 +1,33 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2020-03-16 18:42:05 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2020-05-13 18:41:47 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
-@@ -286,7 +286,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -54,7 +54,7 @@
+ #        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
+ #    elif defined(ANGLE_PLATFORM_IOS)
+ #        include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
+-#    elif defined(ANGLE_PLATFORM_LINUX)
++#    elif defined(ANGLE_PLATFORM_POSIX)
+ #        if defined(ANGLE_USE_OZONE)
+ #            include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
+ #        else
+@@ -252,7 +252,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+             impl = new rx::DisplayCGL(state);
+ #    elif defined(ANGLE_PLATFORM_IOS)
+             impl = new rx::DisplayEAGL(state);
+-#    elif defined(ANGLE_PLATFORM_LINUX)
++#    elif defined(ANGLE_PLATFORM_POSIX)
+ #        if defined(ANGLE_USE_OZONE)
+             // This might work but has never been tried, so disallow for now.
+             impl = nullptr;
+@@ -284,7 +284,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+ #if defined(ANGLE_ENABLE_OPENGL)
+ #    if defined(ANGLE_PLATFORM_WINDOWS)
+             impl = new rx::DisplayWGL(state);
+-#    elif defined(ANGLE_PLATFORM_LINUX)
++#    elif defined(ANGLE_PLATFORM_POSIX)
+ #        if defined(ANGLE_USE_OZONE)
+             impl = new rx::DisplayOzone(state);
+ #        else
+@@ -315,7 +315,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
              {
                  impl = rx::CreateVulkanWin32Display(state);
              }
@@ -9,3 +36,12 @@
              if (rx::IsVulkanXcbDisplayAvailable())
              {
                  impl = rx::CreateVulkanXcbDisplay(state);
+@@ -1387,7 +1387,7 @@ static ClientExtensions GenerateClientExtensions()
+     extensions.x11Visual = true;
+ #endif
+ 
+-#if defined(ANGLE_PLATFORM_LINUX) && !defined(ANGLE_USE_OZONE)
++#if defined(ANGLE_PLATFORM_POSIX) && !defined(ANGLE_USE_OZONE)
+     extensions.platformANGLEDeviceTypeEGLANGLE = true;
+ #endif
+ 
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
new file mode 100644
index 000000000000..588d82ab099e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp
@@ -0,0 +1,52 @@
+--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig	2020-05-18 12:56:36 UTC
++++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp
+@@ -16,7 +16,7 @@
+ #    include <sys/system_properties.h>
+ #endif
+ 
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+ #    include <sys/utsname.h>
+ #endif
+ 
+@@ -206,7 +206,7 @@ OSVersion GetMacOSVersion()
+ }
+ #endif
+ 
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+ bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch)
+ {
+     errno = 0;  // reset global error flag.
+@@ -218,6 +218,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj
+     }
+ 
+     *minor = static_cast<int>(strtol(next + 1, &next, 10));
++#if defined(__FreeBSD__)
++    if (next == nullptr || *next != '-' || errno != 0)
++    {
++        return false;
++    }
++
++    *patch = 0;
++#else
+     if (next == nullptr || *next != '.' || errno != 0)
+     {
+         return false;
+@@ -228,6 +236,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj
+     {
+         return false;
+     }
++#endif
+ 
+     return true;
+ }
+@@ -235,7 +244,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj
+ 
+ OSVersion GetLinuxOSVersion()
+ {
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+     struct utsname uname_info;
+     if (uname(&uname_info) != 0)
+     {
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
index 380c2f0a1a4f..1b7b10632f71 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig	2020-03-16 18:42:06 UTC
+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig	2020-05-13 18:41:47 UTC
 +++ third_party/angle/src/libANGLE/renderer/driver_utils.h
-@@ -122,7 +122,7 @@ inline bool IsWindows()
+@@ -133,7 +133,7 @@ inline bool IsWindows()
  
  inline bool IsLinux()
  {
diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
index c03540dc02ea..47db5b5fd088 100644
--- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
+++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
@@ -1,6 +1,6 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig	2020-02-03 21:54:58 UTC
+--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig	2020-05-13 18:41:57 UTC
 +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
-@@ -238,7 +238,7 @@ void *loader_device_heap_realloc(const struct loader_d
+@@ -234,7 +234,7 @@ void *loader_device_heap_realloc(const struct loader_d
  }
  
  // Environment variables
diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
index 824788f6aa33..ae25143a7898 100644
--- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
+++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
@@ -1,7 +1,7 @@
---- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig	2019-03-11 22:08:06 UTC
+--- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig	2020-05-13 18:41:57 UTC
 +++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h
-@@ -31,7 +31,7 @@
- #include "vulkan/vk_platform.h"
+@@ -33,7 +33,7 @@
+ #undef NOMINMAX
  #include "vulkan/vk_sdk_platform.h"
  
 -#if defined(__linux__) || defined(__APPLE__)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
new file mode 100644
index 000000000000..697429afdc26
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
@@ -0,0 +1,12 @@
+--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2020-05-18 13:31:13 UTC
++++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
+@@ -29,6 +29,9 @@ def init(root_src_dir):
+     elif sys.platform.startswith(("cygwin", "win")):
+         platform = "win"
+         exe_suffix = ".exe"
++    elif sys.platform.startswith("freebsd"):
++        platform = "freebsd"
++        exe_suffix = ""
+     else:
+         assert False, "Unknown platform: {}".format(sys.platform)
+     buildtools_platform_dir = os.path.join(root_src_dir, "buildtools",
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index f2b1624738c8..a876cc8f94ef 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,11 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2020-03-17 10:17:22 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2020-05-13 18:40:34 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -69,7 +69,7 @@
+@@ -65,11 +65,11 @@
+ #include "third_party/blink/renderer/controller/oom_intervention_impl.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
  #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h"
  #endif
  
@@ -18,3 +23,12 @@
      defined(OS_WIN)
    // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
    if (UserLevelMemoryPressureSignalGenerator::Enabled())
+@@ -192,7 +192,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+                   &CrashMemoryMetricsReporterImpl::Bind)),
+               main_thread->GetTaskRunner());
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   binders.Add(ConvertToBaseRepeatingCallback(
+                   CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
+               main_thread->GetTaskRunner());
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
new file mode 100644
index 000000000000..0206165988cf
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2020-05-15 15:24:43 UTC
++++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
+@@ -134,7 +134,7 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File 
+   status_fd_.reset(status_file.TakePlatformFile());
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // static
+ void MemoryUsageMonitorPosix::Bind(
+     mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index af22ef50a74c..a42d176dc91e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2020-02-03 21:52:51 UTC
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2020-05-13 18:40:34 UTC
 +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -41,7 +41,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
      base::TimeDelta::FromMicroseconds(100);
  
  /* The value is based on user statistics on Nov 2017. */
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index 5f3d6ec67939..c453dedf861f 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2019-09-09 21:55:24 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2020-05-13 18:39:48 UTC
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -184,7 +184,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
+@@ -185,7 +185,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
  Vector<String> InspectorMemoryAgent::Symbolize(
      const WebVector<void*>& addresses) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index eb2c92cf0610..d6fcee071c37 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2020-03-16 18:40:35 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2020-05-13 18:40:34 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -59,7 +59,7 @@
+@@ -60,7 +60,7 @@
  #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
  #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -326,7 +326,7 @@ void LayoutView::UpdateLayout() {
+@@ -324,7 +324,7 @@ void LayoutView::UpdateLayout() {
    DCHECK(!layout_state_);
    LayoutState root_layout_state(*this);
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
index 8414327a53f4..b02ea6eab805 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2020-03-16 18:40:35 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2020-05-13 18:40:34 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -106,7 +106,7 @@ namespace {
+@@ -107,7 +107,7 @@ namespace {
  static CompositingQueryMode g_compositing_query_mode =
      kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 2d02c5dfa4c2..d9d385128571 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2020-03-16 18:39:56 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2020-05-13 18:39:48 UTC
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 @@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // Disable snapback on desktop Linux to better integrate with the desktop
@@ -7,8 +7,8 @@
 -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    return false;
- #endif
- 
+ #else
+   return true;
 @@ -301,7 +301,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT
  
  bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 6c239154d0c0..9f8310ddf65a 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2020-03-16 18:40:35 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2020-05-13 18:40:34 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -100,6 +100,7 @@ executable("character_data_generator") {
+@@ -101,6 +101,7 @@ executable("character_data_generator") {
      "//build/win:default_exe_manifest",
      "//third_party/icu",
    ]
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index ea74c8b323ef..1e3ddbf169fd 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2020-02-03 21:52:52 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2020-05-13 18:40:35 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
 @@ -58,7 +58,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
@@ -9,7 +9,7 @@
  #include "ui/gfx/font_fallback_linux.h"
  #endif
  
-@@ -166,7 +166,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -169,7 +169,7 @@ class PLATFORM_EXPORT FontCache {
    sk_sp<SkFontMgr> FontManager() { return font_manager_; }
    static void SetFontManager(sk_sp<SkFontMgr>);
  
@@ -18,7 +18,7 @@
    // These are needed for calling QueryRenderStyleForStrike, since
    // gfx::GetFontRenderParams makes distinctions based on DSF.
    static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -241,11 +241,11 @@ class PLATFORM_EXPORT FontCache {
+@@ -244,11 +244,11 @@ class PLATFORM_EXPORT FontCache {
        const FontDescription&);
  #endif  // defined(OS_ANDROID)
  
@@ -32,7 +32,7 @@
  
    scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
        const FontPlatformData*,
-@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
+@@ -327,12 +327,12 @@ class PLATFORM_EXPORT FontCache {
                                     const FontFaceCreationParams&,
                                     std::string& name);
  
@@ -47,7 +47,7 @@
  
    scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
        const FontDescription&,
-@@ -356,7 +356,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -366,7 +366,7 @@ class PLATFORM_EXPORT FontCache {
    std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
  #endif  // defined(OS_WIN)
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index 01d7699e4ddb..e1c2576cebf6 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2019-09-09 21:55:26 UTC
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2020-05-13 18:40:35 UTC
 +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
-@@ -59,7 +59,7 @@ AtomicString ToAtomicString(const SkString& str) {
+@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) {
    return AtomicString::FromUTF8(str.c_str(), str.size());
  }
  
@@ -9,7 +9,7 @@
  // This function is called on android or when we are emulating android fonts on
  // linux and the embedder has overriden the default fontManager with
  // WebFontRendering::setSkiaFontMgr.
-@@ -82,7 +82,7 @@ AtomicString FontCache::GetFamilyNameForCharacter(
+@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter(
    typeface->getFamilyName(&skia_family_name);
    return ToAtomicString(skia_family_name);
  }
@@ -18,7 +18,7 @@
  
  void FontCache::PlatformInit() {}
  
-@@ -227,7 +227,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
+@@ -228,7 +228,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
    }
  #endif
  
@@ -27,7 +27,7 @@
    // On linux if the fontManager has been overridden then we should be calling
    // the embedder provided font Manager rather than calling
    // SkTypeface::CreateFromName which may redirect the call to the default font
-@@ -254,7 +254,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
+@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
    std::string name;
  
    sk_sp<SkTypeface> typeface;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
new file mode 100644
index 000000000000..6c21812b5fa9
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2020-05-15 15:25:13 UTC
++++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
+@@ -187,7 +187,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+     if (viz::FrameTokenGT(pair.key, *next_frame_token_))
+       continue;
+ 
+-#ifdef OS_LINUX
++#if defined(OS_LINUX) || defined(OS_BSD)
+     // TODO: On Linux failure flag is unreliable, and perfectly rendered frames
+     // are reported as failures all the time.
+     bool presentation_failure = false;
diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn
index 8a3c15eac37d..5fe68da0ea25 100644
--- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn
+++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.gn.orig	2019-12-16 21:51:04 UTC
+--- third_party/boringssl/BUILD.gn.orig	2020-05-13 18:40:00 UTC
 +++ third_party/boringssl/BUILD.gn
-@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -72,7 +72,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
      } else if (current_cpu == "x64") {
        if (is_mac) {
          sources += crypto_sources_mac_x86_64
@@ -9,7 +9,7 @@
          sources += crypto_sources_linux_x86_64
        } else {
          public_configs = [ ":no_asm_config" ]
-@@ -79,13 +79,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -80,13 +80,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
      } else if (current_cpu == "x86") {
        if (is_mac) {
          sources += crypto_sources_mac_x86
@@ -25,7 +25,7 @@
          sources += crypto_sources_linux_arm
        } else if (is_ios) {
          sources += crypto_sources_ios_arm
-@@ -93,7 +93,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -94,7 +94,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
          public_configs = [ ":no_asm_config" ]
        }
      } else if (current_cpu == "arm64") {
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
index acb48dc27344..f98caf16c2f7 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/crashpad/crashpad/client/BUILD.gn.orig	2019-03-11 22:01:15 UTC
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig	2020-05-13 18:40:36 UTC
 +++ third_party/crashpad/crashpad/client/BUILD.gn
-@@ -71,6 +71,12 @@ static_library("client") {
+@@ -75,6 +75,12 @@ static_library("client") {
      sources += [ "crashpad_client_fuchsia.cc" ]
    }
  
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
index be1a55b8d574..55a2785a0709 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
@@ -1,6 +1,6 @@
---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2019-03-11 22:01:15 UTC
+--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2020-05-13 18:40:36 UTC
 +++ third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
  #include <mach/mach.h>
  #elif defined(OS_WIN)
  #include <windows.h>
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #elif defined(OS_FUCHSIA)
  #include <signal.h>
-@@ -35,7 +35,7 @@ using NativeCPUContext = x86_thread_state;
+@@ -39,7 +39,7 @@ using NativeCPUContext = x86_thread_state;
  #endif
  #elif defined(OS_WIN)
  using NativeCPUContext = CONTEXT;
diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
index 74a2d6efc9a1..de8859859bed 100644
--- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
+++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -1,6 +1,6 @@
---- third_party/leveldatabase/env_chromium.cc.orig	2020-03-16 18:40:42 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig	2020-05-13 18:40:36 UTC
 +++ third_party/leveldatabase/env_chromium.cc
-@@ -40,7 +40,11 @@
+@@ -37,7 +37,11 @@
  #include "third_party/leveldatabase/leveldb_chrome.h"
  #include "third_party/leveldatabase/leveldb_features.h"
  #include "third_party/leveldatabase/src/include/leveldb/options.h"
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
new file mode 100644
index 000000000000..33d2e4409c7a
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc
@@ -0,0 +1,24 @@
+--- third_party/perfetto/src/base/subprocess.cc.orig	2020-05-18 14:55:51 UTC
++++ third_party/perfetto/src/base/subprocess.cc
+@@ -31,8 +31,8 @@
+ #include "perfetto/base/time.h"
+ #include "perfetto/ext/base/utils.h"
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
+ #include <sys/prctl.h>
+ #endif
+ 
+@@ -56,8 +56,8 @@ struct ChildProcessArgs {
+ // Don't add any dynamic allocation in this function. This will be invoked
+ // under a fork(), potentially in a state where the allocator lock is held.
+ void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) {
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+-    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
++    PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
+   // In no case we want a child process to outlive its parent process. This is
+   // relevant for tests, so that a test failure/crash doesn't leave child
+   // processes around that get reparented to init.
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
index f778d36188f5..d8f528b3f21a 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,6 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2020-03-16 18:42:12 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2020-05-13 18:41:54 UTC
 +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -2306,6 +2306,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
+@@ -2326,6 +2326,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
  
  #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
      !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&    \
diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
index 9bc2ed01d5e2..da1e5a9023fe 100644
--- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn
+++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/sqlite/BUILD.gn.orig	2019-09-09 21:55:43 UTC
+--- third_party/sqlite/BUILD.gn.orig	2020-05-13 18:40:36 UTC
 +++ third_party/sqlite/BUILD.gn
-@@ -262,7 +262,7 @@ config("sqlite_warnings") {
+@@ -138,7 +138,7 @@ config("sqlite_warnings") {
        ]
      }
    }
diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
index 7869c319cc9c..4a8076d6686f 100644
--- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
+++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
@@ -1,18 +1,23 @@
---- third_party/swiftshader/BUILD.gn.orig	2020-03-16 18:42:12 UTC
+--- third_party/swiftshader/BUILD.gn.orig	2020-05-13 18:41:54 UTC
 +++ third_party/swiftshader/BUILD.gn
-@@ -136,9 +136,6 @@ config("swiftshader_config") {
+@@ -138,9 +138,11 @@ config("swiftshader_config") {
        ldflags = [ "-Wl,--gc-sections" ]
  
-       if (target_cpu == "mipsel") {
+       if (current_cpu == "mipsel") {
 -        ldflags += [
 -          "-Wl,--hash-style=sysv",
 -        ]
++        if (!is_bsd) {
++          ldflags += [
++            "-Wl,--hash-style=sysv",
++          ]
++        }
          if (mips_arch_variant == "r1") {
            ldflags += [
              "-mips32",
-@@ -150,11 +147,8 @@ config("swiftshader_config") {
+@@ -152,11 +154,8 @@ config("swiftshader_config") {
          }
-       } else if (target_cpu == "mips64el") {
+       } else if (current_cpu == "mips64el") {
          ldflags += [
 -          "-Wl,--hash-style=sysv",
            "-mips64r2",
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
index 7577231bc5a8..50033014a7d5 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
@@ -1,6 +1,6 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig	2019-10-21 19:09:15 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig	2020-05-13 18:41:54 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp
-@@ -690,7 +690,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
+@@ -691,7 +691,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
  			return status != 0;
  		}
  		return false;
@@ -9,7 +9,7 @@
  		return false;  // Non X11 linux is headless only
  	#elif defined(__APPLE__)
  		return sw::OSX::IsValidWindow(window);
-@@ -868,7 +868,7 @@ sw::Format Display::getDisplayFormat() const
+@@ -869,7 +869,7 @@ sw::Format Display::getDisplayFormat() const
  		{
  			return sw::FORMAT_X8R8G8B8;
  		}
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
new file mode 100644
index 000000000000..ef0f135c386b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp
@@ -0,0 +1,75 @@
+--- third_party/swiftshader/src/Reactor/Debug.cpp.orig	2020-05-18 15:27:49 UTC
++++ third_party/swiftshader/src/Reactor/Debug.cpp
+@@ -23,16 +23,20 @@
+ #	include <android/log.h>
+ #endif
+ 
+-#if defined(__unix__)
++#if defined(__unix__) && !defined(__FreeBSD__)
+ #	define PTRACE
+ #	include <sys/ptrace.h>
+ #	include <sys/types.h>
+ #elif defined(_WIN32) || defined(_WIN64)
+ #	include <windows.h>
+-#elif defined(__APPLE__) || defined(__MACH__)
++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
++#	include <sys/types.h>
+ #	include <sys/sysctl.h>
+ #	include <unistd.h>
+ #endif
++#if defined(__FreeBSD__)
++#	include <sys/user.h>
++#endif
+ 
+ #ifdef ERROR
+ #	undef ERROR  // b/127920555
+@@ -68,29 +72,48 @@ bool IsUnderDebugger()
+ 	return res;
+ #elif defined(_WIN32) || defined(_WIN64)
+ 	return IsDebuggerPresent() != 0;
+-#elif defined(__APPLE__) || defined(__MACH__)
++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
+ 	// Code comes from the Apple Technical Q&A QA1361
+ 
+ 	// Tell sysctl what info we're requestion. Specifically we're asking for
+ 	// info about this our PID.
+ 	int res = 0;
++#if defined(__FreeBSD__)
++	int request[6] = {
++		CTL_KERN,
++		KERN_PROC,
++		KERN_PROC_PID,
++		getpid(),
++		sizeof(struct kinfo_proc),
++		0
++	};
++#else
+ 	int request[4] = {
+ 		CTL_KERN,
+ 		KERN_PROC,
+ 		KERN_PROC_PID,
+ 		getpid()
+ 	};
++#endif
+ 	struct kinfo_proc info;
+ 	size_t size = sizeof(info);
+ 
++#if defined(__FreeBSD__)
++	info.ki_flag = 0;
++#else
+ 	info.kp_proc.p_flag = 0;
++#endif
+ 
+ 	// Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0.
+ 	res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0);
+ 	ASSERT_MSG(res == 0, "syscl returned %d", res);
+ 
+ 	// We're being debugged if the P_TRACED flag is set
++#if defined(__FreeBSD__)
++	return ((info.ki_flag & P_TRACED) != 0);
++#else
+ 	return ((info.kp_proc.p_flag & P_TRACED) != 0);
++#endif
+ #else
+ 	return false;
+ #endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
new file mode 100644
index 000000000000..3695c45241bd
--- /dev/null
+++ b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp
@@ -0,0 +1,75 @@
+--- third_party/swiftshader/src/System/Debug.cpp.orig	2020-05-18 15:37:03 UTC
++++ third_party/swiftshader/src/System/Debug.cpp
+@@ -18,16 +18,20 @@
+ #	include <android/log.h>
+ #endif
+ 
+-#if defined(__unix__)
++#if defined(__unix__) && !defined(__FreeBSD__)
+ #	define PTRACE
+ #	include <sys/ptrace.h>
+ #	include <sys/types.h>
+ #elif defined(_WIN32) || defined(_WIN64)
+ #	include <windows.h>
+-#elif defined(__APPLE__) || defined(__MACH__)
++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
++#	include <sys/types.h>
+ #	include <sys/sysctl.h>
+ #	include <unistd.h>
+ #endif
++#if defined(__FreeBSD__)
++#	include <sys/user.h>
++#endif
+ 
+ #include <atomic>
+ #include <cstdarg>
+@@ -68,29 +72,48 @@ bool IsUnderDebugger()
+ 	return res;
+ #elif defined(_WIN32) || defined(_WIN64)
+ 	return IsDebuggerPresent() != 0;
+-#elif defined(__APPLE__) || defined(__MACH__)
++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
+ 	// Code comes from the Apple Technical Q&A QA1361
+ 
+ 	// Tell sysctl what info we're requestion. Specifically we're asking for
+ 	// info about this our PID.
+ 	int res = 0;
++#if defined(__FreeBSD__)
++	int request[6] = {
++		CTL_KERN,
++		KERN_PROC,
++		KERN_PROC_PID,
++		getpid(),
++		sizeof(struct kinfo_proc),
++		0
++	};
++#else
+ 	int request[4] = {
+ 		CTL_KERN,
+ 		KERN_PROC,
+ 		KERN_PROC_PID,
+ 		getpid()
+ 	};
++#endif
+ 	struct kinfo_proc info;
+ 	size_t size = sizeof(info);
+ 
++#if defined(__FreeBSD__)
++	info.ki_flag = 0;
++#else
+ 	info.kp_proc.p_flag = 0;
++#endif
+ 
+ 	// Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0.
+ 	res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0);
+ 	ASSERT_MSG(res == 0, "syscl returned %d", res);
+ 
+ 	// We're being debugged if the P_TRACED flag is set
++#if defined(__FreeBSD__)
++	return ((info.ki_flag & P_TRACED) != 0);
++#else
+ 	return ((info.kp_proc.p_flag & P_TRACED) != 0);
++#endif
+ #else
+ 	return false;
+ #endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
deleted file mode 100644
index c4eeb77baf0d..000000000000
--- a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
---- third_party/swiftshader/src/Vulkan/VkDebug.cpp.orig	2020-04-03 04:13:08 UTC
-+++ third_party/swiftshader/src/Vulkan/VkDebug.cpp
-@@ -29,12 +29,17 @@
- #	include <sys/sysctl.h>
- #	include <unistd.h>
- #endif
-+#if defined(__FreeBSD__)
-+#	include <sys/sysctl.h>
-+#	include <sys/user.h>
-+#	include <unistd.h>
-+#endif
- 
- namespace {
- 
- bool IsUnderDebugger()
- {
--#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__)
-+#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) && !defined(__FreeBSD__)
- 	static bool checked = false;
- 	static bool res = false;
- 
-@@ -56,7 +61,7 @@ bool IsUnderDebugger()
- 	return res;
- #elif defined(_WIN32) || defined(_WIN64)
- 	return IsDebuggerPresent() != 0;
--#elif defined(__APPLE__) || defined(__MACH__)
-+#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__)
- 	// Code comes from the Apple Technical Q&A QA1361
- 
- 	// Tell sysctl what info we're requestion. Specifically we're asking for
-@@ -71,14 +76,22 @@ bool IsUnderDebugger()
- 	struct kinfo_proc info;
- 	size_t size = sizeof(info);
- 
-+#	if defined(__FreeBSD__)
-+	info.ki_flag = 0;
-+#	else
- 	info.kp_proc.p_flag = 0;
-+#	endif
- 
- 	// Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0.
- 	res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0);
- 	ASSERT_MSG(res == 0, "syscl returned %d", res);
- 
- 	// We're being debugged if the P_TRACED flag is set
-+#	if defined(__FreeBSD__)
-+	return ((info.ki_flag & P_TRACED) != 0);
-+#	else
- 	return ((info.kp_proc.p_flag & P_TRACED) != 0);
-+#	endif
- #else
- 	return false;
- #endif
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
index 927560e4f971..c96cd6ee9a82 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp
@@ -1,17 +1,18 @@
---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2019-12-22 15:09:09 UTC
+--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig	2020-05-13 18:42:01 UTC
 +++ third_party/swiftshader/third_party/marl/src/thread.cpp
-@@ -27,6 +27,10 @@
- #include <mach/thread_act.h>
+@@ -31,6 +31,11 @@
  #include <pthread.h>
  #include <unistd.h>
+ #include <thread>
 +#elif defined(__FreeBSD__)
 +#include <pthread.h>
 +#include <pthread_np.h>
 +#include <unistd.h>
++#include <thread>
  #else
  #include <pthread.h>
  #include <unistd.h>
-@@ -85,6 +89,8 @@ void Thread::setName(const char* fmt, ...) {
+@@ -211,6 +216,8 @@ void Thread::setName(const char* fmt, ...) {
  
  #if defined(__APPLE__)
    pthread_setname_np(name);
diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn
index e12616cdc188..3602a2903200 100644
--- a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn
+++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/usrsctp/BUILD.gn.orig	2019-03-11 22:01:18 UTC
+--- third_party/usrsctp/BUILD.gn.orig	2020-05-13 18:40:02 UTC
 +++ third_party/usrsctp/BUILD.gn
-@@ -116,11 +116,16 @@ static_library("usrsctp") {
+@@ -121,11 +121,16 @@ static_library("usrsctp") {
      "-UINET6",
    ]
  
diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
index 431b2f75d72c..68fc351e124e 100644
--- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/BUILD.gn.orig	2020-03-16 18:42:13 UTC
+--- third_party/webrtc/BUILD.gn.orig	2020-05-13 18:41:55 UTC
 +++ third_party/webrtc/BUILD.gn
-@@ -171,6 +171,9 @@ config("common_inherited_config") {
+@@ -172,6 +172,9 @@ config("common_inherited_config") {
    if (is_linux) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index e45c76f40a22..573da6f01056 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,29 +1,15 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2019-12-16 21:56:20 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2020-05-13 18:41:57 UTC
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -14,7 +14,7 @@
- // linux/if.h can't be included at the same time as the posix sys/if.h, and
- // it's transitively required by linux/route.h, so include that version on
- // linux instead of the standard posix one.
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- #include <linux/if.h>
- #include <linux/route.h>
- #elif !defined(__native_client__)
-@@ -767,7 +767,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
+@@ -222,7 +222,12 @@ AdapterType GetAdapterTypeFromName(const char* network
+   }
+ #endif
+ 
++#if defined(WEBRTC_BSD)
++  // Treat all other network interface names as ethernet on BSD
++  return ADAPTER_TYPE_ETHERNET;
++#else
+   return ADAPTER_TYPE_UNKNOWN;
++#endif
  }
- #endif  // WEBRTC_WIN
  
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- bool IsDefaultRoute(const std::string& network_name) {
-   FILE* f = fopen("/proc/net/route", "r");
-   if (!f) {
-@@ -810,7 +810,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
-       strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
-     return true;
-   }
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
-   // Make sure this is a default route, if we're ignoring non-defaults.
-   if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
-     return true;
+ NetworkManager::NetworkManager() {}
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index 939381fc9f1a..e5217a82f65e 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2020-03-16 18:42:14 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2020-05-13 18:41:57 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -51,7 +51,7 @@
  #include "rtc_base/null_socket_server.h"
@@ -18,16 +18,16 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
-   socklen_t optlen = sizeof(*value);
-   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
-   if (ret != -1 && opt == OPT_DONTFRAGMENT) {
+@@ -292,7 +292,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+     return -1;
+   }
+   if (opt == OPT_DONTFRAGMENT) {
 -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
 +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
-   }
-@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+   } else if (opt == OPT_DSCP) {
+@@ -310,7 +310,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -35,8 +35,8 @@
 +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
-   }
-@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+   } else if (opt == OPT_DSCP) {
+@@ -551,7 +551,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index bb0b3df2b288..ee279e3451ba 100644
--- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2019-09-09 21:57:06 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2020-05-13 18:41:57 UTC
 +++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -58,8 +58,6 @@ rtc_static_library("system_wrappers") {
+@@ -59,8 +59,6 @@ rtc_library("system_wrappers") {
      if (!build_with_chromium) {
        deps += [ ":cpu_features_linux" ]
      }
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index 1461138a4fd5..498a0904d175 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,4 +1,4 @@
---- tools/gn/build/gen.py.orig	2020-03-16 18:48:21 UTC
+--- tools/gn/build/gen.py.orig	2020-05-13 18:47:33 UTC
 +++ tools/gn/build/gen.py
 @@ -73,6 +73,9 @@ class Platform(object):
    def is_haiku(self):
@@ -10,7 +10,7 @@
    def is_posix(self):
      return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku']
  
-@@ -351,6 +354,11 @@ def WriteGNNinja(path, platform, host, options):
+@@ -354,6 +357,11 @@ def WriteGNNinja(path, platform, host, options):
      elif platform.is_haiku():
        cflags.append('-fPIC')
        cflags.extend(['-D_BSD_SOURCE'])
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
index fda74ee7deec..bf456025bb2c 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig	2020-02-03 21:53:12 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig	2020-05-13 18:40:36 UTC
 +++ tools/json_schema_compiler/feature_compiler.py
-@@ -218,6 +218,7 @@ FEATURE_GRAMMAR = (
+@@ -219,6 +219,7 @@ FEATURE_GRAMMAR = (
          'enum_map': {
            'chromeos': 'Feature::CHROMEOS_PLATFORM',
            'linux': 'Feature::LINUX_PLATFORM',
diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index ac82f274b479..afd3d6b08b0d 100644
--- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2020-03-16 18:40:43 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2020-05-13 18:40:02 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -46,7 +46,7 @@ group("telemetry_chrome_test") {
+@@ -47,7 +47,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 8f3c47ebd01b..5d959a77dad4 100644
--- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/init/input_method_initializer.cc.orig	2019-06-04 18:55:49 UTC
+--- ui/base/ime/init/input_method_initializer.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/base/ime/init/input_method_initializer.cc
 @@ -8,7 +8,7 @@
  
@@ -27,7 +27,7 @@
    if (!g_linux_input_method_context_factory_for_testing)
      g_linux_input_method_context_factory_for_testing =
          new FakeInputMethodContextFactory();
-@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() {
+@@ -65,7 +65,7 @@ void InitializeInputMethodForTesting() {
  void ShutdownInputMethodForTesting() {
  #if defined(OS_CHROMEOS)
    IMEBridge::Shutdown();
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index 91e1320a26f5..211e06ccf1d5 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2020-03-16 18:40:15 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -822,7 +822,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -830,7 +830,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
    return max_scale_factor_;
  #else
    return GetSupportedScaleFactors().back();
-@@ -875,7 +875,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
+@@ -883,7 +883,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
    // On platforms other than iOS, 100P is always a supported scale factor.
    // For Windows we have a separate case in this function.
    supported_scale_factors.push_back(SCALE_FACTOR_100P);
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index aa850d8e1146..d9fdcb06fe51 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,20 +1,29 @@
---- ui/base/ui_base_features.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/base/ui_base_features.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/base/ui_base_features.cc
-@@ -113,7 +113,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
-     "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
- #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
+@@ -121,7 +121,7 @@ const base::Feature kPrecisionTouchpadLogging{
+     "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif  // defined(OS_WIN)
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  // Enables stylus appearing as touch when in contact with digitizer.
  const base::Feature kDirectManipulationStylus = {
      "DirectManipulationStylus",
-@@ -123,7 +123,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -131,7 +131,7 @@ const base::Feature kDirectManipulationStylus = {
      base::FEATURE_DISABLED_BY_DEFAULT
  #endif
  };
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  
- // Disable the FormControlsRefresh feature for all platforms. See
- // crbug.com/1057669.
+ // Enables forced colors mode for web content.
+ const base::Feature kForcedColors{"ForcedColors",
+@@ -157,7 +157,7 @@ bool IsEyeDropperEnabled() {
+ // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the
+ // Mac launch bug.
+ const base::Feature kFormControlsRefresh = {"FormControlsRefresh",
+-#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_MACOSX)
+                                             base::FEATURE_ENABLED_BY_DEFAULT
+ #else
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h
index d86c205b8c2e..e54a72640da8 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,8 +1,8 @@
---- ui/base/ui_base_features.h.orig	2020-03-16 18:40:43 UTC
+--- ui/base/ui_base_features.h.orig	2020-05-13 18:40:37 UTC
 +++ ui/base/ui_base_features.h
-@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
- extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
- #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
+@@ -58,10 +58,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::
+ COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUsingWMPointerForTouch();
+ #endif  // defined(OS_WIN)
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
@@ -11,5 +11,5 @@
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  
- // Used to enable the new controls UI.
- COMPONENT_EXPORT(UI_BASE_FEATURES)
+ // Used to enable forced colors mode for web content.
+ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kForcedColors;
diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
index 7546426f2036..fa8b4ef08d78 100644
--- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool__base.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
@@ -1,5 +1,5 @@
---- ui/base/x/x11_shm_image_pool_base.cc.orig	2020-03-16 18:40:43 UTC
-+++ ui/base/x/x11_shm_image_pool_base.cc
+--- ui/base/x/x11_shm_image_pool.cc.orig	2020-05-13 18:40:03 UTC
++++ ui/base/x/x11_shm_image_pool.cc
 @@ -16,6 +16,7 @@
  #include "base/environment.h"
  #include "base/location.h"
@@ -23,7 +23,7 @@
  }
  
  std::size_t MaxShmSegmentSize() {
-@@ -199,7 +204,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
+@@ -201,7 +206,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
          shmctl(state.shminfo_.shmid, IPC_RMID, nullptr);
          return false;
        }
@@ -32,12 +32,12 @@
        // On Linux, a shmid can still be attached after IPC_RMID if otherwise
        // kept alive.  Detach before XShmAttach to prevent a memory leak in case
        // the process dies.
-@@ -209,7 +214,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_
+@@ -211,7 +216,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
        if (!XShmAttach(display_, &state.shminfo_))
          return false;
        state.shmem_attached_to_server_ = true;
 -#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
++#if (!defined(OS_LINUX) && !defined(OS_BSD))
        // The Linux-specific shmctl behavior above may not be portable, so we're
        // forced to do IPC_RMID after the server has attached to the segment.
        // XShmAttach is asynchronous, so we must also sync.
diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc
index f89ddbcf2b9f..d566a8abc3c9 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/compositor/compositor.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/compositor/compositor.cc
-@@ -669,7 +669,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
+@@ -695,7 +695,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to
    NOTREACHED();
  }
  
diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h
index 89e662bc3e66..52126045fe15 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.h
+++ b/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig	2020-03-16 18:40:43 UTC
+--- ui/compositor/compositor.h.orig	2020-05-13 18:40:37 UTC
 +++ ui/compositor/compositor.h
-@@ -380,7 +380,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
+@@ -341,7 +341,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT
    void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
    void OnFrameTokenChanged(uint32_t frame_token) override;
  
diff --git a/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc b/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
deleted file mode 100644
index b7be4b020629..000000000000
--- a/www/chromium/files/patch-ui_compositor_host_host__context__factory__private.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/compositor/host/host_context_factory_private.cc.orig	2020-03-16 18:40:43 UTC
-+++ ui/compositor/host/host_context_factory_private.cc
-@@ -29,7 +29,7 @@ namespace {
- 
- static const char* kBrowser = "Browser";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- class HostDisplayClient : public viz::HostDisplayClient {
-  public:
-   explicit HostDisplayClient(ui::Compositor* compositor)
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index be500c1b94d5..87607363d4d9 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2020-03-16 18:40:43 UTC
+--- ui/gfx/BUILD.gn.orig	2020-05-13 18:40:37 UTC
 +++ ui/gfx/BUILD.gn
-@@ -578,7 +578,7 @@ jumbo_source_set("memory_buffer_sources") {
+@@ -582,7 +582,7 @@ jumbo_source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
index fe42d4a3bace..4a9c78512816 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,6 +1,6 @@
---- ui/gfx/gpu_memory_buffer.cc.orig	2019-12-17 19:59:38 UTC
+--- ui/gfx/gpu_memory_buffer.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/gfx/gpu_memory_buffer.cc
-@@ -28,7 +28,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
+@@ -34,7 +34,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
    handle.region = region.Duplicate();
    handle.offset = offset;
    handle.stride = stride;
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index a05a77674080..356867056eff 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,4 +1,4 @@
---- ui/gfx/gpu_memory_buffer.h.orig	2020-02-03 21:53:13 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig	2020-05-13 18:40:03 UTC
 +++ ui/gfx/gpu_memory_buffer.h
 @@ -15,7 +15,7 @@
  #include "ui/gfx/geometry/rect.h"
@@ -9,10 +9,10 @@
  #include "ui/gfx/native_pixmap_handle.h"
  #elif defined(OS_MACOSX) && !defined(OS_IOS)
  #include "ui/gfx/mac/io_surface.h"
-@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+@@ -69,7 +69,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
    base::UnsafeSharedMemoryRegion region;
-   uint32_t offset;
-   int32_t stride;
+   uint32_t offset = 0;
+   int32_t stride = 0;
 -#if defined(OS_LINUX) || defined(OS_FUCHSIA)
 +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
    NativePixmapHandle native_pixmap_handle;
diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
index a2a977047d43..4d7ecf6ec21a 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
@@ -1,61 +1,6 @@
---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2019-10-30 16:33:03 UTC
+--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/gfx/mojom/buffer_types_mojom_traits.cc
-@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
-   return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
- }
- 
--#if defined(OS_LINUX) || defined(USE_OZONE)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- mojo::ScopedHandle StructTraits<
-     gfx::mojom::NativePixmapPlaneDataView,
-     gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   return mojo::WrapPlatformFile(plane.fd.release());
- #elif defined(OS_FUCHSIA)
-   return mojo::WrapPlatformHandle(mojo::PlatformHandle(std::move(plane.vmo)));
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- }
- 
- bool StructTraits<
-@@ -45,7 +45,7 @@ bool StructTraits<
- 
-   mojo::PlatformHandle handle =
-       mojo::UnwrapPlatformHandle(data.TakeBufferHandle());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   if (!handle.is_fd())
-     return false;
-   out->fd = handle.TakeFD();
-@@ -53,7 +53,7 @@ bool StructTraits<
-   if (!handle.is_handle())
-     return false;
-   out->vmo = zx::vmo(handle.TakeHandle());
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- 
-   return true;
- }
-@@ -62,7 +62,7 @@ bool StructTraits<
-     gfx::mojom::NativePixmapHandleDataView,
-     gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
-                                    gfx::NativePixmapHandle* out) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   out->modifier = data.modifier();
- #endif
- 
-@@ -75,7 +75,7 @@ bool StructTraits<
- 
-   return data.ReadPlanes(&out->planes);
- }
--#endif  // defined(OS_LINUX) || defined(USE_OZONE)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- 
- gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
-     gfx::mojom::GpuMemoryBufferHandleDataView,
-@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
+@@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
        return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
            std::move(handle.region));
      case gfx::NATIVE_PIXMAP:
@@ -64,7 +9,7 @@
        return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
            std::move(handle.native_pixmap_handle));
  #else
-@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
+@@ -109,7 +109,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
        out->type = gfx::SHARED_MEMORY_BUFFER;
        out->region = std::move(platform_handle->get_shared_memory_handle());
        return true;
diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
deleted file mode 100644
index b7e56d150e01..000000000000
--- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- ui/gfx/mojom/buffer_types_mojom_traits.h.orig	2019-12-16 21:51:08 UTC
-+++ ui/gfx/mojom/buffer_types_mojom_traits.h
-@@ -194,7 +194,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
-   }
- };
- 
--#if defined(OS_LINUX) || defined(USE_OZONE)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- template <>
- struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
-                     gfx::NativePixmapPlane> {
-@@ -220,7 +220,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
-     return pixmap_handle.planes;
-   }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
-     return pixmap_handle.modifier;
-   }
-@@ -244,7 +244,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
-   static bool Read(gfx::mojom::NativePixmapHandleDataView data,
-                    gfx::NativePixmapHandle* out);
- };
--#endif  // defined(OS_LINUX) || defined(USE_OZONE)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- 
- template <>
- struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
new file mode 100644
index 000000000000..116dd4005c52
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -0,0 +1,56 @@
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig	2020-05-15 15:28:55 UTC
++++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
+@@ -8,15 +8,15 @@
+ 
+ namespace mojo {
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ mojo::PlatformHandle StructTraits<
+     gfx::mojom::NativePixmapPlaneDataView,
+     gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   return mojo::PlatformHandle(std::move(plane.fd));
+ #elif defined(OS_FUCHSIA)
+   return mojo::PlatformHandle(std::move(plane.vmo));
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ bool StructTraits<
+@@ -28,7 +28,7 @@ bool StructTraits<
+   out->size = data.size();
+ 
+   mojo::PlatformHandle handle = data.TakeBufferHandle();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (!handle.is_fd())
+     return false;
+   out->fd = handle.TakeFD();
+@@ -36,7 +36,7 @@ bool StructTraits<
+   if (!handle.is_handle())
+     return false;
+   out->vmo = zx::vmo(handle.TakeHandle());
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+   return true;
+ }
+@@ -45,7 +45,7 @@ bool StructTraits<
+     gfx::mojom::NativePixmapHandleDataView,
+     gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
+                                    gfx::NativePixmapHandle* out) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   out->modifier = data.modifier();
+ #endif
+ 
+@@ -58,6 +58,6 @@ bool StructTraits<
+ 
+   return data.ReadPlanes(&out->planes);
+ }
+-#endif  // defined(OS_LINUX) || defined(USE_OZONE)
++#endif  // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ 
+ }  // namespace mojo
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
new file mode 100644
index 000000000000..7f3980dd22e3
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
@@ -0,0 +1,36 @@
+--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig	2020-05-15 15:29:45 UTC
++++ ui/gfx/mojom/native_handle_types_mojom_traits.h
+@@ -14,13 +14,13 @@
+ #include "mojo/public/cpp/system/platform_handle.h"
+ #include "ui/gfx/mojom/native_handle_types.mojom-shared.h"
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ #include "ui/gfx/native_pixmap_handle.h"
+ #endif
+ 
+ namespace mojo {
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ template <>
+ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS)
+     StructTraits<gfx::mojom::NativePixmapPlaneDataView,
+@@ -48,7 +48,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
+     return pixmap_handle.planes;
+   }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
+     return pixmap_handle.modifier;
+   }
+@@ -72,7 +72,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
+   static bool Read(gfx::mojom::NativePixmapHandleDataView data,
+                    gfx::NativePixmapHandle* out);
+ };
+-#endif  // defined(OS_LINUX) || defined(USE_OZONE)
++#endif  // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ 
+ }  // namespace mojo
+ 
diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h
new file mode 100644
index 000000000000..4525fc9ce0e2
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h
@@ -0,0 +1,20 @@
+--- ui/gfx/native_widget_types.h.orig	2020-05-15 15:30:28 UTC
++++ ui/gfx/native_widget_types.h
+@@ -104,7 +104,7 @@ class ViewAndroid;
+ #endif
+ class SkBitmap;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ extern "C" {
+ struct _AtkObject;
+ typedef struct _AtkObject AtkObject;
+@@ -205,7 +205,7 @@ typedef id NativeViewAccessible;
+ #elif defined(OS_MACOSX)
+ typedef NSFont* NativeFont;
+ typedef id NativeViewAccessible;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Linux doesn't have a native font type.
+ typedef AtkObject* NativeViewAccessible;
+ #else
diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc
index 446317a3101a..cc63ccfc221a 100644
--- a/www/chromium/files/patch-ui_gfx_render__text.cc
+++ b/www/chromium/files/patch-ui_gfx_render__text.cc
@@ -1,6 +1,6 @@
---- ui/gfx/render_text.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/gfx/render_text.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/gfx/render_text.cc
-@@ -1169,32 +1169,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
+@@ -1167,32 +1167,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
    const int extra_content = GetContentWidth() - display_rect_.width();
    const int cursor_width = cursor_enabled_ ? 1 : 0;
  
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index 39f08eacf39a..4bca250f77c2 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gl/BUILD.gn.orig	2020-03-16 18:40:43 UTC
+--- ui/gl/BUILD.gn.orig	2020-05-13 18:40:37 UTC
 +++ ui/gl/BUILD.gn
-@@ -233,7 +233,7 @@ jumbo_component("gl") {
+@@ -232,7 +232,7 @@ jumbo_component("gl") {
        ]
      }
  
diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py
index c3ea0a6c23a3..8ea47d4341d2 100644
--- a/www/chromium/files/patch-ui_gl_generate__bindings.py
+++ b/www/chromium/files/patch-ui_gl_generate__bindings.py
@@ -1,6 +1,6 @@
---- ui/gl/generate_bindings.py.orig	2020-03-16 18:40:43 UTC
+--- ui/gl/generate_bindings.py.orig	2020-05-13 18:40:37 UTC
 +++ ui/gl/generate_bindings.py
-@@ -2777,6 +2777,9 @@ GLX_FUNCTIONS = [
+@@ -2804,6 +2804,9 @@ GLX_FUNCTIONS = [
    'arguments':
        'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
        'int32_t* denominator' },
diff --git a/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc
index 6d796805d2fa..c91797ca9683 100644
--- a/www/chromium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc
+++ b/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc
@@ -1,5 +1,5 @@
---- chrome/browser/ui/gtk/print_dialog_gtk.cc.orig	2020-03-16 18:40:30 UTC
-+++ chrome/browser/ui/gtk/print_dialog_gtk.cc
+--- ui/gtk/print_dialog_gtk.cc.orig	2020-03-16 18:40:30 UTC
++++ ui/gtk/print_dialog_gtk.cc
 @@ -336,7 +336,7 @@ void PrintDialogGtk::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
    // TODO(thestig) Add more capabilities to support?
diff --git a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
index 8f993bfbfbc6..fcc30a1c5836 100644
--- a/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
+++ b/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
@@ -1,6 +1,6 @@
---- ui/message_center/public/cpp/message_center_constants.h.orig	2019-06-04 18:55:50 UTC
+--- ui/message_center/public/cpp/message_center_constants.h.orig	2020-05-13 18:40:37 UTC
 +++ ui/message_center/public/cpp/message_center_constants.h
-@@ -105,7 +105,7 @@ const int kButtonHorizontalPadding = 16;   // In DIPs.
+@@ -109,7 +109,7 @@ const int kButtonHorizontalPadding = 16;   // In DIPs.
  const int kButtonIconTopPadding = 11;      // In DIPs.
  const int kButtonIconToTitlePadding = 16;  // In DIPs.
  
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h
index af4951e7fb10..9806f7ecdeff 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme.h
+++ b/www/chromium/files/patch-ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme.h.orig	2019-10-21 19:07:29 UTC
+--- ui/native_theme/native_theme.h.orig	2020-05-13 18:40:37 UTC
 +++ ui/native_theme/native_theme.h
-@@ -49,7 +49,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -51,7 +51,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
    // The part to be painted / sized.
    enum Part {
      kCheckbox,
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
index 96f69fe1f796..928d9aed5ddf 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme_base.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -256,7 +256,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+@@ -254,7 +254,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
      case kCheckbox:
        PaintCheckbox(canvas, state, rect, extra.button, color_scheme);
        break;
diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
index 4cdcd2b4bfd1..8390dd78b6fe 100644
--- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
+++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
@@ -1,7 +1,7 @@
---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/bubble/bubble_dialog_delegate_view.cc
-@@ -174,7 +174,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
-   bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
+@@ -171,7 +171,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
+   bubble_delegate->Init();
    Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
  
 -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index f6f9790bdbae..4599ba02af0f 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,4 +1,4 @@
---- ui/views/controls/label.cc.orig	2020-02-03 21:53:40 UTC
+--- ui/views/controls/label.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/controls/label.cc
 @@ -695,7 +695,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
      GetFocusManager()->SetFocusedView(this);
@@ -9,7 +9,7 @@
    if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
      GetFocusManager()->SetFocusedView(this);
  #endif
-@@ -880,7 +880,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -881,7 +881,7 @@ bool Label::PasteSelectionClipboard() {
  }
  
  void Label::UpdateSelectionClipboard() {
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index f22c358d52d8..a0f9988afe25 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,14 +1,14 @@
---- ui/views/controls/textfield/textfield.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -60,7 +60,7 @@
+@@ -62,7 +62,7 @@
  #include "base/win/win_util.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "base/strings/utf_string_conversions.h"
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
+ #endif
 @@ -183,14 +183,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
@@ -35,7 +35,7 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -730,7 +730,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
+@@ -691,7 +691,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
  #endif
    }
  
@@ -44,7 +44,7 @@
    if (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
      RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE);
  #endif
-@@ -776,7 +776,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -737,7 +737,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
    if (!textfield)
      return handled;
  
@@ -53,7 +53,7 @@
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -886,7 +886,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -62,7 +62,7 @@
    // Skip any accelerator handling that conflicts with custom keybindings.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
-@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() {
+@@ -2146,7 +2146,7 @@ bool Textfield::PasteSelectionClipboard() {
  }
  
  void Textfield::UpdateSelectionClipboard() {
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index af036b2cf5d1..78a010bbdc9a 100644
--- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2019-12-16 21:51:34 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/corewm/tooltip_aura.cc
-@@ -43,7 +43,7 @@ constexpr int kVerticalPaddingBottom = 5;
+@@ -46,7 +46,7 @@ constexpr int kVerticalPaddingBottom = 5;
  
  // TODO(varkha): Update if native widget can be transparent on Linux.
  bool CanUseTranslucentTooltipWidget() {
diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc
index ae3eee7d03ac..69203a9262d4 100644
--- a/www/chromium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig	2020-02-03 21:53:14 UTC
+--- ui/views/examples/widget_example.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/examples/widget_example.cc
-@@ -70,7 +70,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -72,7 +72,7 @@ void WidgetExample::CreateExampleView(View* container)
    BuildButton(container, "Popup widget", POPUP);
    BuildButton(container, "Dialog widget", DIALOG);
    BuildButton(container, "Modal Dialog", MODAL_DIALOG);
diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc
index 9504c67a2803..9d5f91409ead 100644
--- a/www/chromium/files/patch-ui_views_selection__controller.cc
+++ b/www/chromium/files/patch-ui_views_selection__controller.cc
@@ -1,6 +1,6 @@
---- ui/views/selection_controller.cc.orig	2019-12-16 21:51:09 UTC
+--- ui/views/selection_controller.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/views/selection_controller.cc
-@@ -22,7 +22,7 @@ SelectionController::SelectionController(SelectionCont
+@@ -23,7 +23,7 @@ SelectionController::SelectionController(SelectionCont
        delegate_(delegate),
        handles_selection_clipboard_(false) {
  // On Linux, update the selection clipboard on a text selection.
diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h
index b5bdee958617..c8f55070bfd4 100644
--- a/www/chromium/files/patch-ui_views_views__delegate.h
+++ b/www/chromium/files/patch-ui_views_views__delegate.h
@@ -1,6 +1,6 @@
---- ui/views/views_delegate.h.orig	2020-02-03 21:53:14 UTC
+--- ui/views/views_delegate.h.orig	2020-05-13 18:40:03 UTC
 +++ ui/views/views_delegate.h
-@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -133,7 +133,7 @@ class VIEWS_EXPORT ViewsDelegate {
    // Returns true if the window passed in is in the Windows 8 metro
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index ab44393b52fb..45c1fde7e8f2 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -747,7 +747,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
+@@ -754,7 +754,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
index 61706964d7c0..50b0207899de 100644
--- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
+++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/native_widget_aura.cc.orig	2020-03-16 18:40:43 UTC
+--- ui/views/widget/native_widget_aura.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/widget/native_widget_aura.cc
 @@ -64,7 +64,7 @@
  #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
@@ -9,7 +9,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
  #endif
-@@ -1099,13 +1099,13 @@ void Widget::CloseAllSecondaryWidgets() {
+@@ -1102,13 +1102,13 @@ void Widget::CloseAllSecondaryWidgets() {
    EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
  #endif
  
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
index 4c35d22da5da..548428aa5db3 100644
--- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,6 +1,6 @@
---- ui/views/window/custom_frame_view.cc.orig	2019-09-09 21:55:47 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/views/window/custom_frame_view.cc
-@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
+@@ -283,7 +283,7 @@ int CustomFrameView::NonClientTopBorderHeight() const 
  int CustomFrameView::CaptionButtonY() const {
    // Maximized buttons start at window top so that even if their images aren't
    // drawn flush with the screen edge, they still obey Fitts' Law.
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index b92881838304..7b62ec2bc6b8 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,4 +1,4 @@
---- ui/views/window/dialog_delegate.cc.orig	2020-02-03 21:53:40 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2020-05-13 18:40:37 UTC
 +++ ui/views/window/dialog_delegate.cc
 @@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg
  
@@ -8,4 +8,4 @@
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA)
    // The new style doesn't support unparented dialogs on Linux desktop.
    return parent != nullptr;
- #elif defined(OS_WIN)
+ #else
diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc
index 18a363a65e8f..b9c3d0d7dca7 100644
--- a/www/chromium/files/patch-ui_views_window_frame__background.cc
+++ b/www/chromium/files/patch-ui_views_window_frame__background.cc
@@ -1,6 +1,6 @@
---- ui/views/window/frame_background.cc.orig	2020-02-03 21:53:14 UTC
+--- ui/views/window/frame_background.cc.orig	2020-05-13 18:40:03 UTC
 +++ ui/views/window/frame_background.cc
-@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
+@@ -99,7 +99,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
                                       const View* view) const {
  // Fill the top with the frame color first so we have a constant background
  // for areas not covered by the theme image.
diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js
index 2df5b1190a27..b2339361b638 100644
--- a/www/chromium/files/patch-ui_webui_resources_js_cr.js
+++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js
@@ -1,6 +1,6 @@
---- ui/webui/resources/js/cr.js.orig	2019-12-16 21:51:34 UTC
+--- ui/webui/resources/js/cr.js.orig	2020-05-13 18:40:03 UTC
 +++ ui/webui/resources/js/cr.js
-@@ -437,6 +437,11 @@ var cr = cr || function(global) {
+@@ -430,6 +430,11 @@ var cr = cr || function(global) {
      get isMac() {
        return /Mac/.test(navigator.platform);
      },
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 0fe25aa48094..f1cb20d1fa32 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2020-03-16 18:42:16 UTC
+--- v8/BUILD.gn.orig	2020-05-13 18:41:59 UTC
 +++ v8/BUILD.gn
-@@ -3616,7 +3616,7 @@ v8_component("v8_libbase") {
+@@ -3742,7 +3742,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -9,7 +9,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -3636,6 +3636,12 @@ v8_component("v8_libbase") {
+@@ -3762,6 +3762,12 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
@@ -22,7 +22,7 @@
    } else if (is_android) {
      if (current_toolchain == host_toolchain) {
        libs = [
-@@ -3891,6 +3897,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
+@@ -4064,6 +4070,7 @@ if (current_toolchain == v8_snapshot_toolchain) {
        "src/snapshot/mksnapshot.cc",
        "src/snapshot/snapshot-empty.cc",
      ]
diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc
index f32636389a90..24e66024517d 100644
--- a/www/chromium/files/patch-v8_src_api_api.cc
+++ b/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,6 +1,6 @@
---- v8/src/api/api.cc.orig	2020-03-16 18:42:16 UTC
+--- v8/src/api/api.cc.orig	2020-05-13 18:41:59 UTC
 +++ v8/src/api/api.cc
-@@ -5657,7 +5657,7 @@ bool v8::V8::Initialize() {
+@@ -5726,7 +5726,7 @@ bool v8::V8::Initialize() {
    return true;
  }
  
diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc
index c11e6a384aa0..7b67e85c5587 100644
--- a/www/chromium/files/patch-v8_src_base_cpu.cc
+++ b/www/chromium/files/patch-v8_src_base_cpu.cc
@@ -1,6 +1,6 @@
---- v8/src/base/cpu.cc.orig	2019-12-16 21:56:22 UTC
+--- v8/src/base/cpu.cc.orig	2020-05-13 18:41:59 UTC
 +++ v8/src/base/cpu.cc
-@@ -422,6 +422,7 @@ CPU::CPU()
+@@ -427,6 +427,7 @@ CPU::CPU()
  
  #if V8_OS_LINUX
  
@@ -8,7 +8,7 @@
    CPUInfo cpu_info;
  
    // Extract implementor from the "CPU implementer" field.
-@@ -455,6 +456,7 @@ CPU::CPU()
+@@ -460,6 +461,7 @@ CPU::CPU()
      }
      delete[] part;
    }
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
index 14e3ac15e039..9e539ca470b2 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc
@@ -1,6 +1,14 @@
---- v8/src/base/platform/platform-freebsd.cc.orig	2020-03-24 16:12:11 UTC
+--- v8/src/base/platform/platform-freebsd.cc.orig	2020-05-13 18:41:59 UTC
 +++ v8/src/base/platform/platform-freebsd.cc
-@@ -81,8 +81,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+@@ -6,6 +6,7 @@
+ // parts, the implementation is in platform-posix.cc.
+ 
+ #include <pthread.h>
++#include <pthread_np.h>
+ #include <semaphore.h>
+ #include <signal.h>
+ #include <stdlib.h>
+@@ -81,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
              lib_name = std::string(path);
            }
            result.push_back(SharedLibraryAddress(
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
index e60a94f246f1..7f295631e9db 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,6 +1,6 @@
---- v8/src/base/platform/platform-posix.cc.orig	2020-02-03 21:55:00 UTC
+--- v8/src/base/platform/platform-posix.cc.orig	2020-05-13 18:41:59 UTC
 +++ v8/src/base/platform/platform-posix.cc
-@@ -427,7 +427,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
+@@ -433,7 +433,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
  
  // static
  bool OS::HasLazyCommits() {
@@ -9,7 +9,7 @@
    return true;
  #else
    // TODO(bbudge) Return true for all POSIX platforms.
-@@ -558,6 +558,12 @@ int OS::GetCurrentThreadId() {
+@@ -564,6 +564,12 @@ int OS::GetCurrentThreadId() {
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn
new file mode 100644
index 000000000000..53cb053e8c62
--- /dev/null
+++ b/www/chromium/files/patch-weblayer_BUILD.gn
@@ -0,0 +1,17 @@
+--- weblayer/BUILD.gn.orig	2020-05-18 11:02:15 UTC
++++ weblayer/BUILD.gn
+@@ -414,6 +414,14 @@ source_set("weblayer_lib_base") {
+     ]
+   }
+ 
++  if (is_bsd) {
++    deps -= [
++      "//components/crash/content/browser",
++      "//components/crash/core/app",
++      "//components/crash/core/common",
++    ]
++  }
++
+   if (toolkit_views) {
+     deps += [ "//ui/views" ]
+   }
diff --git a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
index ef8149182926..3e404619721d 100644
--- a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
+++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc
@@ -1,6 +1,6 @@
---- weblayer/app/content_main_delegate_impl.cc.orig	2020-03-17 10:35:42 UTC
+--- weblayer/app/content_main_delegate_impl.cc.orig	2020-05-13 18:40:37 UTC
 +++ weblayer/app/content_main_delegate_impl.cc
-@@ -146,7 +146,7 @@ bool ContentMainDelegateImpl::BasicStartupComplete(int
+@@ -164,7 +164,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList(
  }
  
  void ContentMainDelegateImpl::PreSandboxStartup() {
diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
index ca6a91a131c6..0f18b2e56b46 100644
--- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
+++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc
@@ -1,6 +1,6 @@
---- weblayer/browser/browser_main_parts_impl.cc.orig	2020-03-16 18:40:43 UTC
+--- weblayer/browser/browser_main_parts_impl.cc.orig	2020-05-13 18:40:37 UTC
 +++ weblayer/browser/browser_main_parts_impl.cc
-@@ -41,7 +41,7 @@
+@@ -47,7 +47,7 @@
  #if defined(USE_AURA) && defined(USE_X11)
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
@@ -9,7 +9,7 @@
  #include "ui/base/ime/init/input_method_initializer.h"
  #endif
  
-@@ -109,7 +109,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
+@@ -121,7 +121,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
  #if defined(USE_X11)
    ui::SetDefaultX11ErrorHandlers();
  #endif
diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
index cdb4c7b0f2a0..603c3e2827a2 100644
--- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
+++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc
@@ -1,6 +1,6 @@
---- weblayer/browser/content_browser_client_impl.cc.orig	2020-03-16 18:40:43 UTC
+--- weblayer/browser/content_browser_client_impl.cc.orig	2020-05-13 18:40:37 UTC
 +++ weblayer/browser/content_browser_client_impl.cc
-@@ -72,7 +72,7 @@
+@@ -87,7 +87,7 @@
  #include "weblayer/browser/safe_browsing/safe_browsing_service.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/public/common/content_descriptors.h"
  #endif
  
-@@ -247,7 +247,7 @@ ContentBrowserClientImpl::CreateNetworkContext(
+@@ -321,7 +321,7 @@ ContentBrowserClientImpl::CreateNetworkContext(
  
  void ContentBrowserClientImpl::OnNetworkServiceCreated(
      network::mojom::NetworkService* network_service) {
@@ -18,7 +18,7 @@
    network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New();
    content::GetNetworkService()->SetCryptConfig(std::move(config));
  #endif
-@@ -426,7 +426,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
+@@ -537,7 +537,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
  }
  #endif
  
@@ -27,12 +27,11 @@
  void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -460,7 +460,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile
+@@ -571,6 +571,6 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile
      mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
  #endif  // defined(OS_ANDROID)
  }
 -#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 +#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
- #if defined(OS_ANDROID)
- bool ContentBrowserClientImpl::ShouldOverrideUrlLoading(
+ }  // namespace weblayer
diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
index 41c6b7a9b08d..b3ed53bb4cbf 100644
--- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
+++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h
@@ -1,7 +1,7 @@
---- weblayer/browser/content_browser_client_impl.h.orig	2020-03-16 18:40:43 UTC
+--- weblayer/browser/content_browser_client_impl.h.orig	2020-05-13 18:40:37 UTC
 +++ weblayer/browser/content_browser_client_impl.h
-@@ -85,12 +85,12 @@ class ContentBrowserClientImpl : public content::Conte
-       service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
+@@ -91,12 +91,12 @@ class ContentBrowserClientImpl : public content::Conte
+   scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
        override;
  
 -#if defined(OS_LINUX) || defined(OS_ANDROID)
@@ -13,5 +13,5 @@
 -#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 +#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
  
- #if defined(OS_ANDROID)
-   bool ShouldOverrideUrlLoading(int frame_tree_node_id,
+   void CreateFeatureListAndFieldTrials();
+ 
diff --git a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
index 4ac2c36b5362..905959498728 100644
--- a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
+++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc
@@ -1,9 +1,9 @@
---- weblayer/browser/system_network_context_manager.cc.orig	2020-03-17 10:36:11 UTC
+--- weblayer/browser/system_network_context_manager.cc.orig	2020-05-13 18:40:04 UTC
 +++ weblayer/browser/system_network_context_manager.cc
-@@ -102,7 +102,7 @@ SystemNetworkContextManager::CreateSystemNetworkContex
- 
-   network_context_params->context_name = std::string("system");
-   network_context_params->primary_network_context = true;
+@@ -52,7 +52,7 @@ SystemNetworkContextManager::CreateDefaultNetworkConte
+   network::mojom::NetworkContextParamsPtr network_context_params =
+       network::mojom::NetworkContextParams::New();
+   network_context_params->user_agent = user_agent;
 -#if defined(OS_LINUX) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
    // We're not configuring the cookie encryption on these platforms yet.
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index a59b9349613b..b233d0ff6b75 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -125,9 +125,10 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/accelerometer-left.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-right.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-top.png
-%%DATADIR%%/resources/inspector/Images/audits_logo.svg
 %%DATADIR%%/resources/inspector/Images/breakpoint.svg
-%%DATADIR%%/resources/inspector/Images/breakpointConditional.svg
+%%DATADIR%%/resources/inspector/Images/breakpoint-conditional-disabled.svg
+%%DATADIR%%/resources/inspector/Images/breakpoint-conditional.svg
+%%DATADIR%%/resources/inspector/Images/breakpoint-disabled.svg
 %%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg
 %%DATADIR%%/resources/inspector/Images/checker.png
 %%DATADIR%%/resources/inspector/Images/chevrons.svg
@@ -143,6 +144,9 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
 %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg
 %%DATADIR%%/resources/inspector/Images/largeIcons.svg
+%%DATADIR%%/resources/inspector/Images/lighthouse_logo.svg
+%%DATADIR%%/resources/inspector/Images/logpoint-disabled.svg
+%%DATADIR%%/resources/inspector/Images/logpoint.svg
 %%DATADIR%%/resources/inspector/Images/mediumIcons.svg
 %%DATADIR%%/resources/inspector/Images/navigationControls.png
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
@@ -176,301 +180,234 @@ bin/chrome
 %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
 %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg
 %%DATADIR%%/resources/inspector/Images/whatsnew.png
-%%DATADIR%%/resources/inspector/InspectorBackendCommands.js
-%%DATADIR%%/resources/inspector/SupportedCSSProperties.js
 %%DATADIR%%/resources/inspector/Tests.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility.js
-%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js
-%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js
-%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js
-%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js
-%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js
-%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js
-%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js
-%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js
-%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js
 %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
 %%DATADIR%%/resources/inspector/animation/animation_module.js
 %%DATADIR%%/resources/inspector/animation/animation-legacy.js
 %%DATADIR%%/resources/inspector/animation/animation.js
-%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js
-%%DATADIR%%/resources/inspector/animation/AnimationModel.js
-%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js
-%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js
-%%DATADIR%%/resources/inspector/animation/AnimationUI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js
 %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
-%%DATADIR%%/resources/inspector/audits/audits_module.js
-%%DATADIR%%/resources/inspector/audits/audits-legacy.js
-%%DATADIR%%/resources/inspector/audits/audits.js
-%%DATADIR%%/resources/inspector/audits/AuditsController.js
-%%DATADIR%%/resources/inspector/audits/AuditsPanel.js
-%%DATADIR%%/resources/inspector/audits/AuditsProtocolService.js
-%%DATADIR%%/resources/inspector/audits/AuditsReportRenderer.js
-%%DATADIR%%/resources/inspector/audits/AuditsReportSelector.js
-%%DATADIR%%/resources/inspector/audits/AuditsStartView.js
-%%DATADIR%%/resources/inspector/audits/AuditsStatusView.js
-%%DATADIR%%/resources/inspector/audits/lighthouse/report-generator.js
-%%DATADIR%%/resources/inspector/audits/lighthouse/report.js
-%%DATADIR%%/resources/inspector/audits/RadioSetting.js
-%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js
-%%DATADIR%%/resources/inspector/audits_worker.js
-%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar-XB.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/bg.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ca.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/cs.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/da.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/de.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/el.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-GB.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-US.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XA.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XL.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es-419.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fi.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fil.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fr.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/he.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hi.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hr.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hu.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/id.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/it.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ja.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ko.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lt.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lv.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/nl.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/no.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pl.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt-PT.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ro.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ru.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sk.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sl.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr-Latn.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sv.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ta.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/te.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/th.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/tr.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/uk.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/vi.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-HK.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json
-%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json
 %%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js
 %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
 %%DATADIR%%/resources/inspector/bindings/bindings.js
 %%DATADIR%%/resources/inspector/bindings/bindings-legacy.js
-%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js
-%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js
-%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js
-%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js
-%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
-%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js
-%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js
-%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js
-%%DATADIR%%/resources/inspector/bindings/FileUtils.js
-%%DATADIR%%/resources/inspector/bindings/LiveLocation.js
-%%DATADIR%%/resources/inspector/bindings/NetworkProject.js
-%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js
-%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js
-%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js
-%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js
-%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js
-%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js
-%%DATADIR%%/resources/inspector/bindings/TempFile.js
-%%DATADIR%%/resources/inspector/bindings/language_plugins/CXXDWARFLanguagePlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/language_plugins/CXXDWARFLanguagePlugin.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js
-%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js
-%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js
-%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js
-%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js
 %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js
 %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-legacy.js
-%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js
 %%DATADIR%%/resources/inspector/changes/changes_module.js
 %%DATADIR%%/resources/inspector/changes/changes-legacy.js
 %%DATADIR%%/resources/inspector/changes/changes.js
-%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js
-%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js
-%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js
-%%DATADIR%%/resources/inspector/changes/ChangesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js
 %%DATADIR%%/resources/inspector/cm_headless/cm_headless.js
-%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js
-%%DATADIR%%/resources/inspector/cm_modes/clike.js
-%%DATADIR%%/resources/inspector/cm_modes/clojure.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/clike.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/clojure.js
 %%DATADIR%%/resources/inspector/cm/cm_module.js
-%%DATADIR%%/resources/inspector/cm/active-line.js
-%%DATADIR%%/resources/inspector/cm/brace-fold.js
-%%DATADIR%%/resources/inspector/cm/closebrackets.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/active-line.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/brace-fold.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/closebrackets.js
 %%DATADIR%%/resources/inspector/cm/cm.js
-%%DATADIR%%/resources/inspector/cm/codemirror.js
-%%DATADIR%%/resources/inspector/cm/comment.js
-%%DATADIR%%/resources/inspector/cm/foldcode.js
-%%DATADIR%%/resources/inspector/cm/foldgutter.js
-%%DATADIR%%/resources/inspector/cm/mark-selection.js
-%%DATADIR%%/resources/inspector/cm/matchbrackets.js
-%%DATADIR%%/resources/inspector/cm/multiplex.js
-%%DATADIR%%/resources/inspector/cm/overlay.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/codemirror.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/comment.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/foldcode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/foldgutter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/mark-selection.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/matchbrackets.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/multiplex.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm/overlay.js
 %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
 %%DATADIR%%/resources/inspector/cm_modes/cm_modes.js
-%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js
-%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js
-%%DATADIR%%/resources/inspector/cm_modes/jsx.js
-%%DATADIR%%/resources/inspector/cm_modes/livescript.js
-%%DATADIR%%/resources/inspector/cm_modes/markdown.js
-%%DATADIR%%/resources/inspector/cm_modes/php.js
-%%DATADIR%%/resources/inspector/cm_modes/python.js
-%%DATADIR%%/resources/inspector/cm_modes/shell.js
-%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js
-%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/jsx.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/livescript.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/markdown.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/php.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/python.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/shell.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js
 %%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_module.js
 %%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js
-%%DATADIR%%/resources/inspector/cm_web_modes/css.js
-%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js
-%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js
-%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js
-%%DATADIR%%/resources/inspector/cm_web_modes/xml.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/css.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cm_web_modes/xml.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker.js
-%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js
-%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js
-%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js
-%%DATADIR%%/resources/inspector/color_picker/Spectrum.js
-%%DATADIR%%/resources/inspector/common/App.js
-%%DATADIR%%/resources/inspector/common/AppProvider.js
-%%DATADIR%%/resources/inspector/common/CharacterIdMap.js
-%%DATADIR%%/resources/inspector/common/Color.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/Spectrum.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/App.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/AppProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/CharacterIdMap.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Color.js
 %%DATADIR%%/resources/inspector/common/common.js
 %%DATADIR%%/resources/inspector/common/common-legacy.js
-%%DATADIR%%/resources/inspector/common/Console.js
-%%DATADIR%%/resources/inspector/common/ContentProvider.js
-%%DATADIR%%/resources/inspector/common/EventTarget.js
-%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js
-%%DATADIR%%/resources/inspector/common/Linkifier.js
-%%DATADIR%%/resources/inspector/common/Object.js
-%%DATADIR%%/resources/inspector/common/ParsedURL.js
-%%DATADIR%%/resources/inspector/common/Progress.js
-%%DATADIR%%/resources/inspector/common/QueryParamHandler.js
-%%DATADIR%%/resources/inspector/common/ResourceType.js
-%%DATADIR%%/resources/inspector/common/Revealer.js
-%%DATADIR%%/resources/inspector/common/Runnable.js
-%%DATADIR%%/resources/inspector/common/SegmentedRange.js
-%%DATADIR%%/resources/inspector/common/Settings.js
-%%DATADIR%%/resources/inspector/common/StaticContentProvider.js
-%%DATADIR%%/resources/inspector/common/StringOutputStream.js
-%%DATADIR%%/resources/inspector/common/TextDictionary.js
-%%DATADIR%%/resources/inspector/common/Throttler.js
-%%DATADIR%%/resources/inspector/common/Trie.js
-%%DATADIR%%/resources/inspector/common/UIString.js
-%%DATADIR%%/resources/inspector/common/Worker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Progress.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/QueryParamHandler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/ResourceType.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Revealer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/StringOutputStream.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/UIString.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js
 %%DATADIR%%/resources/inspector/components/components.js
 %%DATADIR%%/resources/inspector/components/components-legacy.js
-%%DATADIR%%/resources/inspector/components/DockController.js
-%%DATADIR%%/resources/inspector/components/ImagePreview.js
-%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js
-%%DATADIR%%/resources/inspector/components/Linkifier.js
-%%DATADIR%%/resources/inspector/components/Reload.js
-%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/DockController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/Linkifier.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/Reload.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js
 %%DATADIR%%/resources/inspector/console_counters/console_counters.js
 %%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js
-%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js
 %%DATADIR%%/resources/inspector/console/console_module.js
 %%DATADIR%%/resources/inspector/console/console-legacy.js
 %%DATADIR%%/resources/inspector/console/console.js
-%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js
-%%DATADIR%%/resources/inspector/console/ConsoleFilter.js
-%%DATADIR%%/resources/inspector/console/ConsolePanel.js
-%%DATADIR%%/resources/inspector/console/ConsolePinPane.js
-%%DATADIR%%/resources/inspector/console/ConsolePrompt.js
-%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js
-%%DATADIR%%/resources/inspector/console/ConsoleView.js
-%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js
-%%DATADIR%%/resources/inspector/console/ConsoleViewport.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleFilter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePinPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePrompt.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewport.js
 %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js
 %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
 %%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js
 %%DATADIR%%/resources/inspector/cookie_table/cookie_table.js
-%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js
 %%DATADIR%%/resources/inspector/coverage/coverage_module.js
 %%DATADIR%%/resources/inspector/coverage/coverage-legacy.js
 %%DATADIR%%/resources/inspector/coverage/coverage.js
-%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js
-%%DATADIR%%/resources/inspector/coverage/CoverageListView.js
-%%DATADIR%%/resources/inspector/coverage/CoverageModel.js
-%%DATADIR%%/resources/inspector/coverage/CoverageView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageListView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js
 %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
 %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/css_overview/css_overview_module.js
 %%DATADIR%%/resources/inspector/css_overview/css_overview-legacy.js
 %%DATADIR%%/resources/inspector/css_overview/css_overview.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js
-%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js
 %%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js
 %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
 %%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js
 %%DATADIR%%/resources/inspector/data_grid/data_grid.js
-%%DATADIR%%/resources/inspector/data_grid/DataGrid.js
-%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js
-%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js
-%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/DataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js
 %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
 %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
 %%DATADIR%%/resources/inspector/devices/devices_module.js
+%%DATADIR%%/resources/inspector/devices/devices.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/devices/DevicesView.js
 %%DATADIR%%/resources/inspector/devtools_app.html
 %%DATADIR%%/resources/inspector/devtools_app.js
 %%DATADIR%%/resources/inspector/devtools_compatibility.js
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
-%%DATADIR%%/resources/inspector/diff/diff_match_patch.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js
 %%DATADIR%%/resources/inspector/diff/diff_module.js
 %%DATADIR%%/resources/inspector/diff/diff-legacy.js
 %%DATADIR%%/resources/inspector/diff/diff.js
-%%DATADIR%%/resources/inspector/diff/DiffWrapper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/diff/DiffWrapper.js
 %%DATADIR%%/resources/inspector/dom_extension/dom_extension.js
-%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js
 %%DATADIR%%/resources/inspector/elements/elements_module.js
 %%DATADIR%%/resources/inspector/elements/elements-legacy.js
 %%DATADIR%%/resources/inspector/elements/elements.js
-%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js
-%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js
-%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js
-%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js
-%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js
-%%DATADIR%%/resources/inspector/elements/DOMPath.js
-%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js
-%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
-%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js
-%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js
-%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js
-%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js
-%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js
-%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js
-%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js
-%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js
-%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js
-%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js
-%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js
-%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js
-%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js
-%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js
-%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js
 %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js
 %%DATADIR%%/resources/inspector/emulated_devices/MotoG4-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/MotoG4-portrait.svg
@@ -511,579 +448,673 @@ bin/chrome
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
-%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js
-%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js
-%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js
-%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js
-%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js
-%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js
-%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js
 %%DATADIR%%/resources/inspector/emulation/emulation-legacy.js
 %%DATADIR%%/resources/inspector/emulation/emulation.js
-%%DATADIR%%/resources/inspector/emulation/GeolocationsSettingsTab.js
-%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js
-%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js
-%%DATADIR%%/resources/inspector/emulation/SensorsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/LocationsSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners.js
-%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js
-%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js
 %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
-%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js
-%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js
 %%DATADIR%%/resources/inspector/extensions/extensions-legacy.js
 %%DATADIR%%/resources/inspector/extensions/extensions.js
-%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js
-%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js
-%%DATADIR%%/resources/inspector/extensions/ExtensionView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js
 %%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js
-%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn.js
-%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js
-%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js
-%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js
-%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js
-%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js
-%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js
 %%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js
 %%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-legacy.js
-%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js
-%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js
-%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js
-%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js
-%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js
-%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js
 %%DATADIR%%/resources/inspector/formatter/formatter_module.js
 %%DATADIR%%/resources/inspector/formatter/formatter-legacy.js
 %%DATADIR%%/resources/inspector/formatter/formatter.js
-%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js
-%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js
-%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/generated/ARIAProperties.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/generated/InspectorBackendCommands.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/generated/SupportedCSSProperties.js
 %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js
 %%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js
 %%DATADIR%%/resources/inspector/har_importer/har_importer.js
-%%DATADIR%%/resources/inspector/har_importer/HARFormat.js
-%%DATADIR%%/resources/inspector/har_importer/HARImporter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARFormat.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARImporter.js
 %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js
 %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js
-%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker_entrypoint.js
-%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js
-%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js
-%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js
-%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js
-%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js
 %%DATADIR%%/resources/inspector/help/help_module.js
 %%DATADIR%%/resources/inspector/help/help-legacy.js
 %%DATADIR%%/resources/inspector/help/help.js
-%%DATADIR%%/resources/inspector/help/HelpImpl.js
-%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js
-%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js
 %%DATADIR%%/resources/inspector/host/host.js
 %%DATADIR%%/resources/inspector/host/host-legacy.js
-%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js
-%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js
-%%DATADIR%%/resources/inspector/host/Platform.js
-%%DATADIR%%/resources/inspector/host/ResourceLoader.js
-%%DATADIR%%/resources/inspector/host/UserMetrics.js
-%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js
-%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js
-%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js
-%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js
-%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/host/Platform.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/host/ResourceLoader.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/host/UserMetrics.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor.js
-%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js
 %%DATADIR%%/resources/inspector/input/input_module.js
 %%DATADIR%%/resources/inspector/input/input-legacy.js
 %%DATADIR%%/resources/inspector/input/input.js
-%%DATADIR%%/resources/inspector/input/InputModel.js
-%%DATADIR%%/resources/inspector/input/InputTimeline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js
 %%DATADIR%%/resources/inspector/inspector_main/inspector_main.js
 %%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js
-%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js
-%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js
 %%DATADIR%%/resources/inspector/inspector.html
 %%DATADIR%%/resources/inspector/inspector.js
 %%DATADIR%%/resources/inspector/integration_test_runner.html
 %%DATADIR%%/resources/inspector/integration_test_runner.js
+%%DATADIR%%/resources/inspector/issues/issues_module.js
+%%DATADIR%%/resources/inspector/issues/issues-legacy.js
+%%DATADIR%%/resources/inspector/issues/issues.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js
 %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js
 %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js
 %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js
-%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js
-%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js
 %%DATADIR%%/resources/inspector/js_app.html
 %%DATADIR%%/resources/inspector/js_app.js
 %%DATADIR%%/resources/inspector/js_main/js_main.js
 %%DATADIR%%/resources/inspector/js_main/js_main-legacy.js
-%%DATADIR%%/resources/inspector/js_main/JsMain.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js
 %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js
-%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js
-%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js
-%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js
-%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js
-%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js
-%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js
 %%DATADIR%%/resources/inspector/layers/layers_module.js
 %%DATADIR%%/resources/inspector/layers/layers-legacy.js
 %%DATADIR%%/resources/inspector/layers/layers.js
-%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js
-%%DATADIR%%/resources/inspector/layers/LayersPanel.js
-%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js
 %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
-%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js
+%%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner_module.js
+%%DATADIR%%/resources/inspector/lighthouse_worker.js
+%%DATADIR%%/resources/inspector/lighthouse_worker/lighthouse_worker_module.js
+%%DATADIR%%/resources/inspector/lighthouse/lighthouse_module.js
+%%DATADIR%%/resources/inspector/lighthouse/lighthouse-legacy.js
+%%DATADIR%%/resources/inspector/lighthouse/lighthouse.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthousePanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseProtocolService.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportRenderer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js
 %%DATADIR%%/resources/inspector/main/main-legacy.js
 %%DATADIR%%/resources/inspector/main/main.js
-%%DATADIR%%/resources/inspector/main/MainImpl.js
-%%DATADIR%%/resources/inspector/main/SimpleApp.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/main/MainImpl.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/main/SimpleApp.js
+%%DATADIR%%/resources/inspector/media/media.js
+%%DATADIR%%/resources/inspector/media/media-legacy.js
 %%DATADIR%%/resources/inspector/media/media_module.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/ChevronTabbedPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventDisplayTable.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerPropertiesView.js
 %%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js
 %%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js
-%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js
-%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js
-%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js
-%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js
-%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js
-%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js
 %%DATADIR%%/resources/inspector/ndb_app.html
 %%DATADIR%%/resources/inspector/ndb_app.js
 %%DATADIR%%/resources/inspector/network/network_module.js
 %%DATADIR%%/resources/inspector/network/network-legacy.js
 %%DATADIR%%/resources/inspector/network/network.js
-%%DATADIR%%/resources/inspector/network/BinaryResourceView.js
-%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js
-%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js
-%%DATADIR%%/resources/inspector/network/HARWriter.js
-%%DATADIR%%/resources/inspector/network/NetworkConfigView.js
-%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js
-%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js
-%%DATADIR%%/resources/inspector/network/NetworkItemView.js
-%%DATADIR%%/resources/inspector/network/NetworkLogView.js
-%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js
-%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js
-%%DATADIR%%/resources/inspector/network/NetworkOverview.js
-%%DATADIR%%/resources/inspector/network/NetworkPanel.js
-%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js
-%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js
-%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js
-%%DATADIR%%/resources/inspector/network/RequestCookiesView.js
-%%DATADIR%%/resources/inspector/network/RequestHeadersView.js
-%%DATADIR%%/resources/inspector/network/RequestHTMLView.js
-%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js
-%%DATADIR%%/resources/inspector/network/RequestPreviewView.js
-%%DATADIR%%/resources/inspector/network/RequestResponseView.js
-%%DATADIR%%/resources/inspector/network/RequestTimingView.js
-%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js
-%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/HARWriter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkConfigView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkItemView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkOverview.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestCookiesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHeadersView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHTMLView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestPreviewView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js
 %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js
 %%DATADIR%%/resources/inspector/node_app.html
 %%DATADIR%%/resources/inspector/node_app.js
 %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
 %%DATADIR%%/resources/inspector/node_main/node_main-legacy.js
 %%DATADIR%%/resources/inspector/node_main/node_main.js
-%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js
-%%DATADIR%%/resources/inspector/node_main/NodeMain.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js
 %%DATADIR%%/resources/inspector/object_ui/object_ui_module.js
 %%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js
 %%DATADIR%%/resources/inspector/object_ui/object_ui.js
-%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js
-%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js
-%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js
-%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js
-%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js
-%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js
 %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js
 %%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js
 %%DATADIR%%/resources/inspector/perf_ui/perf_ui.js
-%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js
-%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js
-%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js
-%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js
-%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js
-%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js
-%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js
-%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js
-%%DATADIR%%/resources/inspector/perf_ui/PieChart.js
-%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js
-%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js
-%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js
 %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
-%%DATADIR%%/resources/inspector/persistence/Automapping.js
-%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js
-%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js
-%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js
-%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js
-%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js
 %%DATADIR%%/resources/inspector/persistence/persistence.js
 %%DATADIR%%/resources/inspector/persistence/persistence-legacy.js
-%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js
-%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js
-%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js
-%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js
-%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js
 %%DATADIR%%/resources/inspector/platform/platform.js
-%%DATADIR%%/resources/inspector/platform/utilities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler-legacy.js
 %%DATADIR%%/resources/inspector/profiler/profiler.js
-%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js
-%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js
-%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js
-%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js
-%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js
-%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js
-%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js
-%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js
-%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js
-%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js
-%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js
-%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js
-%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js
-%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js
-%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js
-%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js
-%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js
-%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js
-%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js
-%%DATADIR%%/resources/inspector/profiler/ProfileView.js
-%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js
-%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js
-%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js
-%%DATADIR%%/resources/inspector/protocol/NodeURL.js
-%%DATADIR%%/resources/inspector/protocol/protocol.js
-%%DATADIR%%/resources/inspector/protocol/protocol-legacy.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js
+%%DATADIR%%/resources/inspector/protocol_client/protocol_client-legacy.js
+%%DATADIR%%/resources/inspector/protocol_client/protocol_client.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/InspectorBackend.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/NodeURL.js
 %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
 %%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js
 %%DATADIR%%/resources/inspector/quick_open/quick_open.js
-%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js
-%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js
-%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js
-%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js
 %%DATADIR%%/resources/inspector/resources/resources_module.js
 %%DATADIR%%/resources/inspector/resources/resources-legacy.js
 %%DATADIR%%/resources/inspector/resources/resources.js
-%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js
-%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js
-%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js
-%%DATADIR%%/resources/inspector/resources/AppManifestView.js
-%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js
-%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js
-%%DATADIR%%/resources/inspector/resources/ClearStorageView.js
-%%DATADIR%%/resources/inspector/resources/CookieItemsView.js
-%%DATADIR%%/resources/inspector/resources/DatabaseModel.js
-%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js
-%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js
-%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js
-%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js
-%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js
-%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js
-%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js
-%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js
-%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js
-%%DATADIR%%/resources/inspector/resources/StorageItemsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ClearStorageView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/CookieItemsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js
 %%DATADIR%%/resources/inspector/root.js
-%%DATADIR%%/resources/inspector/Runtime.js
-%%DATADIR%%/resources/inspector/screencast/InputModel.js
+%%DATADIR%%/resources/inspector/root/root-legacy.js
+%%DATADIR%%/resources/inspector/root/root.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js
+%%DATADIR%%/resources/inspector/RuntimeInstantiator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js
 %%DATADIR%%/resources/inspector/screencast/screencast.js
 %%DATADIR%%/resources/inspector/screencast/screencast-legacy.js
-%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js
-%%DATADIR%%/resources/inspector/screencast/ScreencastView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js
 %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
-%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
-%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
-%%DATADIR%%/resources/inspector/sdk/Connections.js
-%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
-%%DATADIR%%/resources/inspector/sdk/Cookie.js
-%%DATADIR%%/resources/inspector/sdk/CookieModel.js
-%%DATADIR%%/resources/inspector/sdk/CookieParser.js
-%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js
-%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js
-%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js
-%%DATADIR%%/resources/inspector/sdk/CSSMedia.js
-%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js
-%%DATADIR%%/resources/inspector/sdk/CSSModel.js
-%%DATADIR%%/resources/inspector/sdk/CSSProperty.js
-%%DATADIR%%/resources/inspector/sdk/CSSRule.js
-%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js
-%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js
-%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js
-%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js
-%%DATADIR%%/resources/inspector/sdk/DOMModel.js
-%%DATADIR%%/resources/inspector/sdk/EmulationModel.js
-%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js
-%%DATADIR%%/resources/inspector/sdk/HARLog.js
-%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js
-%%DATADIR%%/resources/inspector/sdk/IsolateManager.js
-%%DATADIR%%/resources/inspector/sdk/IssuesModel.js
-%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js
-%%DATADIR%%/resources/inspector/sdk/LogModel.js
-%%DATADIR%%/resources/inspector/sdk/NetworkLog.js
-%%DATADIR%%/resources/inspector/sdk/NetworkManager.js
-%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js
-%%DATADIR%%/resources/inspector/sdk/OverlayModel.js
-%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js
-%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js
-%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js
-%%DATADIR%%/resources/inspector/sdk/RemoteObject.js
-%%DATADIR%%/resources/inspector/sdk/Resource.js
-%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js
-%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js
-%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js
-%%DATADIR%%/resources/inspector/sdk/Script.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSProperty.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSRule.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/EmulationModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HARLog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IsolateManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Issue.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RelatedIssue.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js
 %%DATADIR%%/resources/inspector/sdk/sdk.js
 %%DATADIR%%/resources/inspector/sdk/sdk-legacy.js
-%%DATADIR%%/resources/inspector/sdk/SDKModel.js
-%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js
-%%DATADIR%%/resources/inspector/sdk/ServerTiming.js
-%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js
-%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js
-%%DATADIR%%/resources/inspector/sdk/SourceMap.js
-%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js
-%%DATADIR%%/resources/inspector/sdk/TracingManager.js
-%%DATADIR%%/resources/inspector/sdk/TracingModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServerTiming.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js
 %%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm
-%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js
 %%DATADIR%%/resources/inspector/search/search_module.js
 %%DATADIR%%/resources/inspector/search/search-legacy.js
 %%DATADIR%%/resources/inspector/search/search.js
-%%DATADIR%%/resources/inspector/search/SearchConfig.js
-%%DATADIR%%/resources/inspector/search/SearchResultsPane.js
-%%DATADIR%%/resources/inspector/search/SearchView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchConfig.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchResultsPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js
 %%DATADIR%%/resources/inspector/security/security_module.js
 %%DATADIR%%/resources/inspector/security/security-legacy.js
 %%DATADIR%%/resources/inspector/security/security.js
-%%DATADIR%%/resources/inspector/security/SecurityModel.js
-%%DATADIR%%/resources/inspector/security/SecurityPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js
 %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js
-%%DATADIR%%/resources/inspector/services/ServiceManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/services/ServiceManager.js
 %%DATADIR%%/resources/inspector/services/services.js
 %%DATADIR%%/resources/inspector/services/services-legacy.js
 %%DATADIR%%/resources/inspector/settings/settings_module.js
 %%DATADIR%%/resources/inspector/settings/settings-legacy.js
 %%DATADIR%%/resources/inspector/settings/settings.js
-%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js
-%%DATADIR%%/resources/inspector/settings/SettingsScreen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js
 %%DATADIR%%/resources/inspector/shell.js
 %%DATADIR%%/resources/inspector/snippets/snippets_module.js
 %%DATADIR%%/resources/inspector/snippets/snippets-legacy.js
 %%DATADIR%%/resources/inspector/snippets/snippets.js
-%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js
-%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js
 %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js
 %%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js
 %%DATADIR%%/resources/inspector/source_frame/source_frame.js
-%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js
-%%DATADIR%%/resources/inspector/source_frame/FontView.js
-%%DATADIR%%/resources/inspector/source_frame/ImageView.js
-%%DATADIR%%/resources/inspector/source_frame/JSONView.js
-%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js
-%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js
-%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js
-%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js
-%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js
-%%DATADIR%%/resources/inspector/source_frame/XMLView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/FontView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ImageView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/JSONView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js
 %%DATADIR%%/resources/inspector/sources/sources_module.js
 %%DATADIR%%/resources/inspector/sources/sources-legacy.js
 %%DATADIR%%/resources/inspector/sources/sources.js
-%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js
-%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js
-%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js
-%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js
-%%DATADIR%%/resources/inspector/sources/CSSPlugin.js
-%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js
-%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js
-%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js
-%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js
-%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js
-%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js
-%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js
-%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js
-%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js
-%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js
-%%DATADIR%%/resources/inspector/sources/NavigatorView.js
-%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js
-%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js
-%%DATADIR%%/resources/inspector/sources/Plugin.js
-%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js
-%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js
-%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js
-%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js
-%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js
-%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js
-%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js
-%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js
-%%DATADIR%%/resources/inspector/sources/SourcesPanel.js
-%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js
-%%DATADIR%%/resources/inspector/sources/SourcesView.js
-%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js
-%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js
-%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js
-%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CSSPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/NavigatorView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesPanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js
 %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js
 %%DATADIR%%/resources/inspector/test_runner/test_runner.js
-%%DATADIR%%/resources/inspector/test_runner/TestRunner.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js
 %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
-%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js
-%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js
 %%DATADIR%%/resources/inspector/text_editor/text_editor.js
 %%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js
-%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js
 %%DATADIR%%/resources/inspector/text_utils/text_utils.js
 %%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js
-%%DATADIR%%/resources/inspector/text_utils/Text.js
-%%DATADIR%%/resources/inspector/text_utils/TextCursor.js
-%%DATADIR%%/resources/inspector/text_utils/TextRange.js
-%%DATADIR%%/resources/inspector/text_utils/TextUtils.js
-%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmDis.js
-%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmParser.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/ContentProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/StaticContentProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/Text.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar-XB.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/bg.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ca.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/cs.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/da.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/de.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/el.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-GB.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-US.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-XA.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/en-XL.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/es-419.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/es.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fi.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fil.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/fr.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/he.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hi.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hr.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/hu.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/id.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/it.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ja.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ko.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/lt.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/lv.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/nl.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/no.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pl.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pt-PT.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/pt.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ro.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ru.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sk.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sl.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sr-Latn.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sr.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/sv.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ta.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/te.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/th.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/tr.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/uk.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/vi.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-HK.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-TW.json
+%%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh.json
+%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report-generator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmDis.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmParser.js
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js
-%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js
-%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js
 %%DATADIR%%/resources/inspector/timeline/timeline_module.js
 %%DATADIR%%/resources/inspector/timeline/timeline-legacy.js
 %%DATADIR%%/resources/inspector/timeline/timeline.js
-%%DATADIR%%/resources/inspector/timeline/CountersGraph.js
-%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js
-%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js
-%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js
-%%DATADIR%%/resources/inspector/timeline/TimelineController.js
-%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js
-%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js
-%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js
-%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js
-%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js
-%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js
-%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js
-%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js
-%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js
-%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js
-%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js
-%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js
-%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js
-%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js
-%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js
 %%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
-%%DATADIR%%/resources/inspector/ui/Action.js
-%%DATADIR%%/resources/inspector/ui/ActionDelegate.js
-%%DATADIR%%/resources/inspector/ui/ActionRegistry.js
-%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
-%%DATADIR%%/resources/inspector/ui/Context.js
-%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js
-%%DATADIR%%/resources/inspector/ui/ContextMenu.js
-%%DATADIR%%/resources/inspector/ui/Dialog.js
-%%DATADIR%%/resources/inspector/ui/DropTarget.js
-%%DATADIR%%/resources/inspector/ui/EmptyWidget.js
-%%DATADIR%%/resources/inspector/ui/FilterBar.js
-%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js
-%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js
-%%DATADIR%%/resources/inspector/ui/Fragment.js
-%%DATADIR%%/resources/inspector/ui/Geometry.js
-%%DATADIR%%/resources/inspector/ui/GlassPane.js
-%%DATADIR%%/resources/inspector/ui/HistoryInput.js
-%%DATADIR%%/resources/inspector/ui/Icon.js
-%%DATADIR%%/resources/inspector/ui/Infobar.js
-%%DATADIR%%/resources/inspector/ui/InplaceEditor.js
-%%DATADIR%%/resources/inspector/ui/InspectorView.js
-%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js
-%%DATADIR%%/resources/inspector/ui/ListControl.js
-%%DATADIR%%/resources/inspector/ui/ListModel.js
-%%DATADIR%%/resources/inspector/ui/ListWidget.js
-%%DATADIR%%/resources/inspector/ui/Panel.js
-%%DATADIR%%/resources/inspector/ui/PopoverHelper.js
-%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js
-%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js
-%%DATADIR%%/resources/inspector/ui/ReportView.js
-%%DATADIR%%/resources/inspector/ui/ResizerWidget.js
-%%DATADIR%%/resources/inspector/ui/RootView.js
-%%DATADIR%%/resources/inspector/ui/SearchableView.js
-%%DATADIR%%/resources/inspector/ui/SegmentedButton.js
-%%DATADIR%%/resources/inspector/ui/SettingsUI.js
-%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js
-%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js
-%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js
-%%DATADIR%%/resources/inspector/ui/SoftDropDown.js
-%%DATADIR%%/resources/inspector/ui/SplitWidget.js
-%%DATADIR%%/resources/inspector/ui/SuggestBox.js
-%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js
-%%DATADIR%%/resources/inspector/ui/TabbedPane.js
-%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js
-%%DATADIR%%/resources/inspector/ui/TextEditor.js
-%%DATADIR%%/resources/inspector/ui/TextPrompt.js
-%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js
-%%DATADIR%%/resources/inspector/ui/Toolbar.js
-%%DATADIR%%/resources/inspector/ui/Tooltip.js
-%%DATADIR%%/resources/inspector/ui/Treeoutline.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Action.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionDelegate.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextMenu.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Dialog.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DropTarget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/EmptyWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterBar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Fragment.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Geometry.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/GlassPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/HistoryInput.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Icon.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Infobar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InplaceEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InspectorView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListControl.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Panel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/PopoverHelper.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ReportView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ResizerWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RootView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SearchableView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SegmentedButton.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SettingsUI.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SplitWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SuggestBox.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TabbedPane.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextEditor.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextPrompt.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Toolbar.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js
 %%DATADIR%%/resources/inspector/ui/ui.js
 %%DATADIR%%/resources/inspector/ui/ui-legacy.js
-%%DATADIR%%/resources/inspector/ui/UIUtils.js
-%%DATADIR%%/resources/inspector/ui/View.js
-%%DATADIR%%/resources/inspector/ui/ViewManager.js
-%%DATADIR%%/resources/inspector/ui/Widget.js
-%%DATADIR%%/resources/inspector/ui/XElement.js
-%%DATADIR%%/resources/inspector/ui/XLink.js
-%%DATADIR%%/resources/inspector/ui/XWidget.js
-%%DATADIR%%/resources/inspector/ui/ZoomManager.js
-%%DATADIR%%/resources/inspector/ui/utils/append-style.js
-%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js
-%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js
-%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js
-%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js
-%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js
-%%DATADIR%%/resources/inspector/ui/utils/utils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XLink.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XWidget.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ZoomManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/append-style.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/utils.js
 %%DATADIR%%/resources/inspector/wasmparser_worker_entrypoint.js
 %%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js
-%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js
 %%DATADIR%%/resources/inspector/web_audio/web_audio_module.js
 %%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js
 %%DATADIR%%/resources/inspector/web_audio/web_audio.js
-%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js
-%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js
-%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js
-%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js
-%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js
 %%DATADIR%%/resources/inspector/worker_app.html
 %%DATADIR%%/resources/inspector/worker_app.js
 %%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js
 %%DATADIR%%/resources/inspector/worker_main/worker_main.js
-%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/worker_service/ServiceDispatcher.js
+%%DATADIR%%/resources/inspector/worker_service/worker_service.js
 %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
 %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js
 %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js
-%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js
-%%DATADIR%%/resources/inspector/workspace/FileManager.js
-%%DATADIR%%/resources/inspector/workspace/UISourceCode.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/FileManager.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/UISourceCode.js
 %%DATADIR%%/resources/inspector/workspace/workspace.js
 %%DATADIR%%/resources/inspector/workspace/workspace-legacy.js
-%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js
+%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js
 %%DATADIR%%/snapshot_blob.bin
 %%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
 %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so
author	Joseph Mingrone <jrm@FreeBSD.org>	2020-06-02 20:30:55 +0000
committer	Joseph Mingrone <jrm@FreeBSD.org>	2020-06-02 20:30:55 +0000
commit	8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch)
tree	c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium
parent	b4ee67cd6bdd0a733edfee761f44188e836f6165 (diff)
download	ports-8f6dc7d1dd8b0ca59427d71524538aab9403ac23.tar.gz ports-8f6dc7d1dd8b0ca59427d71524538aab9403ac23.zip