www/chromium: update to 74.0.3729.157

Submitted by:	Matthias Wolf via GitHub (#150 #151)
MFH:		2019Q2

298 files changed, 2172 insertions, 1311 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 4c2c9774c1b7..1d9eadb7691e 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	73.0.3683.103
-PORTREVISION=	2
+PORTVERSION=	74.0.3729.157
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 06c39b4e14b1..0b9e21d4070d 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1554469972
-SHA256 (chromium-73.0.3683.103.tar.xz) = eb02c419de98bb8849fd0a37a3e7bbb813938c37e3d6b2c2526df3e84f9653af
-SIZE (chromium-73.0.3683.103.tar.xz) = 710804864
-SHA256 (chromium-73.0.3683.103-testdata.tar.xz) = 91332c838df414e373721a07a8ae609ca5abd0d1a9f341b2de91b5c55827cbb3
-SIZE (chromium-73.0.3683.103-testdata.tar.xz) = 352670716
+TIMESTAMP = 1558103760
+SHA256 (chromium-74.0.3729.157.tar.xz) = dcbe311d6ba7124496beca4a7ae401ac072c1f8e1a47d17b0919dba1b5962e06
+SIZE (chromium-74.0.3729.157.tar.xz) = 743051004
+SHA256 (chromium-74.0.3729.157-testdata.tar.xz) = fccea72fcbe732495fbfe2b22815fc0a238b459fa88e8fa2ddfc8aaa52492ff9
+SIZE (chromium-74.0.3729.157-testdata.tar.xz) = 350162436
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index a3a254dc8c72..52112d8a9775 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2019-03-11 22:00:51 UTC
+--- BUILD.gn.orig	2019-04-30 22:22:25 UTC
 +++ BUILD.gn
-@@ -381,7 +381,7 @@ group("gn_all") {
+@@ -387,7 +387,7 @@ group("gn_all") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -422,8 +422,6 @@ group("gn_all") {
+@@ -428,8 +428,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -18,7 +18,7 @@
        "//testing:empty_main",
      ]
  
-@@ -480,10 +478,6 @@ group("gn_all") {
+@@ -486,10 +484,6 @@ group("gn_all") {
          "//chrome/test/chromedriver:chromedriver",
          "//chrome/test/chromedriver:chromedriver_tests",
          "//components/sync:run_sync_testserver",
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -538,10 +532,6 @@ group("gn_all") {
+@@ -544,10 +538,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -615,7 +605,7 @@ group("gn_all") {
+@@ -621,7 +611,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)" ]
    }
  
-@@ -873,7 +863,6 @@ if (is_chromeos) {
+@@ -878,7 +868,6 @@ if (is_chromeos) {
        "//ppapi/examples/video_decode",
        "//sandbox/linux:chrome_sandbox",
        "//sandbox/linux:sandbox_linux_unittests",
@@ -57,7 +57,7 @@
  
        # Blocked on https://github.com/catapult-project/catapult/issues/2297
        #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1001,7 +990,7 @@ if (!is_ios) {
+@@ -1029,7 +1018,7 @@ if (!is_ios) {
        ]
      }
  
@@ -66,7 +66,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1010,7 +999,7 @@ if (!is_ios) {
+@@ -1038,7 +1027,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -75,7 +75,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1150,9 +1139,6 @@ group("chromium_builder_perf") {
+@@ -1178,9 +1167,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index fe66632d5301..44ecb3b6b17d 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2019-03-11 22:00:51 UTC
+--- base/BUILD.gn.orig	2019-04-30 22:22:27 UTC
 +++ base/BUILD.gn
-@@ -1185,7 +1185,7 @@ jumbo_component("base") {
+@@ -1188,7 +1188,7 @@ jumbo_component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -9,7 +9,7 @@
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
-@@ -1211,7 +1211,7 @@ jumbo_component("base") {
+@@ -1214,7 +1214,7 @@ jumbo_component("base") {
          "allocator/allocator_shim_override_glibc_weak_symbols.h",
        ]
        deps += [ "//base/allocator:tcmalloc" ]
@@ -18,7 +18,7 @@
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-@@ -1751,6 +1751,33 @@ jumbo_component("base") {
+@@ -1764,6 +1764,33 @@ jumbo_component("base") {
      }
    }
  
@@ -52,7 +52,7 @@
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -2808,6 +2835,12 @@ test("base_unittests") {
+@@ -2840,6 +2867,12 @@ test("base_unittests") {
      ]
      set_sources_assignment_filter(sources_assignment_filter)
    }
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc
index 29953f7af98a..24588a8948d6 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc
@@ -1,11 +1,11 @@
---- base/allocator/allocator_shim.cc.orig	2019-03-11 22:00:51 UTC
+--- base/allocator/allocator_shim.cc.orig	2019-04-30 22:22:27 UTC
 +++ base/allocator/allocator_shim.cc
-@@ -70,7 +70,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
+@@ -69,7 +69,7 @@ inline const base::allocator::AllocatorDispatch* GetCh
    // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
    // barriered on Linux+Clang, and that causes visible perf regressons.
-   return reinterpret_cast<const allocator::AllocatorDispatch*>(
+   return reinterpret_cast<const base::allocator::AllocatorDispatch*>(
 -#if defined(OS_LINUX) && defined(__clang__)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__)
-       *static_cast<const volatile subtle::AtomicWord*>(&g_chain_head)
+       *static_cast<const volatile base::subtle::AtomicWord*>(&g_chain_head)
  #else
-       subtle::NoBarrier_Load(&g_chain_head)
+       base::subtle::NoBarrier_Load(&g_chain_head)
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 853a5c49dcb1..e05b85fec4a9 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,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-03-11 22:00:51 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-04-30 22:22:27 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -14,7 +14,7 @@
  #if defined(OS_MACOSX)
@@ -27,7 +27,7 @@
  
  void* SystemAllocPagesInternal(void* hint,
                                 size_t length,
-@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
+@@ -144,7 +144,7 @@ void SetSystemPagesAccessInternal(
  void FreePagesInternal(void* address, size_t length) {
    CHECK(!munmap(address, length));
  
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc
new file mode 100644
index 000000000000..d7597eaaafa6
--- /dev/null
+++ b/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -0,0 +1,18 @@
+--- base/debug/elf_reader.cc.orig	2019-04-30 22:22:28 UTC
++++ base/debug/elf_reader.cc
+@@ -82,6 +82,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+         reinterpret_cast<const Nhdr*>(elf_base + header.p_offset);
+     bool found = false;
+     while (current_note < section_end) {
++#if !defined(OS_BSD)
+       if (current_note->n_type == NT_GNU_BUILD_ID) {
+         const char* note_name =
+             reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
+@@ -91,6 +92,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+           break;
+         }
+       }
++#endif
+ 
+       current_note = reinterpret_cast<const Nhdr*>(
+           reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
diff --git a/www/chromium/files/patch-base_debug_elf__reader__linux.cc b/www/chromium/files/patch-base_debug_elf__reader__linux.cc
deleted file mode 100644
index b0e23be85bc6..000000000000
--- a/www/chromium/files/patch-base_debug_elf__reader__linux.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/debug/elf_reader_linux.cc.orig	2019-03-11 22:00:51 UTC
-+++ base/debug/elf_reader_linux.cc
-@@ -41,8 +41,10 @@ Optional<std::string> ElfSegmentBuildIDNoteAsString(co
-   const void* section_end = segment.data() + segment.size_bytes();
-   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
-   while (note_header < section_end) {
-+#if !defined(OS_BSD)
-     if (note_header->n_type == NT_GNU_BUILD_ID)
-       break;
-+#endif
-     note_header = reinterpret_cast<const Nhdr*>(
-         reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
-         bits::Align(note_header->n_namesz, 4) +
diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc
index 1b23810f1b9d..25c8b6849e54 100644
--- a/www/chromium/files/patch-base_files_file__path__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_unittest.cc.orig	2019-03-11 22:00:51 UTC
+--- base/files/file_path_unittest.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/files/file_path_unittest.cc
-@@ -1138,7 +1138,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) 
+@@ -1139,7 +1139,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) 
        "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
    };
  
diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h
index 171e3d8786ec..8b78f44f3adf 100644
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@@ -1,6 +1,6 @@
---- base/files/file_util.h.orig	2019-03-11 22:00:51 UTC
+--- base/files/file_util.h.orig	2019-04-30 22:22:28 UTC
 +++ base/files/file_util.h
-@@ -445,7 +445,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -449,7 +449,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
  // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
  BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
  
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
index 53f299987dca..7f2f83724dfe 100644
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -1,6 +1,6 @@
---- base/logging_unittest.cc.orig	2019-03-11 22:00:51 UTC
+--- base/logging_unittest.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/logging_unittest.cc
-@@ -420,7 +420,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -421,7 +421,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/chromium/files/patch-base_memory_protected__memory__posix.cc b/www/chromium/files/patch-base_memory_protected__memory__posix.cc
new file mode 100644
index 000000000000..988ce327bbf2
--- /dev/null
+++ b/www/chromium/files/patch-base_memory_protected__memory__posix.cc
@@ -0,0 +1,31 @@
+--- base/memory/protected_memory_posix.cc.orig	2019-05-01 17:25:41 UTC
++++ base/memory/protected_memory_posix.cc
+@@ -8,9 +8,9 @@
+ #include <sys/mman.h>
+ #include <unistd.h>
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/resource.h>
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+ #include <mach/mach.h>
+@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
+   return SetMemory(start, end, PROT_READ);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void AssertMemoryIsReadOnly(const void* ptr) {
+ #if DCHECK_IS_ON()
+   const uintptr_t page_mask = ~(base::GetPageSize() - 1);
+@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
+   DCHECK_EQ(region_info.protection, VM_PROT_READ);
+ #endif  // DCHECK_IS_ON()
+ }
+-#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
+ 
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index c1b9c706ab46..4bedd7017e8f 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,6 +1,6 @@
---- base/process/launch.h.orig	2019-03-11 22:00:51 UTC
+--- base/process/launch.h.orig	2019-04-30 22:22:28 UTC
 +++ base/process/launch.h
-@@ -175,7 +175,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -179,7 +179,7 @@ struct BASE_EXPORT LaunchOptions {
    FileHandleMappingVector fds_to_remap;
  #endif  // defined(OS_WIN)
  
@@ -9,12 +9,12 @@
    // If non-zero, start the process using clone(), using flags as provided.
    // Unlike in clone, clone_flags may not contain a custom termination signal
    // that is sent to the parent when the child dies. The termination signal will
-@@ -188,7 +188,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
  
    // Sets parent process death signal to SIGKILL.
    bool kill_on_parent_death = false;
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
- #if defined(OS_FUCHSIA)
-   // If valid, launches the application in that job object.
+ #if defined(OS_MACOSX) && !defined(OS_IOS)
+   // Mach ports that will be accessible to the child process. These are not
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index e7669ac0afe0..9f7731d5b8ec 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics.cc.orig	2019-03-21 01:36:27.000000000 +0100
-+++ base/process/process_metrics.cc	2019-03-24 19:52:47.516944000 +0100
-@@ -126,7 +126,7 @@
+--- base/process/process_metrics.cc.orig	2019-04-30 22:22:28 UTC
++++ base/process/process_metrics.cc
+@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
  }
  #endif
  
@@ -9,7 +9,7 @@
  int ProcessMetrics::CalculateIdleWakeupsPerSecond(
      uint64_t absolute_idle_wakeups) {
    return CalculateEventsPerSecond(absolute_idle_wakeups,
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() {
    NOTIMPLEMENTED();  // http://crbug.com/120488
    return 0;
  }
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index e802ac53ea1d..1b3e36d74918 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,6 +1,6 @@
---- base/process/process_metrics.h.orig	2019-03-21 01:36:27.000000000 +0100
-+++ base/process/process_metrics.h	2019-03-24 19:51:50.158637000 +0100
-@@ -41,7 +41,7 @@
+--- base/process/process_metrics.h.orig	2019-04-30 22:22:28 UTC
++++ base/process/process_metrics.h
+@@ -41,7 +41,7 @@ namespace base {
  // Full declaration is in process_metrics_iocounters.h.
  struct IoCounters;
  
@@ -9,7 +9,7 @@
  // Minor and major page fault counts since the process creation.
  // Both counts are process-wide, and exclude child processes.
  //
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ struct PageFaultCounts {
    int64_t minor;
    int64_t major;
  };
@@ -18,7 +18,7 @@
  
  // Convert a POSIX timeval to microseconds.
  BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv);
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics {
    // convenience wrapper for CreateProcessMetrics().
    static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
  
@@ -27,7 +27,7 @@
    // Resident Set Size is a Linux/Android specific memory concept. Do not
    // attempt to extend this to other platforms.
    BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -199,14 +199,14 @@
+@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics {
    int GetOpenFdSoftLimit() const;
  #endif  // defined(OS_POSIX)
  
@@ -44,7 +44,7 @@
  
    // Returns total memory usage of malloc.
    size_t GetMallocUsage();
-@@ -218,7 +218,7 @@
+@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics {
    ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
  #endif  // !defined(OS_MACOSX) || defined(OS_IOS)
  
@@ -53,7 +53,7 @@
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if defined(OS_MACOSX)
-@@ -247,7 +247,7 @@
+@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
    // Number of bytes transferred to/from disk in bytes.
    uint64_t last_cumulative_disk_usage_ = 0;
  
@@ -62,7 +62,7 @@
    // Same thing for idle wakeups.
    TimeTicks last_idle_wakeups_time_;
    uint64_t last_absolute_idle_wakeups_;
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
  #endif  // defined(OS_POSIX)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
@@ -71,7 +71,7 @@
  // Data about system-wide memory consumption. Values are in KB. Available on
  // Windows, Mac, Linux, Android and Chrome OS.
  //
-@@ -326,7 +326,7 @@
+@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
    int avail_phys = 0;
  #endif
  
@@ -80,7 +80,7 @@
    // This provides an estimate of available memory as described here:
    // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
    // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -341,7 +341,7 @@
+@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
@@ -89,7 +89,7 @@
    int buffers = 0;
    int cached = 0;
    int active_anon = 0;
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
    int dirty = 0;
    int reclaimable = 0;
  #endif  // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) ||
@@ -98,7 +98,7 @@
  
  #if defined(OS_CHROMEOS)
    int shmem = 0;
-@@ -377,9 +377,9 @@
+@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
  
  #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
@@ -110,3 +110,12 @@
  // Parse the data found in /proc/<pid>/stat and return the sum of the
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
+@@ -452,7 +452,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
+ // Returns the amount of time spent in user space since boot across all CPUs.
+ BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot();
+ 
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 
+ #if defined(OS_CHROMEOS)
+ // Data from files in directory /sys/block/zram0 about ZRAM usage.
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
index ece7783ef208..c75d66fbff8a 100644
--- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,5 +1,5 @@
---- base/process/process_metrics_freebsd.cc.orig	2019-03-21 01:36:27.000000000 +0100
-+++ base/process/process_metrics_freebsd.cc	2019-03-24 22:18:22.764297000 +0100
+--- base/process/process_metrics_freebsd.cc.orig	2019-04-30 22:22:28 UTC
++++ base/process/process_metrics_freebsd.cc
 @@ -5,6 +5,7 @@
  #include "base/process/process_metrics.h"
  
@@ -26,7 +26,7 @@
  
  // static
  std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -69,4 +74,93 @@
+@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() {
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
  }
  
diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc
index 3131d65c8d40..c46d71f83add 100644
--- a/www/chromium/files/patch-base_security__unittest.cc
+++ b/www/chromium/files/patch-base_security__unittest.cc
@@ -1,6 +1,6 @@
---- base/security_unittest.cc.orig	2019-03-11 22:00:51 UTC
+--- base/security_unittest.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/security_unittest.cc
-@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
+@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
  // FAILS_ is too clunky.
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
    if (!overflow_detected) {
diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc
new file mode 100644
index 000000000000..fa3ce0e07bca
--- /dev/null
+++ b/www/chromium/files/patch-base_syslog__logging.cc
@@ -0,0 +1,20 @@
+--- base/syslog_logging.cc.orig	2019-05-01 17:21:47 UTC
++++ base/syslog_logging.cc
+@@ -9,7 +9,7 @@
+ #include "base/bind.h"
+ #include "base/callback_helpers.h"
+ #include "base/debug/stack_trace.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
+ // base::LOG_INFO, base::LOG_WARNING.
+ #include <syslog.h>
+@@ -94,7 +94,7 @@ EventLogMessage::~EventLogMessage() {
+                     1, 0, strings, nullptr)) {
+     stream() << " !!NOT ADDED TO EVENTLOG!!";
+   }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   const char kEventSource[] = "chrome";
+   openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
+   // We can't use the defined names for the logging severity from syslog.h
diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc
index 3147b0da5500..84ab212f4877 100644
--- a/www/chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/system/sys_info_posix.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/system/sys_info_posix.cc
 @@ -38,7 +38,7 @@
  
@@ -27,7 +27,7 @@
  int SysInfo::NumberOfProcessors() {
    return g_lazy_number_of_processors.Get().value();
  }
-@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -227,6 +227,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/chromium/files/patch-base_test_fontconfig__util__linux.cc b/www/chromium/files/patch-base_test_fontconfig__util__linux.cc
new file mode 100644
index 000000000000..829fc318a257
--- /dev/null
+++ b/www/chromium/files/patch-base_test_fontconfig__util__linux.cc
@@ -0,0 +1,408 @@
+--- base/test/fontconfig_util_linux.cc.orig	2019-04-30 22:22:28 UTC
++++ base/test/fontconfig_util_linux.cc
+@@ -6,24 +6,397 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ 
+-#include <memory>
+-
+ #include "base/base_paths.h"
+ #include "base/environment.h"
+ #include "base/files/file_path.h"
++#include "base/files/file_util.h"
+ #include "base/logging.h"
++#include "base/macros.h"
+ #include "base/path_service.h"
++#include "base/strings/string_util.h"
+ 
+ namespace base {
+ 
++namespace {
++
++const char kFontsConfTemplate[] = R"(<?xml version="1.0"?>
++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
++<fontconfig>
++
++  <!-- Cache location. -->
++  <cachedir>$1</cachedir>
++
++  <!-- GCS-synced fonts. -->
++  <dir>$2</dir>
++
++  <!-- Default properties. -->
++  <match target="font">
++    <edit name="embeddedbitmap" mode="append_last">
++      <bool>false</bool>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Times</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>sans</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>DejaVu Sans</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>sans serif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++  </match>
++
++  <!-- Some layout tests specify Helvetica as a family and we need to make sure
++       that we don't fallback to Tinos for them -->
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Helvetica</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>sans-serif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>serif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>mono</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Cousine</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>monospace</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Cousine</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Courier</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Cousine</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>cursive</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Comic Sans MS</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>fantasy</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Impact</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Monaco</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Arial</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Courier New</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Cousine</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Georgia</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Gelasio</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Times New Roman</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test qual="any" name="family">
++      <string>Verdana</string>
++    </test>
++    <!-- NOT metrically compatible! -->
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++  </match>
++
++  <!-- TODO(thomasanderson): Move these configs to be test-specific. -->
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>NonAntiAliasedSans</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="antialias" mode="assign">
++      <bool>false</bool>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>SlightHintedGeorgia</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Gelasio</string>
++    </edit>
++    <edit name="hintstyle" mode="assign">
++      <const>hintslight</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>NonHintedSans</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <!-- These deliberately contradict each other. The 'hinting' preference
++         should take priority -->
++    <edit name="hintstyle" mode="assign">
++      <const>hintfull</const>
++    </edit>
++   <edit name="hinting" mode="assign">
++      <bool>false</bool>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>AutohintedSerif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="autohint" mode="assign">
++      <bool>true</bool>
++    </edit>
++    <edit name="hintstyle" mode="assign">
++      <const>hintmedium</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>HintedSerif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="autohint" mode="assign">
++      <bool>false</bool>
++    </edit>
++    <edit name="hintstyle" mode="assign">
++      <const>hintmedium</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>FullAndAutoHintedSerif</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="autohint" mode="assign">
++      <bool>true</bool>
++    </edit>
++    <edit name="hintstyle" mode="assign">
++      <const>hintfull</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>SubpixelEnabledArial</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="rgba" mode="assign">
++      <const>rgb</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>SubpixelDisabledArial</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Arimo</string>
++    </edit>
++    <edit name="rgba" mode="assign">
++      <const>none</const>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <!-- FontConfig doesn't currently provide a well-defined way to turn on
++         subpixel positioning.  This is just an arbitrary pattern to use after
++         turning subpixel positioning on globally to ensure that we don't have
++         issues with our style getting cached for other tests. -->
++    <test name="family" compare="eq">
++      <string>SubpixelPositioning</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <!-- See comments above -->
++    <test name="family" compare="eq">
++      <string>SubpixelPositioningAhem</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>ahem</string>
++    </edit>
++  </match>
++
++  <match target="pattern">
++    <test name="family" compare="eq">
++      <string>SlightHintedTimesNewRoman</string>
++    </test>
++    <edit name="family" mode="assign">
++      <string>Tinos</string>
++    </edit>
++    <edit name="hintstyle" mode="assign">
++      <const>hintslight</const>
++    </edit>
++  </match>
++
++  <!-- When we encounter a character that the current font doesn't
++       support, gfx::GetFallbackFontForChar() returns the first font
++       that does have a glyph for the character. The list of fonts is
++       sorted by a pattern that includes the current locale, but doesn't
++       include a font family (which means that the fallback font depends
++       on the locale but not on the current font).
++
++       DejaVu Sans is commonly the only font that supports some
++       characters, such as "⇧", and even when other candidates are
++       available, DejaVu Sans is commonly first among them, because of
++       the way Fontconfig is ordinarily configured. For example, the
++       configuration in the Fonconfig source lists DejaVu Sans under the
++       sans-serif generic family, and appends sans-serif to patterns
++       that don't already include a generic family (such as the pattern
++       in gfx::GetFallbackFontForChar()).
++
++       To get the same fallback font in the layout tests, we could
++       duplicate this configuration here, or more directly, simply
++       append DejaVu Sans to all patterns. -->
++  <match target="pattern">
++    <edit name="family" mode="append_last">
++      <string>DejaVu Sans</string>
++    </edit>
++  </match>
++
++</fontconfig>
++)";
++
++}  // namespace
++
+ void SetUpFontconfig() {
+-  FilePath dir_module;
+-  CHECK(PathService::Get(DIR_MODULE, &dir_module));
++  std::unique_ptr<Environment> env = Environment::Create();
++  if (!env->HasVar("FONTCONFIG_FILE")) {
++    // fonts.conf must be generated on-the-fly since it contains absolute paths
++    // which may be different if
++    //   1. The user moves/renames their build directory (or any parent dirs).
++    //   2. The build directory is mapped on a swarming bot at a location
++    //      different from the one the buildbot used.
++    FilePath dir_module;
++    PathService::Get(DIR_MODULE, &dir_module);
++    FilePath font_cache = dir_module.Append("fontconfig_caches");
++    FilePath test_fonts = dir_module.Append("test_fonts");
++    std::string fonts_conf = ReplaceStringPlaceholders(
++        kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr);
+ 
+-  std::unique_ptr<Environment> env(Environment::Create());
+-  // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf.
+-  // Prevent fontconfig from doing this.
+-  CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));
++    // Write the data to a different file and then atomically rename it to
++    // fonts.conf.  This avoids the file being in a bad state when different
++    // parallel tests call this function at the same time.
++    FilePath fonts_conf_file_temp;
++    if(!CreateTemporaryFileInDir(dir_module, &fonts_conf_file_temp))
++      CHECK(CreateTemporaryFile(&fonts_conf_file_temp));
++    CHECK(
++        WriteFile(fonts_conf_file_temp, fonts_conf.c_str(), fonts_conf.size()));
++    FilePath fonts_conf_file = dir_module.Append("fonts.conf");
++    if (ReplaceFile(fonts_conf_file_temp, fonts_conf_file, nullptr))
++      env->SetVar("FONTCONFIG_FILE", fonts_conf_file.value());
++    else
++      env->SetVar("FONTCONFIG_FILE", fonts_conf_file_temp.value());
++  }
+ }
+ 
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
index 8f0f114e6c7a..4a18a5c14a76 100644
--- a/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
+++ b/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
@@ -1,7 +1,15 @@
---- base/test/generate_fontconfig_caches.cc.orig	2019-03-11 22:00:51 UTC
+--- base/test/generate_fontconfig_caches.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/test/generate_fontconfig_caches.cc
-@@ -57,7 +57,14 @@ int main() {
-   base::TearDownFontconfig();
+@@ -52,14 +52,21 @@ int main() {
+ 
+   // Delete directory before generating fontconfig caches. This will notify
+   // future fontconfig_caches changes.
+-  CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true));
+ 
++  CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true));
+   base::SetUpFontconfig();
+   FcInit();
+   FcFini();
  
    // Check existence of intended fontconfig cache file.
 +#if defined(OS_BSD)
diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
index d390e812f5e3..d5d823c37bf0 100644
--- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
+++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
@@ -1,13 +1,13 @@
---- base/threading/thread_task_runner_handle.cc.orig	2019-03-11 22:00:51 UTC
+--- base/threading/thread_task_runner_handle.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/threading/thread_task_runner_handle.cc
-@@ -7,6 +7,7 @@
+@@ -8,6 +8,7 @@
  #include <utility>
  
  #include "base/bind.h"
 +#include "base/callback_helpers.h"
  #include "base/lazy_instance.h"
  #include "base/logging.h"
- #include "base/memory/ptr_util.h"
+ #include "base/run_loop.h"
 @@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
    return !!thread_task_runner_tls.Pointer()->Get();
  }
@@ -16,7 +16,7 @@
  // static
  ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
      scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
+@@ -81,6 +83,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
        base::Unretained(ttrh->task_runner_.get()),
        std::move(no_running_during_override)));
  }
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index f8c73c611a35..81d85a46f061 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,11 +1,11 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2019-03-11 22:00:51 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2019-04-30 22:22:28 UTC
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -17,6 +17,8 @@
  
  #if defined(OS_MACOSX)
  #include <malloc/malloc.h>
 +#elif defined(OS_BSD)
-+#include "stdlib.h"
++#include <stdlib.h>
  #else
  #include <malloc.h>
  #endif
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 432594251e67..992a193c9313 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	2019-03-11 22:00:52 UTC
+--- build/config/BUILD.gn.orig	2019-04-30 22:22:28 UTC
 +++ build/config/BUILD.gn
 @@ -162,7 +162,7 @@ config("debug") {
        # builds, and we have to tell it to turn it off.
@@ -19,7 +19,7 @@
      ]
    }
  }
-@@ -342,7 +340,7 @@ config("executable_config") {
+@@ -346,7 +344,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_allocator.gni b/www/chromium/files/patch-build_config_allocator.gni
index 49c04a7928c4..c4177a1cdd52 100644
--- a/www/chromium/files/patch-build_config_allocator.gni
+++ b/www/chromium/files/patch-build_config_allocator.gni
@@ -1,4 +1,4 @@
---- build/config/allocator.gni.orig	2019-03-11 22:00:52 UTC
+--- build/config/allocator.gni.orig	2019-04-30 22:22:28 UTC
 +++ build/config/allocator.gni
 @@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
  
@@ -12,9 +12,9 @@
 @@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
  # against the debug CRT with "is_nacl=false".
  if ((is_linux || is_android || is_mac ||
-      (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
--    !is_tsan && !is_msan) {
-+    !is_tsan && !is_msan && !is_bsd) {
+      (is_win && !is_component_build && !is_debug)) && !is_asan && !is_hwasan &&
+-    !is_lsan && !is_tsan && !is_msan) {
++    !is_lsan && !is_tsan && !is_msan && !is_bsd) {
    _default_use_allocator_shim = true
  } else {
    _default_use_allocator_shim = false
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 00964ebeb5f6..6e16740cec05 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2019-03-11 22:00:52 UTC
+--- build/config/compiler/BUILD.gn.orig	2019-04-30 22:22:28 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -53,7 +53,7 @@ declare_args() {
+@@ -54,7 +54,7 @@ declare_args() {
    # only two architectures that are currently checked in). Turn this off when
    # you are using a custom toolchain and need to control -B in cflags.
    linux_use_bundled_binutils =
@@ -9,7 +9,7 @@
        (current_cpu == "x64" || current_cpu == "x86")
    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                                root_build_dir)
-@@ -275,7 +275,7 @@ config("compiler") {
+@@ -279,7 +279,7 @@ config("compiler") {
      # Linker warnings.
      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
          !(is_android && use_order_profiling) && !is_mac && !is_ios &&
@@ -18,7 +18,7 @@
        # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
        # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
        # crbug.com/485542
-@@ -394,7 +394,7 @@ config("compiler") {
+@@ -381,7 +381,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",
-@@ -502,7 +502,7 @@ config("compiler") {
+@@ -489,7 +489,7 @@ config("compiler") {
      }
    }
  
@@ -36,7 +36,7 @@
      cflags += [
        # TODO(hans): Remove this once Clang generates better optimized debug info
        # by default. https://crbug.com/765793
-@@ -809,7 +809,7 @@ config("compiler_cpu_abi") {
+@@ -757,7 +757,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" ]
        }
-@@ -1494,7 +1494,7 @@ config("default_warnings") {
+@@ -1507,7 +1507,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -54,7 +54,7 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1694,7 +1694,7 @@ config("thin_archive") {
+@@ -1707,7 +1707,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).
@@ -63,7 +63,7 @@
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2278,7 +2278,7 @@ config("symbols") {
+@@ -2291,7 +2291,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) {
@@ -72,7 +72,7 @@
        }
      }
      if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2299,7 +2299,7 @@ config("symbols") {
+@@ -2312,7 +2312,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 9de88b63a2de..c6cc835cc9b1 100644
--- a/www/chromium/files/patch-build_config_compiler_compiler.gni
+++ b/www/chromium/files/patch-build_config_compiler_compiler.gni
@@ -1,6 +1,6 @@
---- build/config/compiler/compiler.gni.orig	2019-03-11 22:00:52 UTC
+--- build/config/compiler/compiler.gni.orig	2019-04-30 22:22:28 UTC
 +++ build/config/compiler/compiler.gni
-@@ -179,7 +179,7 @@ declare_args() {
+@@ -181,7 +181,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_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py
index ea33ceb97426..92310f8e043a 100644
--- a/www/chromium/files/patch-build_detect__host__arch.py
+++ b/www/chromium/files/patch-build_detect__host__arch.py
@@ -1,5 +1,5 @@
---- build/detect_host_arch.py.orig	2019-04-04 10:22:51.354518000 +0200
-+++ build/detect_host_arch.py	2019-04-04 10:23:07.641855000 +0200
+--- build/detect_host_arch.py.orig	2019-04-30 22:22:28 UTC
++++ build/detect_host_arch.py
 @@ -19,6 +19,8 @@ def HostArch():
      host_arch = 'ia32'
    elif host_arch in ['x86_64', 'amd64']:
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index ffd043fda652..e313fc55cc0c 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig	2019-03-11 22:00:52 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2019-04-30 22:22:28 UTC
 +++ build/toolchain/gcc_toolchain.gni
-@@ -47,6 +47,11 @@ analyzer_wrapper =
+@@ -44,6 +44,11 @@ analyzer_wrapper =
      rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
                  root_build_dir) + " --mode=clang"
  
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -610,13 +615,23 @@ template("clang_toolchain") {
+@@ -636,13 +641,23 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
index ab029144a6c4..29b9160f7b07 100644
--- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
+++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
@@ -1,6 +1,6 @@
---- build/toolchain/linux/BUILD.gn.orig	2019-03-11 22:00:52 UTC
+--- build/toolchain/linux/BUILD.gn.orig	2019-04-30 22:22:28 UTC
 +++ build/toolchain/linux/BUILD.gn
-@@ -14,7 +14,6 @@ clang_toolchain("clang_arm") {
+@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") {
  }
  
  clang_toolchain("clang_arm64") {
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index 57edb8265544..ce72fe92ce13 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,15 +1,15 @@
---- cc/BUILD.gn.orig	2019-03-11 22:00:52 UTC
+--- cc/BUILD.gn.orig	2019-04-30 22:22:28 UTC
 +++ cc/BUILD.gn
-@@ -548,7 +548,7 @@ cc_test_static_library("test_support") {
-     "//ui/gl:test_support",
-     "//ui/latency",
-   ]
+@@ -554,7 +554,7 @@ cc_test_static_library("test_support") {
+   if (enable_vulkan) {
+     deps += [ "//gpu/vulkan/init" ]
+   }
 -  if (!is_android) {
 +  if (!is_android && !is_bsd) {
      data_deps = [
        "//third_party/mesa_headers",
      ]
-@@ -746,9 +746,6 @@ cc_test("cc_unittests") {
+@@ -753,9 +753,6 @@ cc_test("cc_unittests") {
      "//ui/gfx/geometry",
      "//ui/gl",
      "//ui/gl:test_support",
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index 1b68ad522dde..b666f442b657 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	2019-03-11 22:00:52 UTC
+--- cc/trees/property_tree.cc.orig	2019-04-30 22:22:29 UTC
 +++ cc/trees/property_tree.cc
-@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1329,13 +1329,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_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index b06ed0963bd0..6204c893b3c9 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/chrome_main.cc.orig	2019-04-30 22:22:30 UTC
 +++ chrome/app/chrome_main.cc
-@@ -93,11 +93,11 @@ int ChromeMain(int argc, const char** argv) {
+@@ -94,11 +94,11 @@ int ChromeMain(int argc, const char** argv) {
  #endif
  
    // Chrome-specific process modes.
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 eeb5aaedaec0..53085731c2fb 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2019-04-30 22:22:30 UTC
 +++ chrome/app/chrome_main_delegate.cc
 @@ -101,7 +101,7 @@
  #include "chrome/app/shutdown_signal_handlers_posix.h"
@@ -9,7 +9,7 @@
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -135,7 +135,7 @@
+@@ -137,7 +137,7 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "base/environment.h"
  #endif
  
-@@ -232,7 +232,7 @@ bool UseHooks() {
+@@ -238,7 +238,7 @@ bool UseHooks() {
  
  #endif  // defined(OS_WIN)
  
@@ -27,7 +27,7 @@
  void AdjustLinuxOOMScore(const std::string& process_type) {
    // Browsers and zygotes should still be killable, but killed last.
    const int kZygoteScore = 0;
-@@ -291,7 +291,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -297,7 +297,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
    if (score > -1)
      base::AdjustOOMScore(base::GetCurrentProcId(), score);
  }
@@ -36,7 +36,7 @@
  
  // Returns true if this subprocess type needs the ResourceBundle initialized
  // and resources loaded.
-@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -342,7 +342,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
    return false;
  }
  
@@ -45,7 +45,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) ||
-@@ -346,7 +346,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -352,7 +352,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
      PLOG(FATAL) << "execlp failed";
    }
  }
@@ -54,7 +54,7 @@
  
  #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
  void SIGTERMProfilingShutdown(int signal) {
-@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -406,7 +406,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -63,7 +63,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.
-@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -418,7 +418,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -72,7 +72,7 @@
  #if defined(OS_MACOSX)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -469,7 +469,7 @@ void InitLogging(const std::string& process_type) {
+@@ -475,7 +475,7 @@ void InitLogging(const std::string& process_type) {
  void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
    if (!exe_entry_point_ticks.is_null())
      startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@@ -81,7 +81,7 @@
    // Record the startup process creation time on supported platforms.
    startup_metric_utils::RecordStartupProcessCreationTime(
        base::Process::Current().CreationTime());
-@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -613,7 +613,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
      *exit_code = 0;
      return true;  // Got a --version switch; exit with a success error code.
    }
@@ -90,7 +90,7 @@
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -637,7 +637,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -99,7 +99,7 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -953,7 +953,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
    InitializePDF();
  #endif
  
@@ -108,7 +108,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != service_manager::switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -968,7 +968,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -117,7 +117,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -978,7 +978,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.
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 83661fcf6838..3f685553e219 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,6 +1,15 @@
---- chrome/app/chromium_strings.grd.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/chromium_strings.grd.orig	2019-04-30 22:22:30 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -809,7 +809,7 @@ Signing in anyway will merge Chromium information like
+@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like
+       </if>
+ 
+       <!-- about:browser-switch strings -->
+-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
++      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
+         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
+           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>
+@@ -816,7 +816,7 @@ Signing in anyway will merge Chromium information like
        </message>
  
        <!-- ProcessSingleton -->
@@ -9,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>
-@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1064,7 +1064,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
        </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 ba62605775c3..ef4409fdb060 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,15 +1,15 @@
---- chrome/app/generated_resources.grd.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/generated_resources.grd.orig	2019-04-30 22:22:30 UTC
 +++ chrome/app/generated_resources.grd
-@@ -5339,7 +5339,7 @@ the Bookmarks menu.">
-         </message>
+@@ -4737,7 +4737,7 @@ Keep your key file in a safe place. You will need it t
        </if>
  
--      <if expr="is_win or (is_linux and not chromeos)">
-+      <if expr="is_win or (is_posix and not chromeos)">
-         <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
-           Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
+       <!-- chrome://browser-switch strings -->
+-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
++      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
+         <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
+           Legacy Browser Support
          </message>
-@@ -6160,7 +6160,7 @@ the Bookmarks menu.">
+@@ -6228,7 +6228,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>
-@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7012,7 +7012,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 064f31b18f22..d7500c7e45d4 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,15 @@
---- chrome/app/google_chrome_strings.grd.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2019-04-30 22:22:30 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b
+@@ -701,7 +701,7 @@ Signing in anyway will merge Chrome information like b
+       </if>
+ 
+       <!-- about:browser-switch strings -->
+-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
++      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
+         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
+           Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
+         </message>
+@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b
        </message>
  
        <!-- ProcessSingleton -->
@@ -9,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>
-@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1082,7 +1082,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
        </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 44c1a7bd1c46..94318c4fc4ce 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	2019-03-11 22:00:52 UTC
+--- chrome/app/settings_strings.grdp.orig	2019-04-30 22:22:32 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -580,7 +580,7 @@
+@@ -628,7 +628,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>
-@@ -594,7 +594,7 @@
+@@ -642,7 +642,7 @@
        Use Classic
      </message>
    </if>
diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
index a68c54c98713..3678715840b5 100644
--- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
+++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
@@ -1,6 +1,6 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig	2019-03-11 22:00:52 UTC
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/app/shutdown_signal_handlers_posix.cc
-@@ -183,12 +183,18 @@ void InstallShutdownSignalHandlers(
+@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers(
    g_pipe_pid = getpid();
    g_shutdown_pipe_read_fd = pipefd[0];
    g_shutdown_pipe_write_fd = pipefd[1];
@@ -18,4 +18,4 @@
 +#endif
  #endif
    ShutdownDetector* detector = new ShutdownDetector(
-       g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
+       g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index edd420c43ba8..3aca9b080313 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,24 +1,22 @@
---- chrome/browser/about_flags.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/about_flags.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/about_flags.cc
-@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS
-     {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
-      base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = {
-     {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}};
- const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = {
-@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV
-     {"Dedicated Suggestion Line", kPedalSuggestionDedicated,
-      base::size(kPedalSuggestionDedicated), 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::Choice kAutoplayPolicyChoices[] = {
-     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(
+          spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
+ #endif  // ENABLE_SPELLCHECK
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"enable-webgl2-compute-context",
+      flag_descriptions::kWebGL2ComputeContextName,
+      flag_descriptions::kWebGL2ComputeContextDescription,
+      kOsWin | kOsLinux | kOsCrOS,
+      SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)},
+-#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"enable-webgl-draft-extensions",
+      flag_descriptions::kWebglDraftExtensionsName,
+      flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
+@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -33,7 +31,7 @@
      {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
       flag_descriptions::kOriginTrialsDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
  #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
  #endif  // OS_ANDROID
@@ -48,25 +46,25 @@
      {"enable-experimental-accessibility-features",
       flag_descriptions::kExperimentalAccessibilityFeaturesName,
       flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)},
- #endif  // defined(OS_ANDROID)
+@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
  
 -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-     {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName,
-      flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)},
-@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOmniboxDriveSuggestionsName,
-      flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop,
-      FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
+     {"omnibox-experimental-keyword-mode",
+      flag_descriptions::kOmniboxExperimentalKeywordModeName,
+      flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
+@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
+      flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
 -#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,
-@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -75,16 +73,16 @@
      {"direct-manipulation-stylus",
       flag_descriptions::kDirectManipulationStylusName,
       flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kShowManagedUiDescription,
-      kOsWin | kOsMac | kOsLinux | kOsCrOS,
-      FEATURE_VALUE_TYPE(features::kShowManagedUi)},
+@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription,
+      kOsWin | kOsMac | kOsLinux,
+      FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)},
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  
- #if defined(OS_ANDROID)
-     {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName,
-@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #if !defined(OS_ANDROID)
+     {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName,
+@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
  #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
  
@@ -93,7 +91,7 @@
      {"autofill-always-show-server-cards-in-sync-transport",
       flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
       flag_descriptions::
-@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsMac | kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
@@ -102,7 +100,7 @@
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
      {"enable-custom-mac-paper-sizes",
-@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
  #endif  // OS_CHROMEOS
  
@@ -116,5 +114,5 @@
 -#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+ #if !defined(OS_ANDROID)
      {"hardware-media-key-handling",
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
index 882f1f84adde..7482f7147a70 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
 @@ -4,6 +4,11 @@
  
@@ -12,7 +12,7 @@
  #include <ifaddrs.h>
  #include <net/if.h>
  #include <stddef.h>
-@@ -105,9 +110,36 @@ class MacAddressProcessor {
+@@ -106,9 +111,36 @@ class MacAddressProcessor {
                          const char* const prefixes[],
                          size_t prefixes_count) {
      const int MAC_LENGTH = 6;
@@ -49,7 +49,7 @@
      strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
  
      int sd = socket(AF_INET, SOCK_DGRAM, 0);
-@@ -119,11 +151,18 @@ class MacAddressProcessor {
+@@ -120,11 +152,18 @@ class MacAddressProcessor {
  
      const char* mac_address =
          static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index 18889e38aa1e..bd9970fcc5a3 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,6 +1,15 @@
---- chrome/browser/browser_resources.grd.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/browser_resources.grd.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -679,7 +679,7 @@
+@@ -81,7 +81,7 @@
+         <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
+         <include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\services\resource_coordinator\public\mojom\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
+       </if>
+-      <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
++      <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
+         <include name="IDR_BROWSER_SWITCHER_APP_HTML" file="resources\browser_switcher\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
+         <include name="IDR_BROWSER_SWITCHER_APP_JS" file="resources\browser_switcher\app.js" compress="gzip" type="BINDATA" />
+         <include name="IDR_BROWSER_SWITCHER_BROWSER_SWITCHER_PROXY_HTML" file="resources\browser_switcher\browser_switcher_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
+@@ -689,7 +689,7 @@
          <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
        </if>
        <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
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 95d001b3ae64..58af50224c04 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,7 +1,7 @@
---- chrome/browser/chrome_browser_main.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -217,7 +217,7 @@
- #include "chromeos/settings/cros_settings_names.h"
+@@ -219,7 +219,7 @@
+ #include "components/arc/metrics/stability_metrics_manager.h"
  #endif  // defined(OS_CHROMEOS)
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
  #include "chrome/browser/first_run/upgrade_util_linux.h"
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
  
-@@ -257,7 +257,7 @@
+@@ -259,7 +259,7 @@
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,7 +18,7 @@
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #endif
  
-@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -27,7 +27,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 .
-@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1058,14 +1058,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                   &user_native_messaging_dir));
      if (!base::PathExists(user_native_messaging_dir))
        base::CreateDirectory(user_native_messaging_dir);
@@ -45,7 +45,7 @@
  
  #if defined(OS_MACOSX)
    // Get the Keychain API to register for distributed notifications on the main
-@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1093,7 +1093,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -54,7 +54,7 @@
    metrics::DesktopSessionDurationTracker::Initialize();
  #endif
    metrics::RendererUptimeTracker::Initialize();
-@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1266,6 +1266,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
        base::TimeDelta::FromMinutes(1));
  
  #if !defined(OS_ANDROID)
@@ -62,7 +62,7 @@
    if (base::FeatureList::IsEnabled(features::kWebUsb)) {
      web_usb_detector_.reset(new WebUsbDetector());
      BrowserThread::PostAfterStartupTask(
-@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1274,6 +1275,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 45b21faf7412..e532f5974300 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,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -16,7 +16,7 @@
    bluez::BluezDBusThreadManager::Initialize();
    bluez::BluezDBusManager::Initialize();
  #endif
-@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+@@ -105,7 +107,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index f5bb295e5563..87b62fed95fe 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -142,7 +142,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
  void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
  #if defined(OS_CHROMEOS)
    NOTREACHED();  // Should not ever happen on ChromeOS.
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 c6392dbbb473..5a419c7cf00e 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -395,7 +395,7 @@
+@@ -411,7 +411,7 @@
  #include "components/user_manager/user_manager.h"
  #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
  #include "services/ws/common/switches.h"
@@ -9,21 +9,16 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -441,11 +441,11 @@
+@@ -457,7 +457,7 @@
  #include "components/services/patch/public/interfaces/constants.mojom.h"
  #endif
  
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- #include "chrome/browser/webshare/share_service_impl.h"
- #endif
- 
 -#if defined(OS_WIN) || defined(OS_MACOSX) || \
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #endif
-@@ -462,7 +462,7 @@
+@@ -474,7 +474,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -32,7 +27,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -1170,7 +1170,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
  #elif defined(OS_CHROMEOS)
    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(
        parameters, chrome_feature_list_creator_);
@@ -41,7 +36,7 @@
    main_parts =
        new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_);
  #elif defined(OS_ANDROID)
-@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -1190,7 +1190,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    // Construct additional browser parts. Stages are called in the order in
    // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -50,7 +45,7 @@
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  #else
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1956,7 +1956,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -1994,7 +1994,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -59,7 +54,7 @@
  #if defined(OS_ANDROID)
    bool enable_crash_reporter = true;
  #else
-@@ -3550,7 +3550,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3529,7 +3529,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -68,7 +63,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4281,7 +4281,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
              handle));
    }
  
@@ -77,16 +72,7 @@
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
    std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle =
        browser_switcher::BrowserSwitcherNavigationThrottle ::
-@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa
- #if defined(OS_ANDROID)
-   frame_interfaces_parameterized_->AddInterface(base::Bind(
-       &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>));
--#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-   frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create));
- #endif
- 
-@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow>
+@@ -5115,7 +5115,7 @@ std::unique_ptr<content::OverlayWindow>
  ChromeContentBrowserClient::CreateWindowForPictureInPicture(
      content::PictureInPictureWindowController* controller) {
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
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 1a82d82e685c..00ce028c3619 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2019-04-30 22:22:32 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -363,12 +363,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -368,12 +368,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_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
index e5313498ca62..e8a54be247f8 100644
--- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
+++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() {
  // magnified projection only with centered hotspot.
  // Mac Retina requires cursor to be > 120px in order to render smoothly.
  
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 3b529f47fd37..12545ce51ceb 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1234,7 +1234,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
@@ -9,7 +9,7 @@
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -1251,7 +1251,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1254,7 +1254,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {
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 3b12bd740133..4f4c08e05c87 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-03-11 22:00:53 UTC
+--- chrome/browser/download/download_commands.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/download/download_commands.cc
-@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const {
+@@ -159,7 +159,7 @@ Browser* DownloadCommands::GetBrowser() const {
    return browser_displayer.browser();
  }
  
@@ -9,7 +9,7 @@
  bool DownloadCommands::IsDownloadPdf() const {
    base::FilePath path = model_->GetTargetFilePath();
    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -175,7 +175,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+@@ -176,7 +176,7 @@ 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__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index f6cc56e59c6a..7c0829876f81 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.h.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/download/download_prefs.h.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/download/download_prefs.h
-@@ -101,7 +101,7 @@ class DownloadPrefs {
+@@ -104,7 +104,7 @@ class DownloadPrefs {
    // Disables auto-open based on file extension.
    void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
  
@@ -9,7 +9,7 @@
    // Store the user preference to disk. If |should_open| is true, also disable
    // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
    void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -145,7 +145,7 @@ class DownloadPrefs {
+@@ -148,7 +148,7 @@ class DownloadPrefs {
                     AutoOpenCompareFunctor> AutoOpenSet;
    AutoOpenSet auto_open_;
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index f975a399234e..f44f9ff2ace2 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1104,6 +1104,12 @@ jumbo_static_library("extensions") {
+@@ -1116,6 +1116,12 @@ jumbo_static_library("extensions") {
      deps += [ "//chrome/common:service_process_mojom" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
index 5ed7b851190f..18be000e427e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
-@@ -52,7 +52,11 @@
+@@ -53,7 +53,11 @@
  #include "extensions/common/extension.h"
  #include "extensions/common/extension_messages.h"
  #include "extensions/common/one_shot_event.h"
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 556750be0ff6..0b5c1a821007 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-03-11 22:00:53 UTC
+--- 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
-@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
+@@ -21,6 +21,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,
-@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
+@@ -34,6 +35,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_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 8a6dfbb8c87b..d8b93a7a1069 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -296,6 +296,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -299,6 +299,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
      info->os = extensions::api::runtime::PLATFORM_OS_CROS;
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
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 bf8482ac98e5..afda5723498b 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -128,7 +128,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
        settings_api::PrefType::PREF_TYPE_BOOLEAN;
    (*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
-@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
+@@ -138,7 +138,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_bookmark__app__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
deleted file mode 100644
index 2f5e80399717..000000000000
--- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/extensions/bookmark_app_helper.cc.orig	2019-03-11 22:00:53 UTC
-+++ chrome/browser/extensions/bookmark_app_helper.cc
-@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
-   if (create_shortcuts_) {
- #if !defined(OS_CHROMEOS)
-     web_app::ShortcutLocations creation_locations;
--#if defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
-     creation_locations.on_desktop = true;
- #else
-     creation_locations.on_desktop = false;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 32893bff716f..b5596df7d97d 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -747,7 +747,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -753,7 +753,7 @@ void ExternalProviderImpl::CreateExternalProviders(
      chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader);
      provider_list->push_back(std::move(demo_apps_provider));
    }
@@ -9,7 +9,7 @@
    provider_list->push_back(std::make_unique<ExternalProviderImpl>(
        service,
        new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
-@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -780,7 +780,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index e7c43ca364b8..b137f95a0e48 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -3656,13 +3656,13 @@ const char kWakeOnPacketsDescription[] =
+@@ -3524,21 +3524,21 @@ extern const char kAshNotificationStackingBarRedesignD
  
  // Random platform combinations -----------------------------------------------
  
@@ -14,9 +14,19 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
  
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute";
+ const char kWebGL2ComputeContextDescription[] =
+     "Enable the use of WebGL 2.0 Compute API.";
+ 
+-#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
  #if defined(OS_WIN) || defined(OS_MACOSX)
  
-@@ -3675,13 +3675,13 @@ const char kAutomaticTabDiscardingDescription[] =
+@@ -3551,13 +3551,13 @@ const char kAutomaticTabDiscardingDescription[] =
  
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 19e70914fb72..bbada3188873 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/flag_descriptions.h.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -2192,12 +2192,12 @@ extern const char kWakeOnPacketsDescription[];
+@@ -2100,19 +2100,19 @@ extern const char kAshNotificationStackingBarRedesignD
  
  // Random platform combinations -----------------------------------------------
  
@@ -13,9 +13,18 @@
 -#endif  // defined(OS_WIN) || defined(OS_LINUX)
 +#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
  
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ extern const char kWebGL2ComputeContextName[];
+ extern const char kWebGL2ComputeContextDescription[];
+ 
+-#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
  extern const char kExperimentalUiName[];
  extern const char kExperimentalUiDescription[];
-@@ -2209,12 +2209,12 @@ extern const char kAutomaticTabDiscardingDescription[]
+@@ -2124,12 +2124,12 @@ extern const char kAutomaticTabDiscardingDescription[]
  
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
index d2e3a19c974f..93a3d5742fd1 100644
--- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -38,10 +38,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
+@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
      // Note that this initializes the delegate asynchronously, but since
      // the delegate will only be used from the IO thread, it is guaranteed
      // to be created before use of it expects it to be there.
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index 4b9563aa1359..922d7c8beb61 100644
--- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -734,7 +734,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -732,7 +732,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
index 1c9e21e9cfb2..65359a0157b5 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2019-04-30 22:22:33 UTC
 +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
-@@ -111,6 +111,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
      bool incognito,
      CreateRouteCallback callback) {
    DCHECK(!base::ContainsKey(presentations_, presentation_id));
@@ -13,7 +13,7 @@
    base::Optional<Display> display = GetDisplayBySinkId(sink_id);
    if (!display) {
      std::move(callback).Run(base::nullopt, nullptr,
-@@ -137,6 +143,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+@@ -138,6 +144,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
    std::move(callback).Run(route, nullptr, base::nullopt,
                            RouteRequestResult::OK);
    NotifyRouteObservers();
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index c73fdba76494..0128c2679c04 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -393,6 +393,8 @@ void WebRtcLogUploader::SetupMultipart(
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc
index b6a806a8fb58..d9c27f8b834b 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig	2019-03-17 20:01:28 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc
 @@ -26,10 +26,10 @@
  #include "content/public/browser/content_browser_client.h"
@@ -14,7 +14,7 @@
  using content::BrowserThread;
  using webrtc_event_logging::WebRtcEventLogManager;
 @@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging(
-       output_period_ms, web_app_id, callback);
+       web_app_id, callback);
  }
  
 -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h
index 30fe4a793160..4ae57195d29b 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig	2019-03-17 20:00:30 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h
-@@ -154,13 +154,13 @@ class WebRtcLoggingHandlerHost : public content::Brows
+@@ -153,13 +153,13 @@ class WebRtcLoggingHandlerHost : public content::Brows
                           size_t web_app_id,
                           const StartEventLoggingCallback& callback);
  
@@ -16,7 +16,7 @@
  
   private:
    friend class content::BrowserThread;
-@@ -227,7 +227,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+@@ -226,7 +226,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
        bool success,
        const std::string& error_message);
  
@@ -25,7 +25,7 @@
    // Grants the render process access to the 'WebRTC Logs' directory, and
    // invokes |callback| with the ids necessary to create a DirectoryEntry
    // object. If the |logs_path| couldn't be created or found, |error_callback|
-@@ -236,7 +236,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+@@ -235,7 +235,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
        const LogsDirectoryCallback& callback,
        const LogsDirectoryErrorCallback& error_callback,
        const base::FilePath& logs_path);
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 dc2669b3a0cb..1e859d2a3597 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -69,12 +69,12 @@
+@@ -70,12 +70,12 @@
  #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -15,7 +15,7 @@
  
  namespace {
  
-@@ -519,7 +519,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -535,7 +535,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    content::GetNetworkService()->ConfigureStubHostResolver(
        stub_resolver_enabled, std::move(dns_over_https_servers));
  
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 fe2ef21d5d65..7aa9e03d4fc3 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-03-11 22:00:53 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -300,7 +300,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+@@ -301,7 +301,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
    password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60,
                                                    network_context_getter);
  
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 cc7d3ae6259e..a61d59a37425 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,4 +1,4 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
 @@ -107,7 +107,7 @@
  #include "chrome/browser/policy/browser_signin_policy_handler.h"
@@ -9,8 +9,8 @@
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
-@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     prefs::kEnterpriseHardwarePlatformAPIEnabled,
+@@ -962,7 +962,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     prefs::kAllowPopupsDuringPageUnload,
      base::Value::Type::BOOLEAN },
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || \
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 99cc2097f2df..aaca29e0e2dd 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -319,7 +319,7 @@
+@@ -331,7 +331,7 @@
  #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
-@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -802,7 +802,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
    safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
index fe3f353e76b8..9908a5c69d8f 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/process_singleton_posix.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/process_singleton_posix.cc
 @@ -93,11 +93,11 @@
  #include "net/base/network_interfaces.h"
@@ -14,7 +14,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -324,7 +324,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
    if (g_disable_prompt)
      return g_user_opted_unlock_in_use_profile;
  
@@ -23,7 +23,7 @@
    base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
        IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
    return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+@@ -903,7 +903,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
      SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
      return PROCESS_NONE;
    } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 73cee1e30aac..6992a643d7db 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -325,7 +325,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !defined(OS_ANDROID)
    MediaGalleriesPreferencesFactory::GetInstance();
  #endif
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 8f31da033031..8da2f8202915 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	2019-03-11 22:00:53 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1507,7 +1507,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1500,7 +1500,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,
-@@ -1549,7 +1549,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1542,7 +1542,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
-@@ -1823,7 +1823,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -1816,7 +1816,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_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index ac9923b9ee0a..492d51dba75a 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2019-04-30 22:22:34 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
+@@ -129,7 +129,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr
      prefs->caret_blink_interval = interval;
  #endif
  
@@ -18,12 +18,12 @@
    views::LinuxUI* linux_ui = views::LinuxUI::instance();
    if (linux_ui) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
+@@ -148,7 +148,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr
    }
  #endif
  
 -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
    content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
+   content::UpdateFocusRingPreferencesFromSystemSettings(prefs);
  #endif
- 
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 4aa3c61f0cec..3ddfafe75b08 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,15 +1,15 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2019-04-30 22:22:35 UTC
 +++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -65,7 +65,7 @@
-               hidden="[[!pageVisibility.setTheme]]"
+@@ -64,7 +64,7 @@
+           <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
                label="$i18n{themes}" sub-label="[[themeSublabel_]]"
-               on-click="openThemeUrl_"></cr-link-row>
+               on-click="openThemeUrl_" external></cr-link-row>
 -<if expr="not is_linux or chromeos">
 +<if expr="not is_posix or chromeos">
            <template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
              <div class="separator"></div>
              <paper-button id="useDefault" on-click="onUseDefaultTap_"
-@@ -74,7 +74,7 @@
+@@ -73,7 +73,7 @@
              </paper-button>
            </template>
  </if>
@@ -18,7 +18,7 @@
            <div class="settings-row continuation"
                hidden="[[!showThemesSecondary_(
                prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -139,7 +139,7 @@
+@@ -138,7 +138,7 @@
              pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
              label="$i18n{showBookmarksBar}">
          </settings-toggle-button>
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 9c2d5ef45d79..d82d2eef714b 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2019-04-30 22:22:35 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -715,7 +715,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
+@@ -716,7 +716,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_ssl_ssl__error__controller__client.cc b/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
index 58e3c1beecda..7321793f7994 100644
--- 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
@@ -1,4 +1,4 @@
---- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ssl/ssl_error_controller_client.cc
 @@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() {
  #if defined(OS_ANDROID)
@@ -9,7 +9,7 @@
    struct ClockCommand {
      const char* const pathname;
      const char* const argument;
-@@ -219,7 +219,7 @@ void SSLErrorControllerClient::Proceed() {
+@@ -222,7 +222,7 @@ void SSLErrorControllerClient::Proceed() {
  
  bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
  #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
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 92f874d0cb6a..ec70c89c9cbd 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -427,7 +427,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
    }
  #endif  // BUILDFLAG(ENABLE_APP_LIST)
  
@@ -9,7 +9,7 @@
    // Dictionary sync is enabled by default.
    if (!disabled_types.Has(syncer::DICTIONARY)) {
      if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) {
-@@ -444,7 +444,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -443,7 +443,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
            base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
      }
    }
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index 12d416f849fa..c9547908221f 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/task_manager/sampling/task_group.cc
 @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask =
  #if defined(OS_WIN)
@@ -12,7 +12,7 @@
  #if BUILDFLAG(ENABLE_NACL)
      REFRESH_TYPE_NACL |
  #endif  // BUILDFLAG(ENABLE_NACL)
-@@ -112,9 +112,9 @@ TaskGroup::TaskGroup(
+@@ -114,9 +114,9 @@ TaskGroup::TaskGroup(
  #if BUILDFLAG(ENABLE_NACL)
        nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
  #endif  // BUILDFLAG(ENABLE_NACL)
@@ -24,7 +24,7 @@
        idle_wakeups_per_second_(-1),
        gpu_memory_has_duplicates_(false),
        is_backgrounded_(false),
-@@ -128,10 +128,10 @@ TaskGroup::TaskGroup(
+@@ -130,10 +130,10 @@ TaskGroup::TaskGroup(
                     weak_ptr_factory_.GetWeakPtr()),
          base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
                     weak_ptr_factory_.GetWeakPtr()),
@@ -37,7 +37,7 @@
          base::Bind(&TaskGroup::OnProcessPriorityDone,
                     weak_ptr_factory_.GetWeakPtr()));
  
-@@ -296,14 +296,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
+@@ -301,14 +301,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
  }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 9cf571bed1d7..5702d7653b95 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/task_manager/sampling/task_group.h
-@@ -106,9 +106,9 @@ class TaskGroup {
+@@ -119,9 +119,9 @@ class TaskGroup {
    int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
  #endif  // BUILDFLAG(ENABLE_NACL)
  
@@ -12,7 +12,7 @@
  
    int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
   private:
-@@ -121,9 +121,9 @@ class TaskGroup {
+@@ -134,9 +134,9 @@ class TaskGroup {
    void RefreshNaClDebugStubPort(int child_process_unique_id);
    void OnRefreshNaClDebugStubPortDone(int port);
  #endif
@@ -24,7 +24,7 @@
  
    void OnCpuRefreshDone(double cpu_usage);
    void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
-@@ -191,10 +191,10 @@ class TaskGroup {
+@@ -205,10 +205,10 @@ class TaskGroup {
  #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
  #endif  // BUILDFLAG(ENABLE_NACL)
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index d2d95cd4af50..bb256bf4cf94 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -207,11 +207,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -208,11 +208,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
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 d696fb66bcaf..965ad2bc13ea 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
+@@ -163,6 +163,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_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index e623667e5a05..9bc880776ae1 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,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -79,7 +79,7 @@
+@@ -82,7 +82,7 @@
  #include "chrome/browser/ui/browser_commands_chromeos.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -220,7 +220,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 =
-@@ -421,7 +421,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -434,7 +434,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -27,7 +27,7 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -860,7 +860,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -879,7 +879,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);
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__window.h b/www/chromium/files/patch-chrome_browser_ui_browser__window.h
index 29e27d552ae6..2ffa5c8dbd74 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__window.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__window.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_window.h.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/browser_window.h.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/browser_window.h
-@@ -423,7 +423,7 @@ class BrowserWindow : public ui::BaseWindow {
+@@ -426,7 +426,7 @@ class BrowserWindow : public ui::BaseWindow {
        bool is_source_keyboard) = 0;
  
  #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
deleted file mode 100644
index 5fe24a4fb65c..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/input_method/input_method_engine.h.orig	2019-03-11 22:00:54 UTC
-+++ chrome/browser/ui/input_method/input_method_engine.h
-@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase
- 
-   // ui::IMEEngineHandlerInterface:
-   bool IsActive() const override;
--  std::string GetExtensionId() const override;
-+  std::string GetExtensionId() const;
- 
-   // Creates and shows the IME window.
-   // Returns 0 for errors and |error| will contains the error message.
diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
index 2772be3932aa..f0918d60b32e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/input_method/input_method_engine_base.cc
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #include "ui/base/ime/chromeos/ime_keymap.h"
  #elif defined(OS_WIN)
  #include "ui/events/keycodes/keyboard_codes_win.h"
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 311a4a2f5833..429e0ccb08dd 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
 @@ -79,7 +79,7 @@
  #include "chrome/browser/ui/user_manager.h"
@@ -9,7 +9,7 @@
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
  
-@@ -633,8 +633,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -634,8 +634,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 5b07ae6352d2..1dc0e38bfd96 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
  #include "components/zoom/zoom_controller.h"
  #endif  // defined(OS_ANDROID)
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
  #endif
-@@ -309,11 +309,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -307,11 +307,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_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index a1e8ca158374..7285edaccb44 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -430,13 +430,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
+@@ -439,13 +439,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
            ? stringifier_->backgrounded_string()
            : stringifier_->foregrounded_string();
  
@@ -16,7 +16,7 @@
  
      case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: {
        return stringifier_->GetKeepaliveCountText(
-@@ -590,7 +590,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -605,7 +605,7 @@ int TaskManagerTableModel::CompareValues(int row1,
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -25,7 +25,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -598,7 +598,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -613,7 +613,7 @@ int TaskManagerTableModel::CompareValues(int row1,
            observed_task_manager()->GetOpenFdCount(tasks_[row2]);
        return ValueCompare(proc1_fd_count, proc2_fd_count);
      }
@@ -34,7 +34,7 @@
  
      default:
        NOTREACHED();
-@@ -760,11 +760,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -779,11 +779,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
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 9ab402f6a4dd..b27d15095a6c 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -35,7 +35,7 @@
+@@ -33,7 +33,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>
-@@ -45,7 +45,7 @@
+@@ -43,7 +43,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 @@
  
  ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {}
  
-@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -91,7 +91,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    }
  #endif
  
@@ -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.
-@@ -124,7 +124,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -122,7 +122,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    base::RunLoop().RunUntilIdle();
  
    exit(EXIT_FAILURE);
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 adf0dd59027e..e8039e05378e 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,6 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
  #endif
  
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
  namespace {
  
  bool IsUsingGtkTheme(Profile* profile) {
@@ -18,7 +18,7 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -105,7 +105,7 @@ void BrowserFrame::InitBrowserFrame() {
      non_client_view()->set_context_menu_controller(this);
    }
  
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 34642d2ba882..fcc74080d2d1 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,29 +1,11 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
- }
- 
- void BrowserView::DestroyBrowser() {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (quit_instruction_bubble_controller_) {
-     GetWidget()->GetNativeView()->RemovePreTargetHandler(
-         quit_instruction_bubble_controller_.get());
-@@ -2130,7 +2130,7 @@ views::View* BrowserView::CreateOverlayView() {
- }
- 
- void BrowserView::OnWidgetDestroying(views::Widget* widget) {
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (quit_instruction_bubble_controller_) {
-     GetWidget()->GetNativeView()->RemovePreTargetHandler(
-         quit_instruction_bubble_controller_.get());
-@@ -2474,7 +2474,7 @@ void BrowserView::InitViews() {
-   GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
-                                        browser_->profile());
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
-     quit_instruction_bubble_controller_ =
-         QuitInstructionBubbleController::GetInstance();
+@@ -1504,7 +1504,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
+   // light to dark mode.
+   const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
+   bool must_regenerate_frame;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // GTK and user theme changes can both change frame buttons, so the frame
+   // always needs to be regenerated on Linux.
+   must_regenerate_frame = true;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h
deleted file mode 100644
index 6cf75f921454..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/browser_view.h.orig	2019-03-11 22:00:54 UTC
-+++ chrome/browser/ui/views/frame/browser_view.h
-@@ -50,7 +50,7 @@
- #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
- #endif  // defined(OS_CHROMEOS)
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "chrome/browser/ui/views/quit_instruction_bubble_controller.h"
- #endif
- 
-@@ -850,7 +850,7 @@ class BrowserView : public BrowserWindow,
-   };
-   base::Optional<ResizeSession> interactive_resize_;
- 
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   scoped_refptr<QuitInstructionBubbleController>
-       quit_instruction_bubble_controller_;
- #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 794a1d2c3b13..0184679537b3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -49,7 +49,7 @@
+@@ -47,7 +47,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
  #include "ui/views/window/window_shape.h"
  
@@ -9,7 +9,7 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
                                                   const gfx::Point& point,
                                                   const ui::Event* event) {
@@ -18,7 +18,7 @@
    views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
                                  views::MenuRunner::HAS_MNEMONICS);
    menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
-@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
+@@ -476,7 +476,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
  
  OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
index b75ea8b7056f..0586d8bb467d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2019-04-30 22:22:36 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
-@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy
-   return false;
- }
+@@ -6,7 +6,7 @@
+ 
+ #include "build/build_config.h"
  
 -#if !defined(OS_LINUX)
 +#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
  
  // static
- OpaqueBrowserFrameViewPlatformSpecific*
+ std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific>
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index 8edcc381d29e..26b5cc5c993b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -63,7 +63,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
+@@ -64,7 +64,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
  NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener)
      : views::ImageButton(listener), tab_strip_(tab_strip) {
    set_animate_on_state_change(true);
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 8c91255df89d..48008fc42385 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
+@@ -396,7 +396,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
    //     synchronous on desktop Linux, so use that.
    // - Chrome OS
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -9,18 +9,18 @@
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
+@@ -822,7 +822,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
      else
        target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
  
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) || defined(OS_BSD)
+-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD)
      // 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.
-@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca
-     if (dragged_window)
+@@ -1997,7 +1997,7 @@ TabDragController::Liveness TabDragController::GetLoca
        exclude.insert(dragged_window);
+     }
    }
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
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 ba760d11b5e9..fe0bcae96b25 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	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -192,11 +192,11 @@
+@@ -198,11 +198,11 @@
  #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
  #endif
  
@@ -14,7 +14,7 @@
  #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
  #endif
  
-@@ -314,7 +314,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -320,7 +320,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)
-@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -605,7 +605,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
-@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -650,12 +650,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
      return &NewWebUI<CastUI>;
    }
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
index 7aa51f364344..0f1ab06c02df 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -550,7 +550,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
      {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
      {"themes", IDS_SETTINGS_THEMES},
@@ -9,7 +9,7 @@
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -568,7 +568,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
      {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
index 0468435bbe7d..059202c3cb59 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
-@@ -46,7 +46,7 @@ namespace {
+@@ -50,7 +50,7 @@ namespace {
  #if defined(OS_MACOSX)
  const int kDesiredSizes[] = {16, 32, 128, 256, 512};
  const size_t kNumDesiredSizes = base::size(kDesiredSizes);
diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn
index 0cefd2907159..dd7ac2a14a03 100644
--- a/www/chromium/files/patch-chrome_common_BUILD.gn
+++ b/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig	2019-03-11 22:00:54 UTC
+--- chrome/common/BUILD.gn.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/BUILD.gn
-@@ -300,6 +300,10 @@ static_library("common") {
+@@ -298,6 +298,10 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 87c61435a02d..05a46ca8cebc 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	2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_features.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/chrome_features.cc
-@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
+@@ -96,13 +96,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
                                              base::FEATURE_ENABLED_BY_DEFAULT};
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
@@ -16,7 +16,7 @@
  
  // Enables or disables whether permission prompts are automatically blocked
  // after the user has explicitly dismissed them too many times.
-@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{
      "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
  #endif
  
@@ -25,7 +25,7 @@
  // Enables the dual certificate verification trial feature.
  // https://crbug.com/649026
  const base::Feature kCertDualVerificationTrialFeature{
-@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+@@ -216,7 +216,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
  const base::Feature kDesktopPWAWindowing {
    "DesktopPWAWindowing",
  #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 7fda4187540d..9dbe451c3022 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	2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_features.h.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/chrome_features.h
-@@ -61,10 +61,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -66,10 +66,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kAutomaticTabDiscarding;
  #endif  // defined(OS_WIN) || defined(OS_MACOSX)
  
@@ -13,7 +13,7 @@
  
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kBlockPromptsIfDismissedOften;
-@@ -81,7 +81,7 @@ extern const base::Feature kBrowserHangFixesExperiment
+@@ -89,7 +89,7 @@ extern const base::Feature kBrowserHangFixesExperiment
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::Feature kBundledConnectionHelpFeature;
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 84863783b2b8..7204e171dfaf 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig	2019-03-21 01:36:35.000000000 +0100
-+++ chrome/common/chrome_paths.cc	2019-03-24 18:44:09.907854000 +0100
-@@ -52,21 +52,21 @@
+--- chrome/common/chrome_paths.cc.orig	2019-04-30 22:22:37 UTC
++++ chrome/common/chrome_paths.cc
+@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
      FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
  #endif
  
@@ -25,7 +25,7 @@
  
  #if defined(OS_CHROMEOS)
  const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -34,7 +34,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -459,10 +459,12 @@
+@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) {
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
@@ -48,7 +48,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
-@@ -470,7 +472,7 @@
+@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) {
      }
  #endif
  #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
@@ -57,7 +57,7 @@
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
          return false;
-@@ -478,7 +480,7 @@
+@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -66,7 +66,7 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -513,7 +515,7 @@
+@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #endif
        break;
  
@@ -75,7 +75,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if defined(OS_MACOSX)
  #if defined(GOOGLE_CHROME_BUILD)
-@@ -527,6 +529,9 @@
+@@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #if defined(GOOGLE_CHROME_BUILD)
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/opt/chrome/native-messaging-hosts"));
@@ -85,7 +85,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/chromium/native-messaging-hosts"));
-@@ -539,7 +544,7 @@
+@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
        break;
@@ -94,7 +94,7 @@
  #if !defined(OS_ANDROID)
      case chrome::DIR_GLOBAL_GCM_STORE:
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
-@@ -547,7 +552,7 @@
+@@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) {
        cur = cur.Append(kGCMStoreDirname);
        break;
  #endif  // !defined(OS_ANDROID)
@@ -103,7 +103,7 @@
      case chrome::FILE_COMPONENT_FLASH_HINT:
        if (!base::PathService::Get(
                chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
-@@ -555,7 +560,7 @@
+@@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) {
        }
        cur = cur.Append(kComponentUpdatedFlashHint);
        break;
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index ef3d07e87411..3237b6aa4468 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.h.orig	2019-03-21 01:36:35.000000000 +0100
-+++ chrome/common/chrome_paths.h	2019-03-24 18:44:50.266637000 +0100
-@@ -51,7 +51,7 @@
+--- chrome/common/chrome_paths.h.orig	2019-04-30 22:22:37 UTC
++++ chrome/common/chrome_paths.h
+@@ -51,7 +51,7 @@ enum {
                                  // to set policies for chrome. This directory
                                  // contains subdirectories.
  #endif
@@ -9,7 +9,7 @@
      defined(OS_MACOSX)
    DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
                                   // on Chrome Mac and Chromium Linux.
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ enum {
                                   // create it.
  #endif
  
@@ -18,7 +18,7 @@
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ enum {
    DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
                                               // supervised user whitelists are
                                               // installed.
@@ -27,7 +27,7 @@
    DIR_NATIVE_MESSAGING,         // System directory where native messaging host
                                  // manifest files are stored.
    DIR_USER_NATIVE_MESSAGING,    // Directory with Native Messaging Hosts
-@@ -122,10 +122,10 @@
+@@ -122,10 +122,10 @@ enum {
    DIR_GEN_TEST_DATA,            // Directory where generated test data resides.
    DIR_TEST_DATA,                // Directory where unit test data resides.
    DIR_TEST_TOOLS,               // Directory where unit test tools reside.
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index a96bc4f817cf..a745cfc0a35d 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	2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_switches.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[]        = "allow-n
+@@ -905,12 +905,12 @@ 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 fcf6113a2957..cfa5d6b0e9ef 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	2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_switches.h.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/chrome_switches.h
-@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[];
+@@ -279,12 +279,12 @@ extern const char kAllowNaClFileHandleAPI[];
  extern const char kAllowNaClSocketAPI[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc
index f5cea90a6889..d69c38703319 100644
--- a/www/chromium/files/patch-chrome_common_extensions_command.cc
+++ b/www/chromium/files/patch-chrome_common_extensions_command.cc
@@ -1,6 +1,6 @@
---- chrome/common/extensions/command.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/common/extensions/command.cc.orig	2019-04-30 22:22:37 UTC
 +++ chrome/common/extensions/command.cc
-@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() {
+@@ -300,7 +300,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
  #elif defined(OS_CHROMEOS)
    return values::kKeybindingPlatformChromeOs;
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 9a7e44a3fff7..d47f7a521c01 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/common/pref_names.cc.orig	2019-04-30 22:22:38 UTC
 +++ chrome/common/pref_names.cc
 @@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
  // only using an account that belongs to one of the domains from this pref.
@@ -9,7 +9,7 @@
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1038,7 +1038,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1043,7 +1043,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";
-@@ -1419,7 +1419,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1430,7 +1430,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 4de35f813a85..b6cc11ac3076 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	2019-03-11 22:00:54 UTC
+--- chrome/common/pref_names.h.orig	2019-04-30 22:22:38 UTC
 +++ chrome/common/pref_names.h
-@@ -300,7 +300,7 @@ extern const char kMdHistoryMenuPromoShown[];
+@@ -301,7 +301,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[];
-@@ -333,7 +333,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -334,7 +334,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)
-@@ -487,7 +487,7 @@ extern const char kAppWindowPlacement[];
+@@ -490,7 +490,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];
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 f212e20609c5..0178d066c1c3 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	2019-03-11 22:00:54 UTC
+--- chrome/common/webui_url_constants.cc.orig	2019-04-30 22:22:38 UTC
 +++ chrome/common/webui_url_constants.cc
-@@ -246,7 +246,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
+@@ -243,7 +243,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
  const char kChromeUICastHost[] = "cast";
  #endif
  
@@ -9,7 +9,7 @@
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
  const char kChromeUIHatsHost[] = "hats";
-@@ -257,11 +257,11 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
+@@ -254,17 +254,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
  const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
  #endif
  
@@ -18,12 +18,19 @@
  const char kChromeUISandboxHost[] = "sandbox";
  #endif
  
+-#if defined(OS_WIN) || defined(OS_MACOSX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
+     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ const char kChromeUIBrowserSwitchHost[] = "browser-switch";
+ const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
+ #endif
+ 
 -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
  #endif
  
-@@ -415,13 +415,13 @@ const char* const kChromeHostURLs[] = {
+@@ -418,13 +418,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 2fd054c9aa0e..f87fab6c631a 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	2019-03-11 22:00:54 UTC
+--- chrome/common/webui_url_constants.h.orig	2019-04-30 22:22:38 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -241,7 +241,7 @@ extern const char kChromeUIMetroFlowURL[];
+@@ -238,7 +238,7 @@ extern const char kChromeUIMetroFlowURL[];
  extern const char kChromeUICastHost[];
  #endif
  
@@ -9,7 +9,7 @@
  extern const char kChromeUIDiscardsHost[];
  extern const char kChromeUIDiscardsURL[];
  extern const char kChromeUIHatsHost[];
-@@ -253,11 +253,11 @@ extern const char kChromeUIHatsURL[];
+@@ -250,17 +250,17 @@ extern const char kChromeUIHatsURL[];
  extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
@@ -18,6 +18,13 @@
  extern const char kChromeUISandboxHost[];
  #endif
  
+-#if defined(OS_WIN) || defined(OS_MACOSX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
+     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ extern const char kChromeUIBrowserSwitchHost[];
+ extern const char kChromeUIBrowserSwitchURL[];
+ #endif
+ 
 -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
  extern const char kChromeUITabModalConfirmDialogHost[];
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 ccb3ec50ca26..4f7730c6c009 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	2019-03-17 20:22:37 UTC
+--- chrome/renderer/chrome_content_renderer_client.cc.orig	2019-04-30 22:22:38 UTC
 +++ chrome/renderer/chrome_content_renderer_client.cc
-@@ -1012,7 +1012,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
+@@ -1035,7 +1035,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 727c3aca7018..c85786968784 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig	2019-03-24 18:46:05.402110000 +0100
-+++ chrome/test/BUILD.gn	2019-03-24 18:46:25.234572000 +0100
-@@ -5232,7 +5232,7 @@
+--- chrome/test/BUILD.gn.orig	2019-04-30 22:22:38 UTC
++++ chrome/test/BUILD.gn
+@@ -5318,7 +5318,7 @@ test("chrome_app_unittests") {
      "//components/crash/core/common",
      "//components/flags_ui:switches",
    ]
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
new file mode 100644
index 000000000000..8b2918d07030
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -0,0 +1,13 @@
+--- chrome/test/chromedriver/chrome_launcher.cc.orig	2019-04-30 22:22:38 UTC
++++ chrome/test/chromedriver/chrome_launcher.cc
+@@ -66,6 +66,10 @@
+ #include "chrome/test/chromedriver/keycode_text_conversion.h"
+ #endif
+ 
++#if defined(OS_BSD)
++#include <sys/wait.h>
++#endif
++
+ namespace {
+ 
+ // TODO(eseckler): Remove --ignore-certificate-errors for newer Chrome versions
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 a665fc7ccd3b..92d87008ea8f 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	2019-03-11 22:00:56 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2019-04-30 22:22:40 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
  #include "ui/compositor/compositor_switches.h"
  #include "ui/gl/gl_switches.h"
  
@@ -9,7 +9,7 @@
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -244,7 +244,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -245,7 +245,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {cc::switches::kDisableThreadedAnimation, ""},
  #endif  // defined(OS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -18,7 +18,16 @@
  #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.
-@@ -393,7 +393,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() 
+@@ -255,7 +255,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+     {switches::kEnableHardwareOverlays, "cast"},
+ #endif
+ #endif
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+     // 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.
+@@ -394,7 +394,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() 
  }
  
  void CastBrowserMainParts::ToolkitInitialized() {
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 16182b516e4f..195c522244cf 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	2019-03-11 22:00:56 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2019-04-30 22:22:40 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -524,7 +524,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -559,7 +559,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
new file mode 100644
index 000000000000..3e40c44a59da
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn
@@ -0,0 +1,11 @@
+--- chromecast/browser/metrics/BUILD.gn.orig	2019-04-30 22:22:40 UTC
++++ chromecast/browser/metrics/BUILD.gn
+@@ -27,7 +27,7 @@ cast_source_set("metrics") {
+     "//content/public/common",
+   ]
+ 
+-  if (is_linux) {
++  if (is_linux || is_bsd) {
+     sources += [
+       "external_metrics.cc",
+       "external_metrics.h",
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc
new file mode 100644
index 000000000000..2583740d3c4c
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc
@@ -0,0 +1,102 @@
+--- chromecast/browser/metrics/cast_metrics_service_client.cc.orig	2019-04-30 22:22:40 UTC
++++ chromecast/browser/metrics/cast_metrics_service_client.cc
+@@ -40,9 +40,9 @@
+ #include "content/public/common/content_switches.h"
+ #include "services/network/public/cpp/shared_url_loader_factory.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chromecast/browser/metrics/external_metrics.h"
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_ANDROID)
+ #include "chromecast/base/android/dumpstate_writer.h"
+@@ -62,10 +62,10 @@ const char kMetricsOldClientID[] = "user_experience_me
+ const char kClientIdName[] = "Client ID";
+ #else
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const char kExternalUmaEventsRelativePath[] = "metrics/uma-events";
+ const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events";
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ const struct ChannelMap {
+   const char* chromecast_channel;
+@@ -280,19 +280,19 @@ CastMetricsServiceClient::CastMetricsServiceClient(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory)
+     : pref_service_(pref_service),
+       client_info_loaded_(false),
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       external_metrics_(nullptr),
+       platform_metrics_(nullptr),
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+       task_runner_(base::ThreadTaskRunnerHandle::Get()),
+       url_loader_factory_(url_loader_factory) {
+ }
+ 
+ CastMetricsServiceClient::~CastMetricsServiceClient() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   DCHECK(!external_metrics_);
+   DCHECK(!platform_metrics_);
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ void CastMetricsServiceClient::OnApplicationNotIdle() {
+@@ -300,13 +300,13 @@ void CastMetricsServiceClient::OnApplicationNotIdle() 
+ }
+ 
+ void CastMetricsServiceClient::ProcessExternalEvents(const base::Closure& cb) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   external_metrics_->ProcessExternalEvents(
+       base::Bind(&ExternalMetrics::ProcessExternalEvents,
+                  base::Unretained(platform_metrics_), cb));
+ #else
+   cb.Run();
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ void CastMetricsServiceClient::SetForceClientId(
+@@ -371,7 +371,7 @@ void CastMetricsServiceClient::Initialize() {
+   if (IsReportingEnabled())
+     metrics_service_->Start();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Start external metrics collection, which feeds data from external
+   // processes into the main external metrics.
+   external_metrics_ = new ExternalMetrics(
+@@ -381,7 +381,7 @@ void CastMetricsServiceClient::Initialize() {
+   platform_metrics_ =
+       new ExternalMetrics(stability_provider, kPlatformUmaEventsPath);
+   platform_metrics_->Start();
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ void CastMetricsServiceClient::Finalize() {
+@@ -390,14 +390,14 @@ void CastMetricsServiceClient::Finalize() {
+   metrics_service_->RecordCompletedSessionEnd();
+ #endif  // !defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Stop metrics service cleanly before destructing CastMetricsServiceClient.
+   // The pointer will be deleted in StopAndDestroy().
+   external_metrics_->StopAndDestroy();
+   external_metrics_ = nullptr;
+   platform_metrics_->StopAndDestroy();
+   platform_metrics_ = nullptr;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   metrics_service_->Stop();
+ }
+ 
diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h
new file mode 100644
index 000000000000..fc468ca98236
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h
@@ -0,0 +1,15 @@
+--- chromecast/browser/metrics/cast_metrics_service_client.h.orig	2019-04-30 22:22:40 UTC
++++ chromecast/browser/metrics/cast_metrics_service_client.h
+@@ -98,10 +98,10 @@ class CastMetricsServiceClient : public ::metrics::Met
+   std::string force_client_id_;
+   bool client_info_loaded_;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   ExternalMetrics* external_metrics_;
+   ExternalMetrics* platform_metrics_;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+   std::unique_ptr<::metrics::MetricsStateManager> metrics_state_manager_;
+   std::unique_ptr<::metrics::MetricsService> metrics_service_;
diff --git a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
index ae7b2dfdab4a..0376d204aedd 100644
--- a/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
+++ b/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
@@ -1,6 +1,6 @@
---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig	2019-03-17 18:44:55 UTC
+--- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig	2019-04-30 22:22:40 UTC
 +++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc
-@@ -14,9 +14,9 @@
+@@ -16,9 +16,9 @@
  #include "chromecast/media/cma/backend/av_sync.h"
  #include "chromecast/media/cma/backend/video_decoder_for_mixer.h"
  
@@ -12,7 +12,7 @@
  
  #if defined(OS_FUCHSIA)
  #include <zircon/syscalls.h>
-@@ -226,7 +226,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
+@@ -228,7 +228,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
    return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner();
  }
  
diff --git a/www/chromium/files/patch-components_autofill__strings.grdp b/www/chromium/files/patch-components_autofill__strings.grdp
index 44b96476a5a2..4c460344c084 100644
--- a/www/chromium/files/patch-components_autofill__strings.grdp
+++ b/www/chromium/files/patch-components_autofill__strings.grdp
@@ -1,7 +1,7 @@
---- components/autofill_strings.grdp.orig	2019-03-11 22:00:56 UTC
+--- components/autofill_strings.grdp.orig	2019-04-30 22:22:41 UTC
 +++ components/autofill_strings.grdp
 @@ -217,7 +217,7 @@
-   <message name="IDS_AUTOFILL_NAME_FIX_FLOW_PROMPT_SAVE_CARD" desc="Text to show for the Autofill save credit card prompt card holder name fix flow button." formatter_data="android_java">
+   <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
      Save card
    </message>
 -  <if expr="is_linux and not chromeos">
diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
index 63f7feda9982..63fb2231566d 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/autofill_experiments.cc.orig	2019-03-11 22:00:56 UTC
+--- components/autofill/core/browser/autofill_experiments.cc.orig	2019-04-30 22:22:41 UTC
 +++ components/autofill/core/browser/autofill_experiments.cc
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
  
  namespace autofill {
  
@@ -9,7 +9,7 @@
  const base::Feature kAutofillDropdownLayoutExperiment{
      "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT};
  const char kAutofillDropdownLayoutParameterName[] = "variant";
-@@ -36,7 +36,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
+@@ -37,7 +37,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
  const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon";
  const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] =
      "two-lines-leading-icon";
@@ -18,7 +18,7 @@
  
  bool IsCreditCardUploadEnabled(const PrefService* pref_service,
                                 const syncer::SyncService* sync_service,
-@@ -143,7 +143,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
+@@ -144,7 +144,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
  }
  
  bool OfferStoreUnmaskedCards(bool is_off_the_record) {
@@ -27,7 +27,7 @@
    // The checkbox can be forced on with a flag, but by default we don't store
    // on Linux due to lack of system keychain integration. See crbug.com/162735
    return base::CommandLine::ForCurrentProcess()->HasSwitch(
-@@ -181,7 +181,7 @@ bool ShouldUseActiveSignedInAccount() {
+@@ -182,7 +182,7 @@ bool ShouldUseActiveSignedInAccount() {
               features::kAutofillGetPaymentsIdentityFromSync);
  }
  
@@ -36,7 +36,7 @@
  ForcedPopupLayoutState GetForcedPopupLayoutState() {
    if (!base::FeatureList::IsEnabled(
            autofill::kAutofillDropdownLayoutExperiment))
-@@ -205,6 +205,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() {
+@@ -206,6 +206,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() {
    NOTREACHED();
    return ForcedPopupLayoutState::kDefault;
  }
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
index 2b810cc6850d..147fe2467b6f 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_util.cc.orig	2019-03-11 22:00:56 UTC
+--- components/autofill/core/common/autofill_util.cc.orig	2019-04-30 22:22:41 UTC
 +++ components/autofill/core/common/autofill_util.cc
-@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
+@@ -202,7 +202,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
  }
  
  bool ShouldAutoselectFirstSuggestionOnArrowDown() {
diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
index 84201e8fd7e3..3cc3df11aab5 100644
--- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/content/app/BUILD.gn.orig	2019-03-11 22:00:56 UTC
+--- components/crash/content/app/BUILD.gn.orig	2019-04-30 22:22:41 UTC
 +++ components/crash/content/app/BUILD.gn
 @@ -36,12 +36,12 @@ static_library("app") {
      sources += [ "crashpad.cc" ]
@@ -15,7 +15,7 @@
      sources += [
        "breakpad_linux.cc",
        "breakpad_linux.h",
-@@ -79,7 +79,10 @@ static_library("app") {
+@@ -82,7 +82,10 @@ static_library("app") {
        "//third_party/crashpad/crashpad/snapshot",
      ]
  
diff --git a/www/chromium/files/patch-components_crash_content_app_crashpad.cc b/www/chromium/files/patch-components_crash_content_app_crashpad.cc
index d0641d172733..f709f5f3087d 100644
--- a/www/chromium/files/patch-components_crash_content_app_crashpad.cc
+++ b/www/chromium/files/patch-components_crash_content_app_crashpad.cc
@@ -1,6 +1,6 @@
---- components/crash/content/app/crashpad.cc.orig	2019-03-11 22:00:56 UTC
+--- components/crash/content/app/crashpad.cc.orig	2019-04-30 22:22:41 UTC
 +++ components/crash/content/app/crashpad.cc
-@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client,
+@@ -104,6 +104,12 @@ void InitializeCrashpadImpl(bool initial_client,
                              const base::FilePath& exe_path,
                              const std::vector<std::string>& initial_arguments,
                              bool embedded_handler) {
@@ -13,7 +13,7 @@
    static bool initialized = false;
    DCHECK(!initialized);
    initialized = true;
-@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client,
+@@ -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");
@@ -22,7 +22,7 @@
      DCHECK(browser_process);
  #else
  #error Port.
-@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client,
+@@ -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;
@@ -31,7 +31,7 @@
    const bool should_initialize_database_and_set_upload_policy = browser_process;
  #endif
    if (should_initialize_database_and_set_upload_policy) {
-@@ -267,7 +273,9 @@ bool GetUploadsEnabled() {
+@@ -272,7 +278,9 @@ bool GetUploadsEnabled() {
  
  #if !defined(OS_ANDROID)
  void DumpWithoutCrashing() {
diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
index 39279777640b..b042dcf472a0 100644
--- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/common/BUILD.gn.orig	2019-03-11 22:00:56 UTC
+--- components/crash/core/common/BUILD.gn.orig	2019-04-30 22:22:41 UTC
 +++ components/crash/core/common/BUILD.gn
 @@ -6,7 +6,7 @@ import("//build/buildflag_header.gni")
  
@@ -9,7 +9,7 @@
  }
  
  group("common") {
-@@ -89,7 +89,6 @@ target(crash_key_target_type, "crash_key") {
+@@ -92,7 +92,6 @@ target(crash_key_target_type, "crash_key") {
        ]
      }
  
@@ -17,7 +17,7 @@
    }
  }
  
-@@ -144,7 +143,7 @@ source_set("unit_tests") {
+@@ -147,7 +146,7 @@ source_set("unit_tests") {
      sources += [ "objc_zombie_unittest.mm" ]
    }
  
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
new file mode 100644
index 000000000000..c60473f30393
--- /dev/null
+++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -0,0 +1,20 @@
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2019-04-30 22:22:41 UTC
++++ components/discardable_memory/service/discardable_shared_memory_manager.cc
+@@ -32,7 +32,7 @@
+ #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
+ #include "mojo/public/cpp/bindings/strong_binding.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/files/file_path.h"
+ #include "base/files/file_util.h"
+ #include "base/metrics/histogram_macros.h"
+@@ -170,7 +170,7 @@ int64_t GetDefaultMemoryLimit() {
+     max_default_memory_limit /= 8;
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::FilePath shmem_dir;
+   if (base::GetShmemTempDir(false, &shmem_dir)) {
+     int64_t shmem_dir_amount_of_free_space =
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 c1b465c08211..080a98e51b65 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,11 +1,20 @@
---- components/download/internal/common/base_file.cc.orig	2019-03-11 22:00:56 UTC
+--- components/download/internal/common/base_file.cc.orig	2019-04-30 22:22:41 UTC
 +++ components/download/internal/common/base_file.cc
-@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason(
-   return reason;
+@@ -494,7 +494,7 @@ DownloadInterruptReason BaseFile::PublishDownload() {
  }
+ #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  
  namespace {
  
+@@ -578,7 +578,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn
+   }
+   return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
+ }
+-#else  // !OS_WIN && !OS_MACOSX && !OS_LINUX
++#else  // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD
+ DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
+     const std::string& client_guid,
+     const GURL& source_url,
diff --git a/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc b/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc
deleted file mode 100644
index 01a891ce5421..000000000000
--- a/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- components/download/quarantine/quarantine_linux.cc.orig	2019-03-11 22:00:56 UTC
-+++ components/download/quarantine/quarantine_linux.cc
-@@ -2,11 +2,15 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include "build/build_config.h"
-+
- #include "components/download/quarantine/quarantine.h"
- 
- #include <stddef.h>
- #include <sys/types.h>
-+#if !defined(OS_BSD)
- #include <sys/xattr.h>
-+#endif
- 
- #include "base/files/file_path.h"
- #include "base/logging.h"
-@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path,
-                               int flags) {
- // On Chrome OS, there is no component that can validate these extended
- // attributes so there is no need to set them.
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
-   int result = setxattr(path, name, value, value_size, flags);
-   if (result) {
-@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path,
-                  << path;
-     return false;
-   }
--#endif  // !defined(OS_CHROMEOS)
-+#endif  // !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   return true;
- }
- 
diff --git a/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc b/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc
deleted file mode 100644
index e49bc39198d3..000000000000
--- a/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/download/quarantine/test_support_linux.cc.orig	2019-03-11 22:00:56 UTC
-+++ components/download/quarantine/test_support_linux.cc
-@@ -21,6 +21,7 @@ namespace download {
- namespace {
- 
- std::string GetExtendedFileAttribute(const char* path, const char* name) {
-+#if !defined(OS_BSD)
-   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
-   ssize_t len = getxattr(path, name, nullptr, 0);
-   if (len <= 0)
-@@ -31,6 +32,9 @@ std::string GetExtendedFileAttribute(const char* path,
-   if (len < static_cast<ssize_t>(buffer.size()))
-     return std::string();
-   return std::string(buffer.begin(), buffer.end());
-+#else
-+  return std::string();
-+#endif // !defined(OS_BSD)
- }
- 
- }  // namespace
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index a2dbc0a29a13..72303e70ab19 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig	2019-03-11 22:00:56 UTC
+--- components/flags_ui/flags_state.cc.orig	2019-04-30 22:22:42 UTC
 +++ components/flags_ui/flags_state.cc
-@@ -618,7 +618,7 @@ int FlagsState::GetCurrentPlatform() {
+@@ -616,7 +616,7 @@ int FlagsState::GetCurrentPlatform() {
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;
diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn
index 48f72989095e..e50efbe67667 100644
--- a/www/chromium/files/patch-components_metrics_BUILD.gn
+++ b/www/chromium/files/patch-components_metrics_BUILD.gn
@@ -1,6 +1,6 @@
---- components/metrics/BUILD.gn.orig	2019-03-11 22:00:56 UTC
+--- components/metrics/BUILD.gn.orig	2019-04-30 22:22:42 UTC
 +++ components/metrics/BUILD.gn
-@@ -143,6 +143,11 @@ jumbo_static_library("metrics") {
+@@ -144,6 +144,11 @@ jumbo_static_library("metrics") {
    if (is_fuchsia) {
      sources += [ "drive_metrics_provider_fuchsia.cc" ]
    }
diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js
index 7a5d6317acba..141bd4fd9e77 100644
--- a/www/chromium/files/patch-components_neterror_resources_neterror.js
+++ b/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -1,6 +1,6 @@
---- components/neterror/resources/neterror.js.orig	2019-03-11 22:00:56 UTC
+--- components/neterror/resources/neterror.js.orig	2019-04-30 22:22:42 UTC
 +++ components/neterror/resources/neterror.js
-@@ -166,7 +166,7 @@ function setUpCachedButton(buttonStrings) {
+@@ -160,7 +160,7 @@ function setUpCachedButton(buttonStrings) {
  }
  
  var primaryControlOnLeft = true;
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 03b0cb2986a0..b932f6d6a265 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	2019-03-11 22:00:56 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig	2019-04-30 22:22:42 UTC
 +++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -662,7 +662,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -697,7 +697,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 354bf7e0992c..762c269bd4d4 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	2019-03-11 22:00:56 UTC
+--- components/policy/resources/policy_templates.json.orig	2019-04-30 22:22:43 UTC
 +++ components/policy/resources/policy_templates.json
-@@ -956,7 +956,7 @@
+@@ -984,7 +984,7 @@
        'name': 'HomepageLocation',
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -983,7 +983,7 @@
+@@ -1013,7 +1013,7 @@
        'name': 'HomepageIsNewTabPage',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1009,7 +1009,7 @@
+@@ -1039,7 +1039,7 @@
        'name': 'NewTabPageLocation',
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -27,7 +27,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -1702,7 +1702,7 @@
+@@ -1732,7 +1732,7 @@
        'name': 'RemoteAccessHostMatchUsername',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -36,7 +36,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -3192,7 +3192,7 @@
+@@ -3338,7 +3338,7 @@
        'name': 'GSSAPILibraryName',
        'type': 'string',
        'schema': { 'type': 'string' },
@@ -45,7 +45,7 @@
        'features': {
          'dynamic_refresh': False,
          'per_profile': False,
-@@ -3244,7 +3244,7 @@
+@@ -3390,7 +3390,7 @@
        'name': 'NtlmV2Enabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -54,7 +54,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -6303,7 +6303,7 @@
+@@ -6448,7 +6448,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -7433,7 +7433,7 @@
+@@ -7578,7 +7578,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -7948,7 +7948,7 @@
+@@ -8094,7 +8094,7 @@
        'name': 'FullscreenAllowed',
        'type': 'main',
        'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc
index 0f048efa703b..c9bf5bdb81f6 100644
--- a/www/chromium/files/patch-components_services_filesystem_file__system__app.cc
+++ b/www/chromium/files/patch-components_services_filesystem_file__system__app.cc
@@ -1,6 +1,6 @@
---- components/services/filesystem/file_system_app.cc.orig	2019-03-11 22:00:57 UTC
+--- components/services/filesystem/file_system_app.cc.orig	2019-04-30 22:22:43 UTC
 +++ components/services/filesystem/file_system_app.cc
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
  #elif defined(OS_ANDROID)
  #include "base/base_paths_android.h"
  #include "base/path_service.h"
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MACOSX)
-@@ -73,7 +73,7 @@ base::FilePath FileSystemApp::GetUserDataDir() {
+@@ -74,7 +74,7 @@ base::FilePath FileSystemApp::GetUserDataDir() {
      CHECK(base::PathService::Get(base::DIR_APP_DATA, &path));
  #elif defined(OS_ANDROID)
      CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
diff --git a/www/chromium/files/patch-components_services_font_font__service__app.cc b/www/chromium/files/patch-components_services_font_font__service__app.cc
index 4e23e0f9389d..a3b5f0d436e1 100644
--- a/www/chromium/files/patch-components_services_font_font__service__app.cc
+++ b/www/chromium/files/patch-components_services_font_font__service__app.cc
@@ -1,6 +1,6 @@
---- components/services/font/font_service_app.cc.orig	2019-03-11 22:00:57 UTC
+--- components/services/font/font_service_app.cc.orig	2019-04-30 22:22:43 UTC
 +++ components/services/font/font_service_app.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #include "components/services/font/ppapi_fontconfig_matching.h"  // nogncheck
  #endif
  
diff --git a/www/chromium/files/patch-components_sync_base_get__session__name.cc b/www/chromium/files/patch-components_sync_base_get__session__name.cc
index d59c6a39959e..6afc6529bc28 100644
--- a/www/chromium/files/patch-components_sync_base_get__session__name.cc
+++ b/www/chromium/files/patch-components_sync_base_get__session__name.cc
@@ -1,4 +1,4 @@
---- components/sync/base/get_session_name.cc.orig	2019-03-11 22:00:57 UTC
+--- components/sync/base/get_session_name.cc.orig	2019-04-30 22:22:44 UTC
 +++ components/sync/base/get_session_name.cc
 @@ -17,7 +17,7 @@
  
@@ -9,7 +9,7 @@
  #include "components/sync/base/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "components/sync/base/get_session_name_ios.h"
-@@ -52,7 +52,7 @@ std::string GetSessionNameBlocking() {
+@@ -53,7 +53,7 @@ std::string GetSessionNameBlocking() {
        session_name = "Chromebook";
        break;
    }
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 323eabff6bbf..fc52368a6836 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	2019-03-11 22:00:57 UTC
+--- content/app/content_main_runner_impl.cc.orig	2019-04-30 22:22:45 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -93,17 +93,17 @@
+@@ -96,17 +96,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"
-@@ -124,7 +124,7 @@
+@@ -127,7 +127,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"
-@@ -309,7 +309,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -319,7 +319,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
-@@ -406,7 +406,7 @@ void PreSandboxInit() {
+@@ -416,7 +416,7 @@ void PreSandboxInit() {
  }
  #endif  // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
@@ -48,7 +48,7 @@
  
  }  // namespace
  
-@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) {
+@@ -474,7 +474,7 @@ int RunZygote(ContentMainDelegate* delegate) {
    delegate->ZygoteStarting(&zygote_fork_delegates);
    media::InitializeMediaLibrary();
  
@@ -57,7 +57,7 @@
    PreSandboxInit();
  #endif
  
-@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
+@@ -647,11 +647,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
index 58c52636ecb3..5db305e07832 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2019-03-11 22:00:57 UTC
+--- content/browser/BUILD.gn.orig	2019-04-30 22:22:45 UTC
 +++ content/browser/BUILD.gn
-@@ -1939,11 +1939,6 @@ jumbo_source_set("browser") {
+@@ -1959,11 +1959,6 @@ jumbo_source_set("browser") {
        "tracing/cros_tracing_agent.h",
      ]
      deps += [ "//chromeos/resources" ]
diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
new file mode 100644
index 000000000000..ac2c342888c2
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
@@ -0,0 +1,11 @@
+--- content/browser/devtools/protocol/system_info_handler.cc.orig	2019-05-04 08:59:22 UTC
++++ content/browser/devtools/protocol/system_info_handler.cc
+@@ -40,7 +40,7 @@ using GetInfoCallback = SystemInfo::Backend::GetInfoCa
+ // Give the GPU process a few seconds to provide GPU info.
+ // Linux Debug builds need more time -- see Issue 796437.
+ // Windows builds need more time -- see Issue 873112.
+-#if (defined(OS_LINUX) && !defined(NDEBUG)) || defined(OS_WIN)
++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) || defined(OS_WIN)
+ const int kGPUInfoWatchdogTimeoutMs = 20000;
+ #else
+ const int kGPUInfoWatchdogTimeoutMs = 5000;
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
new file mode 100644
index 000000000000..1d877f9a09d8
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -0,0 +1,11 @@
+--- content/browser/gpu/gpu_process_host.cc.orig	2019-05-04 09:09:15 UTC
++++ content/browser/gpu/gpu_process_host.cc
+@@ -1071,7 +1071,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
+   std::unique_ptr<base::CommandLine> cmd_line =
+       std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
+ #else
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
+                                          : ChildProcessHost::CHILD_NORMAL;
+ #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 b4f44f36bf1a..ee8b12acbe04 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	2019-03-11 22:00:57 UTC
+--- content/browser/media/media_internals.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/media/media_internals.cc
-@@ -763,7 +763,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+@@ -766,7 +766,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
      device_dict->SetString("name", descriptor.GetNameAndModel());
      device_dict->Set("formats", std::move(format_list));
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
new file mode 100644
index 000000000000..4c2671b2267c
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
@@ -0,0 +1,11 @@
+--- content/browser/ppapi_plugin_process_host.cc.orig	2019-05-04 09:03:05 UTC
++++ content/browser/ppapi_plugin_process_host.cc
+@@ -343,7 +343,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
+   base::CommandLine::StringType plugin_launcher =
+       browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
+                                         ChildProcessHost::CHILD_NORMAL;
+ #else
diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
new file mode 100644
index 000000000000..6e9b01d89edc
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
@@ -0,0 +1,20 @@
+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2019-05-04 09:07:21 UTC
++++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
+@@ -432,7 +432,7 @@ void PepperFileIOHost::OnLocalFileOpened(
+     ppapi::host::ReplyMessageContext reply_context,
+     const base::FilePath& path,
+     base::File::Error error_code) {
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   // Quarantining a file before its contents are available is only supported on
+   // Windows and Linux.
+   if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
+@@ -452,7 +452,7 @@ void PepperFileIOHost::OnLocalFileOpened(
+ #endif
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ void PepperFileIOHost::OnLocalFileQuarantined(
+     ppapi::host::ReplyMessageContext reply_context,
+     const base::FilePath& path,
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
new file mode 100644
index 000000000000..cc4c2747f097
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -0,0 +1,29 @@
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2019-05-04 09:04:28 UTC
++++ content/browser/renderer_host/render_process_host_impl.cc
+@@ -231,7 +231,7 @@
+ #include "content/browser/compositor/image_transport_factory.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/resource.h>
+ #include <sys/time.h>
+ #endif
+@@ -1214,7 +1214,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+ // to indicate failure and std::numeric_limits<size_t>::max() to indicate
+ // unlimited.
+ size_t GetPlatformProcessLimit() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   struct rlimit limit;
+   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
+     return kUnknownPlatformProcessLimit;
+@@ -1643,7 +1643,7 @@ bool RenderProcessHostImpl::Init() {
+   renderer_prefix =
+       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
+                                       : ChildProcessHost::CHILD_NORMAL;
+ #else
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 4d41e5f1077e..01f2bfa6f20e 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	2019-03-11 22:00:58 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
-@@ -407,10 +407,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -406,10 +406,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 ea644916e3f7..4d34292703dd 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,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2019-03-11 22:00:58 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -161,7 +161,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
+@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
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 50efe3a52519..3bba837a46fd 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2019-03-11 22:00:58 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -121,7 +121,7 @@
+@@ -123,7 +123,7 @@
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
-@@ -2192,7 +2192,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2221,7 +2221,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2390,7 +2390,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2419,7 +2419,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
diff --git a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
index dbb845ce1377..f71c1f4eeed4 100644
--- a/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
+++ b/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
@@ -1,4 +1,4 @@
---- content/browser/service_manager/service_manager_context.cc.orig	2019-03-11 22:00:58 UTC
+--- content/browser/service_manager/service_manager_context.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/service_manager/service_manager_context.cc
 @@ -99,7 +99,7 @@
  #include "jni/ContentNfcDelegate_jni.h"
@@ -9,7 +9,7 @@
  #include "components/services/font/font_service_app.h"
  #include "components/services/font/public/interfaces/constants.mojom.h"
  #endif
-@@ -378,12 +378,12 @@ void CreateInProcessAudioService(
+@@ -387,12 +387,12 @@ void CreateInProcessAudioService(
                       BrowserMainLoop::GetAudioManager(), std::move(request)));
  }
  
@@ -24,7 +24,7 @@
  
  std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
      service_manager::mojom::ServiceRequest request) {
-@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext(
+@@ -614,7 +614,7 @@ ServiceManagerContext::ServiceManagerContext(
          base::BindRepeating(&CreateVideoCaptureService));
    }
  
diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl.cc b/www/chromium/files/patch-content_browser_storage__partition__impl.cc
index a086392dfa90..3c7bfdd0bade 100644
--- a/www/chromium/files/patch-content_browser_storage__partition__impl.cc
+++ b/www/chromium/files/patch-content_browser_storage__partition__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/storage_partition_impl.cc.orig	2019-03-17 17:48:03 UTC
+--- content/browser/storage_partition_impl.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/storage_partition_impl.cc
-@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
+@@ -773,7 +773,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
    // TODO(jam): enable for all, still used on WebView.
    // See copy of this ifdef in:
    //   StoragePartitionImplMap::Get
diff --git a/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc b/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
index 977fdd529673..c9eb89523cb2 100644
--- a/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
+++ b/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
@@ -1,6 +1,6 @@
---- content/browser/storage_partition_impl_map.cc.orig	2019-03-17 17:40:34 UTC
+--- content/browser/storage_partition_impl_map.cc.orig	2019-04-30 22:22:46 UTC
 +++ content/browser/storage_partition_impl_map.cc
-@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
+@@ -426,7 +426,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
    bool create_request_context = true;
    if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
      // These ifdefs should match StoragePartitionImpl::GetURLRequestContext.
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
new file mode 100644
index 000000000000..b179156ccf8b
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -0,0 +1,11 @@
+--- content/browser/utility_process_host.cc.orig	2019-05-04 09:00:43 UTC
++++ content/browser/utility_process_host.cc
+@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost(
+     : client_(client),
+       client_task_runner_(client_task_runner),
+       sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
+ #else
+       child_flags_(ChildProcessHost::CHILD_NORMAL),
diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
index 6ba8db73abcd..52e024a14b9e 100644
--- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
+++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
@@ -1,12 +1,12 @@
---- content/browser/webui/shared_resources_data_source.cc.orig	2019-03-11 22:00:58 UTC
+--- content/browser/webui/shared_resources_data_source.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/browser/webui/shared_resources_data_source.cc
-@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
-   return std::map<int, std::string> {
-     {IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"},
-         {IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_lite.js"},
+@@ -102,9 +102,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
+         {IDR_MOJO_BIG_BUFFER_MOJOM_LITE_JS, "js/big_buffer.mojom-lite.js"},
+         {IDR_MOJO_FILE_MOJOM_LITE_JS, "js/file.mojom-lite.js"},
+         {IDR_MOJO_STRING16_MOJOM_LITE_JS, "js/string16.mojom-lite.js"},
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-         {IDR_MOJO_TIME_MOJOM_JS, "js/time.mojom.js"},
+         {IDR_MOJO_TIME_MOJOM_LITE_JS, "js/time.mojom-lite.js"},
 -#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-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 030ecf86ce76..da49aeb651da 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	2019-03-11 22:00:58 UTC
+--- content/common/BUILD.gn.orig	2019-04-30 22:22:47 UTC
 +++ content/common/BUILD.gn
-@@ -382,6 +382,12 @@ source_set("common") {
+@@ -377,6 +377,12 @@ source_set("common") {
      libs += [ "android" ]
    }
  
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index aba058e673bb..2a3b751ec206 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig	2019-03-11 22:00:58 UTC
+--- content/gpu/gpu_main.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/gpu/gpu_main.cc
-@@ -78,7 +78,7 @@
+@@ -79,7 +79,7 @@
  #include "ui/gfx/x/x11_switches.h"    // nogncheck
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/gpu/gpu_sandbox_hook_linux.h"
  #include "content/public/common/sandbox_init.h"
  #include "services/service_manager/sandbox/linux/sandbox_linux.h"
-@@ -111,7 +111,7 @@ namespace content {
+@@ -112,7 +112,7 @@ namespace content {
  
  namespace {
  
@@ -18,7 +18,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -173,7 +173,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_);
-@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) {
+@@ -363,7 +363,7 @@ int GpuMain(const MainFunctionParams& parameters) {
  
  namespace {
  
@@ -36,7 +36,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
-@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -398,7 +398,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
  
    return res;
  }
diff --git a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
index 0a187e7f641b..7b5450cd4120 100644
--- a/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
+++ b/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
@@ -1,12 +1,12 @@
---- content/public/app/content_packaged_services_manifest.cc.orig	2019-03-11 22:00:58 UTC
+--- content/public/app/content_packaged_services_manifest.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/public/app/content_packaged_services_manifest.cc
 @@ -23,7 +23,7 @@
- #include "services/video_capture/manifest.h"
- #include "services/viz/manifest.h"
+ #include "services/video_capture/public/cpp/manifest.h"
+ #include "services/viz/public/cpp/manifest.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
- #include "components/services/font/manifest.h"
+ #include "components/services/font/public/cpp/manifest.h"  // nogncheck
  #endif
  
 @@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer
diff --git a/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc b/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
index 28f94888055e..9a4179259ea8 100644
--- a/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
+++ b/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
@@ -1,6 +1,6 @@
---- content/public/app/v8_snapshot_overlay_manifest.cc.orig	2019-03-24 18:50:53.929211000 +0100
-+++ content/public/app/v8_snapshot_overlay_manifest.cc	2019-03-24 18:51:09.015465000 +0100
-@@ -15,7 +15,7 @@
+--- content/public/app/v8_snapshot_overlay_manifest.cc.orig	2019-04-30 22:22:47 UTC
++++ content/public/app/v8_snapshot_overlay_manifest.cc
+@@ -15,7 +15,7 @@ namespace content {
  const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
    static base::NoDestructor<service_manager::Manifest> manifest {
      service_manager::ManifestBuilder()
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 190748e6447c..3c1be570ceb5 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	2019-03-11 22:00:58 UTC
+--- content/public/common/common_param_traits_macros.h.orig	2019-04-30 22:22:47 UTC
 +++ content/public/common/common_param_traits_macros.h
-@@ -325,7 +325,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
+@@ -330,7 +330,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
    IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
    IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
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 228177dc69a0..c81eb3c51df9 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,11 +1,20 @@
---- content/public/common/content_features.cc.orig	2019-03-24 18:52:00.447438000 +0100
-+++ content/public/common/content_features.cc	2019-03-24 18:52:16.870073000 +0100
-@@ -493,7 +493,7 @@
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
+--- content/public/common/content_features.cc.orig	2019-04-30 22:22:47 UTC
++++ content/public/common/content_features.cc
+@@ -541,7 +541,7 @@ const base::Feature kWebAssemblyThreads {
+ };
  
  // Enable WebAssembly trap handler.
--#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_64)
+-#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \
++#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \
+     defined(ARCH_CPU_X86_64)
  const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -576,7 +576,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
+ // https://w3c.github.io/webauthn
+ const base::Feature kWebAuthCable {
+   "WebAuthenticationCable",
+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD)
+       base::FEATURE_DISABLED_BY_DEFAULT
  #else
+       base::FEATURE_ENABLED_BY_DEFAULT
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 48cac09ce79d..d33ebd1592a4 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	2019-03-11 22:00:58 UTC
+--- content/public/common/content_switches.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/public/common/content_switches.cc
-@@ -968,7 +968,7 @@ const char kDisableAudioSupportForDesktopShare[] =
+@@ -974,7 +974,7 @@ const char kDisableAudioSupportForDesktopShare[] =
  const char kDisablePanelFitting[]           = "disable-panel-fitting";
  #endif
  
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 4ef3b25a854a..9357ebdf49af 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	2019-03-11 22:00:58 UTC
+--- content/public/common/content_switches.h.orig	2019-04-30 22:22:47 UTC
 +++ content/public/common/content_switches.h
-@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
+@@ -272,7 +272,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
  CONTENT_EXPORT extern const char kDisablePanelFitting[];
  #endif
  
diff --git a/www/chromium/files/patch-content_public_common_renderer__preferences.h b/www/chromium/files/patch-content_public_common_renderer__preferences.h
deleted file mode 100644
index 06c9495f2b6d..000000000000
--- a/www/chromium/files/patch-content_public_common_renderer__preferences.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/common/renderer_preferences.h.orig	2019-03-11 22:00:58 UTC
-+++ content/public/common/renderer_preferences.h
-@@ -120,7 +120,7 @@ struct CONTENT_EXPORT RendererPreferences {
-   // Country iso of the mobile network for content detection purpose.
-   std::string network_contry_iso;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   std::string system_font_family_name;
- #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 1c04e6682c14..178d3bdc4cda 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	2019-03-11 22:00:58 UTC
+--- content/public/test/browser_test_base.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/public/test/browser_test_base.cc
-@@ -62,6 +62,10 @@
+@@ -63,6 +63,10 @@
  #include "ui/views/test/event_generator_delegate_mac.h"
  #endif
  
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 3837fbd79ecf..0f8673a20b08 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-03-17 17:24:56 UTC
+--- content/public/test/mock_render_thread.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/public/test/mock_render_thread.cc
-@@ -69,7 +69,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
+@@ -74,7 +74,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
      std::move(callback).Run(false);
    }
  
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 42d0c2ee4eee..cb6e8ea8c523 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-03-11 22:00:58 UTC
+--- content/renderer/media/audio/audio_device_factory.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/media/audio/audio_device_factory.cc
-@@ -33,7 +33,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
+@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
  
  namespace {
  
diff --git a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
index e8c4b3a167b7..82527438f4a3 100644
--- a/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
+++ b/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
@@ -1,4 +1,4 @@
---- content/renderer/media/stream/processed_local_audio_source.cc.orig	2019-03-11 22:00:58 UTC
+--- content/renderer/media/stream/processed_local_audio_source.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/media/stream/processed_local_audio_source.cc
 @@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier =
      const_cast<void**>(&kProcessedLocalAudioSourceIdentifier);
@@ -9,7 +9,7 @@
    return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
  #else
    return false;
-@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
+@@ -402,7 +402,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
      bool key_pressed) {
  #if defined(OS_WIN) || defined(OS_MACOSX)
    DCHECK_LE(volume, 1.0);
diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
index 179ab20533ae..8a7f11726d24 100644
--- a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
+++ b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
@@ -1,6 +1,6 @@
---- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig	2019-03-17 17:29:28 UTC
+--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc
-@@ -203,7 +203,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
+@@ -204,7 +204,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
  TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) {
    SetupRenderer(kDefaultOutputDeviceId);
    renderer_proxy_->Start();
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
new file mode 100644
index 000000000000..153f389402ac
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -0,0 +1,11 @@
+--- content/renderer/render_process_impl.cc.orig	2019-05-04 08:57:40 UTC
++++ content/renderer/render_process_impl.cc
+@@ -163,7 +163,7 @@ RenderProcessImpl::RenderProcessImpl(
+ 
+   SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
+                         "--no-wasm-trap-handler");
+-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
+   if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
+     bool use_v8_signal_handler = false;
+     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
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 950c2e011d7a..d1679ca5f8fd 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_thread_impl.cc.orig	2019-03-11 22:00:58 UTC
+--- content/renderer/render_thread_impl.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/render_thread_impl.cc
 @@ -191,12 +191,21 @@
  #include "mojo/public/cpp/bindings/message_dumper.h"
@@ -22,7 +22,7 @@
  using base::ThreadRestrictions;
  using blink::WebDocument;
  using blink::WebFrame;
-@@ -926,7 +935,7 @@ void RenderThreadImpl::Init() {
+@@ -917,7 +926,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(
-@@ -967,7 +976,7 @@ void RenderThreadImpl::Init() {
+@@ -958,7 +967,7 @@ void RenderThreadImpl::Init() {
    GetConnector()->BindInterface(mojom::kBrowserServiceName,
                                  mojo::MakeRequest(&storage_partition_service_));
  
@@ -40,7 +40,7 @@
    render_message_filter()->SetThreadPriority(
        ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
  #endif
-@@ -1337,11 +1346,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1329,11 +1338,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
    const bool enable_gpu_memory_buffers =
        !is_gpu_compositing_disabled_ &&
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index ebd1a58d9253..cbf1811092a4 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2019-03-11 22:00:58 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
  
  #if defined(OS_MACOSX)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #endif
  
-@@ -202,7 +202,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
                       ->Clone();
      thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
      blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
@@ -18,7 +18,7 @@
      font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
      SkFontConfigInterface::SetGlobal(font_loader_);
  #endif
-@@ -211,7 +211,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
      connector_ = service_manager::Connector::Create(&request);
    }
  
@@ -27,7 +27,7 @@
    if (g_sandbox_enabled && sandboxEnabled()) {
  #if defined(OS_MACOSX)
      sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
-@@ -239,7 +239,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
+@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
  }
  
  void RendererBlinkPlatformImpl::Shutdown() {
@@ -36,7 +36,7 @@
    // SandboxSupport contains a map of OutOfProcessFont objects, which hold
    // WebStrings and WebVectors, which become invalidated when blink is shut
    // down. Hence, we need to clear that map now, just before blink::shutdown()
-@@ -320,7 +320,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
+@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
  
  void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
      base::PlatformThreadId thread_id) {
@@ -45,7 +45,7 @@
    if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
      render_thread->render_message_filter()->SetThreadPriority(
          thread_id, base::ThreadPriority::DISPLAY);
-@@ -333,7 +333,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
  }
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
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 7c4e00966793..d9c45a56c8f7 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,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2019-03-11 22:00:58 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2019-04-30 22:22:47 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
  #include "third_party/blink/public/platform/modules/webdatabase/web_database.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
-@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    std::unique_ptr<service_manager::Connector> connector_;
    scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
  
@@ -18,7 +18,7 @@
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  
-@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -302,7 +302,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
    scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
  
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 98908a3bb40c..7e4cb78da138 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2019-03-24 18:54:11.955928000 +0100
-+++ content/shell/BUILD.gn	2019-03-24 18:54:21.602776000 +0100
-@@ -942,7 +942,7 @@
+--- content/shell/BUILD.gn.orig	2019-04-30 22:22:47 UTC
++++ content/shell/BUILD.gn
+@@ -934,7 +934,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_browser_web__test_web__test__browser__context.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
new file mode 100644
index 000000000000..2b4d8ed2fb5a
--- /dev/null
+++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
@@ -0,0 +1,11 @@
+--- content/shell/browser/web_test/web_test_browser_context.cc.orig	2019-04-30 22:22:48 UTC
++++ content/shell/browser/web_test/web_test_browser_context.cc
+@@ -27,7 +27,7 @@
+ 
+ #if defined(OS_WIN)
+ #include "base/base_paths_win.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/nix/xdg_util.h"
+ #elif defined(OS_MACOSX)
+ #include "base/base_paths_mac.h"
diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
new file mode 100644
index 000000000000..cfb8a0cb8b2c
--- /dev/null
+++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
@@ -0,0 +1,11 @@
+--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig	2019-04-30 22:22:48 UTC
++++ content/shell/browser/web_test/web_test_browser_main_parts.cc
+@@ -42,7 +42,7 @@
+ #if defined(USE_AURA) && defined(USE_X11)
+ #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
+ #endif
+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+ #include "ui/base/ime/input_method_initializer.h"
+ #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 ee4c1426d550..ecdcc7c8c05b 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,6 +1,6 @@
---- content/shell/test_runner/test_runner.cc.orig	2019-03-17 17:19:52 UTC
+--- content/shell/test_runner/test_runner.cc.orig	2019-04-30 22:22:48 UTC
 +++ content/shell/test_runner/test_runner.cc
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
  #include "ui/gfx/geometry/size.h"
  #include "ui/gfx/skia_util.h"
  
@@ -9,7 +9,7 @@
  #include "third_party/blink/public/platform/web_font_render_style.h"
  #endif
  
-@@ -1542,7 +1542,7 @@ void TestRunner::Reset() {
+@@ -1544,7 +1544,7 @@ void TestRunner::Reset() {
    drag_image_.reset();
  
    blink::WebSecurityPolicy::ClearOriginAccessList();
@@ -18,7 +18,7 @@
    blink::WebFontRenderStyle::SetSubpixelPositioning(false);
  #endif
  
-@@ -2091,7 +2091,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
+@@ -2087,7 +2087,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
  }
  
  void TestRunner::SetTextSubpixelPositioning(bool value) {
diff --git a/www/chromium/files/patch-content_test_content__test__suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc
index 230f8ca92226..84146de61855 100644
--- a/www/chromium/files/patch-content_test_content__test__suite.cc
+++ b/www/chromium/files/patch-content_test_content__test__suite.cc
@@ -1,6 +1,6 @@
---- content/test/content_test_suite.cc.orig	2019-03-11 22:00:58 UTC
+--- content/test/content_test_suite.cc.orig	2019-04-30 22:22:48 UTC
 +++ content/test/content_test_suite.cc
-@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() {
+@@ -81,6 +81,7 @@ void ContentTestSuite::Initialize() {
    // to initialize GL, so don't do it here.
    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
    bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess);
@@ -8,7 +8,7 @@
    if (!is_child_process) {
      gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff();
      auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo();
-@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() {
+@@ -88,6 +89,7 @@ void ContentTestSuite::Initialize() {
          gpu_feature_info->disabled_extensions);
      gl::init::InitializeExtensionSettingsOneOffPlatform();
    }
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc
index 33d177ba9e2b..0bd29eae3f82 100644
--- a/www/chromium/files/patch-device_usb_usb__service__impl.cc
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc
@@ -1,6 +1,6 @@
---- device/usb/usb_service_impl.cc.orig	2019-03-11 22:00:58 UTC
+--- device/usb/usb_service_impl.cc.orig	2019-04-30 22:22:48 UTC
 +++ device/usb/usb_service_impl.cc
-@@ -231,8 +231,10 @@ UsbServiceImpl::UsbServiceImpl()
+@@ -233,8 +233,10 @@ UsbServiceImpl::UsbServiceImpl()
  }
  
  UsbServiceImpl::~UsbServiceImpl() {
@@ -11,7 +11,7 @@
  }
  
  void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) {
-@@ -287,6 +289,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -289,6 +291,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
  
    context_ = std::move(context);
  
@@ -19,7 +19,7 @@
    int rv = libusb_hotplug_register_callback(
        context_->context(),
        static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -299,6 +302,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
+@@ -301,6 +304,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
  
    // This will call any enumeration callbacks queued while initializing.
    RefreshDevices();
@@ -27,7 +27,7 @@
  
  #if defined(OS_WIN)
    DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-@@ -495,6 +499,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
+@@ -497,6 +501,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
    device->OnDisconnect();
  }
  
@@ -35,7 +35,7 @@
  // static
  int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
                                                  libusb_device* device_raw,
-@@ -528,6 +533,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
+@@ -530,6 +535,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
  
    return 0;
  }
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index 4bba15cb75e5..fe4e306decb4 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig	2019-03-11 22:00:58 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig	2019-04-30 22:22:49 UTC
 +++ extensions/browser/api/messaging/message_service.cc
-@@ -58,7 +58,7 @@ namespace {
+@@ -60,7 +60,7 @@ namespace {
  
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
@@ -9,16 +9,16 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -318,7 +318,7 @@ void MessageService::OpenChannelToNativeApp(
-   if (!source)
+@@ -374,7 +374,7 @@ void MessageService::OpenChannelToNativeApp(
+   if (!opener_port->IsValidPort())
      return;
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   content::WebContents* web_contents =
-       content::WebContents::FromRenderFrameHost(source);
-   ExtensionWebContentsObserver* extension_web_contents_observer =
-@@ -378,12 +378,12 @@ void MessageService::OpenChannelToNativeApp(
+   bool has_permission = extension->permissions_data()->HasAPIPermission(
+       APIPermission::kNativeMessaging);
+   if (!has_permission) {
+@@ -420,11 +420,11 @@ void MessageService::OpenChannelToNativeApp(
    channel->opener->IncrementLazyKeepaliveCount();
  
    AddChannel(std::move(channel), receiver_port_id);
@@ -26,8 +26,7 @@
 +#else  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
    const char kNativeMessagingNotSupportedError[] =
        "Native Messaging is not supported on this platform.";
-   DispatchOnDisconnect(
-       source, receiver_port_id, kNativeMessagingNotSupportedError);
+   opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError);
 -#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-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
index 402789d2414e..81054423b3f0 100644
--- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig	2019-03-11 22:00:58 UTC
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig	2019-04-30 22:22:49 UTC
 +++ extensions/browser/browser_context_keyed_service_factories.cc
-@@ -85,7 +85,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
+@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
  #if defined(OS_CHROMEOS)
    NetworkingConfigServiceFactory::GetInstance();
  #endif
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 fd4fc87e9fbf..f626f1c08048 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	2019-03-11 22:00:58 UTC
+--- extensions/common/api/_permission_features.json.orig	2019-04-30 22:22:49 UTC
 +++ extensions/common/api/_permission_features.json
 @@ -135,7 +135,7 @@
      {
@@ -9,7 +9,7 @@
        "whitelist": [
          "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
          "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
-@@ -470,7 +470,7 @@
+@@ -473,7 +473,7 @@
    }, {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -18,7 +18,7 @@
      "whitelist": [
        "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -501,7 +501,7 @@
+@@ -504,7 +504,7 @@
    "networkingPrivate": {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json
index 89dbadf1bc55..75d55fa7cbc0 100644
--- a/www/chromium/files/patch-extensions_common_api_runtime.json
+++ b/www/chromium/files/patch-extensions_common_api_runtime.json
@@ -1,6 +1,6 @@
---- extensions/common/api/runtime.json.orig	2019-03-11 22:00:58 UTC
+--- extensions/common/api/runtime.json.orig	2019-04-30 22:22:49 UTC
 +++ extensions/common/api/runtime.json
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
          "id": "PlatformOs",
          "type": "string",
          "description": "The operating system chrome is running on.",
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
new file mode 100644
index 000000000000..a872a4a3f47e
--- /dev/null
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -0,0 +1,20 @@
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2019-05-01 16:41:39 UTC
++++ extensions/shell/browser/shell_extensions_api_client.cc
+@@ -15,7 +15,7 @@
+ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
+ #include "extensions/shell/browser/shell_web_view_guest_delegate.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
+ #endif
+ 
+@@ -46,7 +46,7 @@ ShellExtensionsAPIClient::CreateVirtualKeyboardDelegat
+   return std::make_unique<ShellVirtualKeyboardDelegate>();
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() {
+   if (!file_system_delegate_)
+     file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>();
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
new file mode 100644
index 000000000000..b1ee7b7323f2
--- /dev/null
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -0,0 +1,19 @@
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2019-04-30 22:22:49 UTC
++++ extensions/shell/browser/shell_extensions_api_client.h
+@@ -30,14 +30,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
+       WebViewGuest* web_view_guest) const override;
+   std::unique_ptr<VirtualKeyboardDelegate> CreateVirtualKeyboardDelegate(
+       content::BrowserContext* browser_context) const override;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   FileSystemDelegate* GetFileSystemDelegate() override;
+ #endif
+   MessagingDelegate* GetMessagingDelegate() override;
+   FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override;
+ 
+  private:
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   std::unique_ptr<FileSystemDelegate> file_system_delegate_;
+ #endif
+   std::unique_ptr<MessagingDelegate> messaging_delegate_;
diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
new file mode 100644
index 000000000000..d372604c006a
--- /dev/null
+++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -0,0 +1,36 @@
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig	2019-05-04 08:44:56 UTC
++++ google_apis/gcm/engine/heartbeat_manager.cc
+@@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;  
+ // Minimum time spent sleeping before we force a new heartbeat.
+ const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // The period at which to check if the heartbeat time has passed. Used to
+ // protect against platforms where the timer is delayed by the system being
+ // suspended.  Only needed on linux because the other OSes provide a standard
+ // way to be notified of system suspend and resume events.
+ const int kHeartbeatMissedCheckMs = 1000 * 60 * 5;  // 5 minutes.
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ 
+ }  // namespace
+ 
+@@ -188,7 +188,7 @@ void HeartbeatManager::RestartTimer() {
+                           base::Bind(&HeartbeatManager::OnHeartbeatTriggered,
+                                      weak_ptr_factory_.GetWeakPtr()));
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
+   // when the system is suspending or resuming.  The only one that does not is
+   // Linux so we need to poll to check for missed heartbeats.
+@@ -197,7 +197,7 @@ void HeartbeatManager::RestartTimer() {
+       base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
+                      weak_ptr_factory_.GetWeakPtr()),
+       base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ }
+ 
+ void HeartbeatManager::CheckForMissedHeartbeat() {
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
index c3f6ef47ef25..46f3b9ad1a32 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig	2019-03-17 17:07:44 UTC
+--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig	2019-04-30 22:22:49 UTC
 +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
-@@ -562,7 +562,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText
+@@ -593,7 +593,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText
  
    bool ShouldSkipNorm16() const {
      DCHECK(!ShouldSkipTest());
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 a3ae793cbba2..d077e2e95c77 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	2019-03-11 22:00:59 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2019-04-30 22:22:49 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -87,7 +87,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
+@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
  }
  #endif  // defined(OS_WIN)
  
@@ -8,8 +8,8 @@
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
  bool CanAccessNvidiaDeviceFile() {
    bool res = true;
-   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
-@@ -129,7 +129,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+@@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    // crash during feature collection.
    gpu::SetKeysForCrashLogging(gpu_info_);
  
@@ -18,7 +18,7 @@
    if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
        gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
      return false;
-@@ -199,7 +199,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -201,7 +201,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    sandbox_helper_->PreSandboxStartup();
  
    bool attempted_startsandbox = 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
new file mode 100644
index 000000000000..bba3fffcfd2b
--- /dev/null
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -0,0 +1,20 @@
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2019-04-30 22:22:49 UTC
++++ gpu/vulkan/vulkan_function_pointers.cc
+@@ -310,7 +310,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+ 
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 
+   vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(
+       vkGetDeviceProcAddrFn(vk_device, "vkGetSemaphoreFdKHR"));
+@@ -319,7 +319,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+ 
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ 
+   vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
+       vkGetDeviceProcAddrFn(vk_device, "vkGetMemoryFdKHR"));
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
new file mode 100644
index 000000000000..747fd95f2c63
--- /dev/null
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -0,0 +1,32 @@
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2019-05-04 12:16:20 UTC
++++ gpu/vulkan/vulkan_function_pointers.h
+@@ -114,12 +114,12 @@ struct VulkanFunctionPointers {
+ #endif
+ 
+   // Device functions shared between Linux and Android.
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr;
+ #endif
+ 
+   // Linux-only device functions.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
+ #endif
+ 
+@@ -245,12 +245,12 @@ struct VulkanFunctionPointers {
+   gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #define vkGetSemaphoreFdKHR \
+   gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
+ #endif
+ 
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
index a3629cd7838e..9c424a4c41d9 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_content_browser_client.cc.orig	2019-03-11 22:00:59 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2019-04-30 22:22:49 UTC
 +++ headless/lib/browser/headless_content_browser_client.cc
-@@ -187,7 +187,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
+@@ -189,7 +189,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
    return content::GeneratedCodeCacheSettings(true, 0, context->GetPath());
  }
  
@@ -9,7 +9,7 @@
  void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -198,7 +198,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
+@@ -200,7 +200,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
      mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
  #endif  // defined(HEADLESS_USE_BREAKPAD)
  }
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 3756e7a3a33b..a09f7a51fa9e 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-03-11 22:00:59 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig	2019-04-30 22:22:49 UTC
 +++ headless/lib/browser/headless_request_context_manager.cc
-@@ -35,7 +35,7 @@ namespace headless {
+@@ -34,7 +34,7 @@ namespace headless {
  
  namespace {
  
@@ -9,7 +9,7 @@
  static char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -81,7 +81,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
+@@ -80,7 +80,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;
-@@ -290,7 +290,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
+@@ -289,7 +289,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
      proxy_config_monitor_ =
          std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner);
    }
@@ -27,7 +27,7 @@
    crypt_config_ = BuildCryptConfigOnce(user_data_path_);
    if (network_service_enabled_ && crypt_config_)
      content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_));
-@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() {
+@@ -365,7 +365,7 @@ void HeadlessRequestContextManager::InitializeOnIO() {
                                    std::move(protocol_handler.second));
      }
      protocol_handlers_.clear();
diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h
index a2b1f9794ef0..ca14781379c6 100644
--- a/www/chromium/files/patch-ipc_ipc__channel.h
+++ b/www/chromium/files/patch-ipc_ipc__channel.h
@@ -1,6 +1,6 @@
---- ipc/ipc_channel.h.orig	2019-03-11 22:00:59 UTC
+--- ipc/ipc_channel.h.orig	2019-04-30 22:22:52 UTC
 +++ ipc/ipc_channel.h
-@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
+@@ -245,7 +245,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
  #endif
  
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 8822df0e27d8..26c67105cbcb 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	2019-03-11 22:00:59 UTC
+--- media/BUILD.gn.orig	2019-04-30 22:22:52 UTC
 +++ media/BUILD.gn
-@@ -59,6 +59,9 @@ config("media_config") {
+@@ -60,6 +60,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
      }
    }
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index 73f9891f0b9a..08c0915c9573 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig	2019-03-11 22:00:59 UTC
+--- media/audio/BUILD.gn.orig	2019-04-30 22:22:52 UTC
 +++ media/audio/BUILD.gn
-@@ -242,8 +242,18 @@ source_set("audio") {
+@@ -240,8 +240,18 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
diff --git a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
index 25ea65eac8fc..313dd1df12eb 100644
--- a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
+++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
@@ -1,6 +1,6 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2019-03-21 01:36:54.000000000 +0100
-+++ media/audio/alsa/audio_manager_alsa.cc	2019-03-25 22:31:49.328029000 +0100
-@@ -92,7 +92,9 @@
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2019-04-30 22:22:52 UTC
++++ media/audio/alsa/audio_manager_alsa.cc
+@@ -92,7 +92,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType 
    int card = -1;
  
    // Loop through the sound cards to get ALSA device hints.
@@ -10,7 +10,7 @@
      void** hints = NULL;
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
-@@ -104,7 +106,9 @@
+@@ -104,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType 
        DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
@@ -20,7 +20,7 @@
  }
  
  void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
-@@ -187,7 +191,11 @@
+@@ -187,7 +191,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable(
    // goes through software conversion if needed (e.g. incompatible
    // sample rate).
    // TODO(joi): Should we prefer "hw" instead?
@@ -32,7 +32,7 @@
    return strncmp(kDeviceTypeDesired, device_name,
                   base::size(kDeviceTypeDesired) - 1) == 0;
  }
-@@ -209,7 +217,9 @@
+@@ -209,7 +217,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice(
    // Loop through the sound cards.
    // Don't use snd_device_name_hint(-1,..) since there is a access violation
    // inside this ALSA API with libasound.so.2.0.0.
@@ -42,7 +42,7 @@
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
        for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -233,7 +243,9 @@
+@@ -233,7 +243,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice(
        DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 82b6712e42b1..82a946ca4a4d 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-03-11 22:00:59 UTC
+--- media/base/video_frame.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/base/video_frame.cc
 @@ -53,7 +53,7 @@ static std::string StorageTypeToString(
        return "OWNED_MEMORY";
@@ -36,7 +36,7 @@
    // If there are any |dmabuf_fds_| plugged in, we should duplicate them.
    if (frame->storage_type() == STORAGE_DMABUFS) {
      wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_);
-@@ -917,7 +917,7 @@ size_t VideoFrame::shared_memory_offset() const {
+@@ -916,7 +916,7 @@ size_t VideoFrame::shared_memory_offset() const {
    return shared_memory_offset_;
  }
  
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 06c90939cc4e..8e612fdf9a8f 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	2019-03-11 22:00:59 UTC
+--- media/base/video_frame.h.orig	2019-04-30 22:22:52 UTC
 +++ media/base/video_frame.h
 @@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
@@ -18,7 +18,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
-@@ -430,7 +430,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -437,7 +437,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // Returns the offset into the shared memory where the frame data begins.
    size_t shared_memory_offset() const;
  
@@ -27,7 +27,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
-@@ -624,7 +624,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -631,7 +631,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // memory.
    size_t shared_memory_offset_;
  
diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
index 6c18690423ac..b1cc42128fa5 100644
--- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
@@ -1,6 +1,6 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig	2019-03-11 22:00:59 UTC
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/capture/video/file_video_capture_device_factory.cc
-@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
+@@ -54,7 +54,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
  #elif defined(OS_MACOSX)
        command_line_file_path.value(), kFileVideoCaptureDeviceName,
        VideoCaptureApi::MACOSX_AVFOUNDATION
diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
index 8e96c973337d..665e4eecd0b6 100644
--- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2019-03-11 22:00:59 UTC
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/capture/video/linux/video_capture_device_linux.cc
 @@ -37,6 +37,7 @@ int TranslatePowerLineFrequencyToV4L2(PowerLineFrequen
  
@@ -16,15 +16,15 @@
  
  VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
      scoped_refptr<V4L2CaptureDevice> v4l2,
-@@ -68,6 +70,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() {
- void VideoCaptureDeviceLinux::AllocateAndStart(
+@@ -71,6 +73,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
      const VideoCaptureParams& params,
      std::unique_ptr<VideoCaptureDevice::Client> client) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +#if !defined(OS_FREEBSD)
    DCHECK(!capture_impl_);
    if (v4l2_thread_.IsRunning())
      return;  // Wrong state.
-@@ -95,9 +98,11 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
+@@ -98,10 +101,12 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
    for (auto& request : photo_requests_queue_)
      v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request));
    photo_requests_queue_.clear();
@@ -32,11 +32,12 @@
  }
  
  void VideoCaptureDeviceLinux::StopAndDeAllocate() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +#if !defined(OS_FREEBSD)
    if (!v4l2_thread_.IsRunning())
      return;  // Wrong state.
    v4l2_thread_.task_runner()->PostTask(
-@@ -107,6 +112,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
+@@ -111,6 +116,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
    v4l2_thread_.Stop();
  
    capture_impl_ = nullptr;
@@ -44,10 +45,10 @@
  }
  
  void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) {
-@@ -149,11 +155,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
- }
- 
+@@ -158,11 +164,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
  void VideoCaptureDeviceLinux::SetRotation(int rotation) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   rotation_ = rotation;
 +#if !defined(OS_FREEBSD)
    if (v4l2_thread_.IsRunning()) {
      v4l2_thread_.task_runner()->PostTask(
diff --git a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
index 993aa99c09a6..68ef7b96cf59 100644
--- a/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
+++ b/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
@@ -1,6 +1,6 @@
---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig	2019-03-11 22:00:59 UTC
+--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/capture/video/mock_gpu_memory_buffer_manager.cc
-@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
+@@ -106,7 +106,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
      gfx::GpuMemoryBufferHandle handle;
      handle.type = gfx::NATIVE_PIXMAP;
      handle.id = handle_.id;
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 3a8ed1872e71..27e69b0a1564 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-03-11 22:00:59 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/capture/video/video_capture_device_client.cc
-@@ -236,7 +236,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -237,7 +237,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_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
index 32a7c440128e..a9a96b393d53 100644
--- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
@@ -1,6 +1,6 @@
---- media/formats/mp2t/es_parser_adts.cc.orig	2019-03-11 22:00:59 UTC
+--- media/formats/mp2t/es_parser_adts.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/formats/mp2t/es_parser_adts.cc
-@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
+@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
    const uint8_t* es;
    es_queue_->Peek(&es, &es_size);
  
@@ -15,7 +15,7 @@
      const uint8_t* cur_buf = &es[offset];
      if (!isAdtsSyncWord(cur_buf))
        continue;
-@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
+@@ -106,7 +106,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
      return true;
    }
  
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 0b0ff559b760..37813f6b1266 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig	2019-03-11 22:00:59 UTC
+--- media/media_options.gni.orig	2019-04-30 22:22:52 UTC
 +++ media/media_options.gni
-@@ -100,6 +100,9 @@ declare_args() {
+@@ -121,6 +121,9 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
    use_alsa = false
  
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 79fa04f6ecd2..e73bf4b08e6f 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,4 +1,4 @@
---- media/mojo/services/gpu_mojo_media_client.cc.orig	2019-03-17 21:51:56 UTC
+--- media/mojo/services/gpu_mojo_media_client.cc.orig	2019-04-30 22:22:52 UTC
 +++ media/mojo/services/gpu_mojo_media_client.cc
 @@ -55,7 +55,7 @@ namespace media {
  namespace {
@@ -9,7 +9,7 @@
  gpu::CommandBufferStub* GetCommandBufferStub(
      base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
      base::UnguessableToken channel_token,
-@@ -172,7 +172,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+@@ -188,7 +188,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
        std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_,
                                                std::move(get_stub_cb)));
  #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 3bf2559efd07..64330bb9d846 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2019-03-11 22:01:00 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2019-04-30 22:22:53 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -598,7 +598,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasTextures();
diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
index 826608045fde..1f155cb29f7b 100644
--- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,4 +1,4 @@
---- mojo/public/c/system/thunks.cc.orig	2019-03-11 22:01:00 UTC
+--- mojo/public/c/system/thunks.cc.orig	2019-04-30 22:22:53 UTC
 +++ mojo/public/c/system/thunks.cc
 @@ -16,7 +16,7 @@
  #include "build/build_config.h"
@@ -36,7 +36,18 @@
        const base::FilePath::CharType kDefaultLibraryPathValue[] =
            FILE_PATH_LITERAL("./libmojo_core.so");
  #elif defined(OS_WIN)
-@@ -147,7 +147,7 @@ class CoreLibraryInitializer {
+@@ -138,16 +138,16 @@ class CoreLibraryInitializer {
+ 
+     CHECK_GT(g_thunks->size, 0u)
+         << "Invalid mojo_core library: " << library_path->value();
+-#else   // defined(OS_CHROMEOS) || defined(OS_LINUX)
++#else   // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+     NOTREACHED()
+         << "Dynamic mojo_core loading is not supported on this platform.";
+-#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX)
++#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+   }
+ 
    ~CoreLibraryInitializer() = default;
  
   private:
diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
index 57f963ace1bb..c0da7eea7be5 100644
--- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
+++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
@@ -1,11 +1,11 @@
---- mojo/public/js/mojo_bindings_resources.grd.orig	2019-03-11 22:01:00 UTC
+--- mojo/public/js/mojo_bindings_resources.grd.orig	2019-04-30 22:22:53 UTC
 +++ mojo/public/js/mojo_bindings_resources.grd
-@@ -23,7 +23,7 @@
+@@ -38,7 +38,7 @@
            use_base_dir="false"
            type="BINDATA"
            compress="gzip" />
 -      <if expr="is_win or is_macosx or is_linux">
 +      <if expr="is_win or is_macosx or is_posix">
-         <include name="IDR_MOJO_TIME_MOJOM_JS"
-             file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.js"
+         <include name="IDR_MOJO_TIME_MOJOM_LITE_JS"
+             file="${root_gen_dir}/mojo/public/mojom/base/time.mojom-lite.js"
              use_base_dir="false"
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 9df4ab0f017b..2ada31f443ce 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig	2019-03-11 22:01:00 UTC
+--- net/BUILD.gn.orig	2019-04-30 22:22:54 UTC
 +++ net/BUILD.gn
-@@ -97,7 +97,7 @@ net_configs = [
+@@ -98,7 +98,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
  ]
  
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1900,7 +1900,7 @@ component("net") {
+@@ -1899,7 +1899,7 @@ component("net") {
      }
  
      # Use getifaddrs() on POSIX platforms, except Linux and Android.
@@ -18,7 +18,7 @@
        sources += [
          "base/network_interfaces_getifaddrs.cc",
          "base/network_interfaces_getifaddrs.h",
-@@ -1993,6 +1993,16 @@ component("net") {
+@@ -1992,6 +1992,16 @@ component("net") {
        ]
  
        sources -= [ "disk_cache/blockfile/file_posix.cc" ]
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc
index c15cb0bfe598..863a043a34f6 100644
--- a/www/chromium/files/patch-net_base_address__tracker__linux.cc
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc
@@ -1,4 +1,4 @@
---- net/base/address_tracker_linux.cc.orig	2019-03-11 22:01:00 UTC
+--- net/base/address_tracker_linux.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/base/address_tracker_linux.cc
 @@ -21,96 +21,10 @@
  namespace net {
@@ -99,103 +99,26 @@
  }
  
  AddressTrackerLinux::AddressTrackerLinux()
-@@ -153,93 +67,8 @@ AddressTrackerLinux::~AddressTrackerLinux() {
+@@ -151,6 +65,7 @@ AddressTrackerLinux::~AddressTrackerLinux() {
  }
  
  void AddressTrackerLinux::Init() {
--  netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
--  if (netlink_fd_ < 0) {
--    PLOG(ERROR) << "Could not create NETLINK socket";
--    AbortAndForceOnline();
--    return;
--  }
--
--  int rv;
--
--  if (tracking_) {
--    // Request notifications.
--    struct sockaddr_nl addr = {};
--    addr.nl_family = AF_NETLINK;
--    addr.nl_pid = getpid();
--    // TODO(szym): Track RTMGRP_LINK as well for ifi_type,
--    // http://crbug.com/113993
--    addr.nl_groups =
--        RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK;
--    rv = bind(
--        netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr));
--    if (rv < 0) {
--      PLOG(ERROR) << "Could not bind NETLINK socket";
--      AbortAndForceOnline();
--      return;
--    }
--  }
--
--  // Request dump of addresses.
--  struct sockaddr_nl peer = {};
--  peer.nl_family = AF_NETLINK;
--
--  struct {
--    struct nlmsghdr header;
--    struct rtgenmsg msg;
--  } request = {};
--
--  request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg));
--  request.header.nlmsg_type = RTM_GETADDR;
--  request.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
--  request.header.nlmsg_pid = getpid();
--  request.msg.rtgen_family = AF_UNSPEC;
--
--  rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len,
--                           0, reinterpret_cast<struct sockaddr*>(&peer),
--                           sizeof(peer)));
--  if (rv < 0) {
--    PLOG(ERROR) << "Could not send NETLINK request";
--    AbortAndForceOnline();
--    return;
--  }
--
--  // Consume pending message to populate the AddressMap, but don't notify.
--  // Sending another request without first reading responses results in EBUSY.
--  bool address_changed;
--  bool link_changed;
--  bool tunnel_changed;
--  ReadMessages(&address_changed, &link_changed, &tunnel_changed);
--
--  // Request dump of link state
--  request.header.nlmsg_type = RTM_GETLINK;
--
--  rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0,
--                           reinterpret_cast<struct sockaddr*>(&peer),
--                           sizeof(peer)));
--  if (rv < 0) {
--    PLOG(ERROR) << "Could not send NETLINK request";
--    AbortAndForceOnline();
--    return;
--  }
--
--  // Consume pending message to populate links_online_, but don't notify.
--  ReadMessages(&address_changed, &link_changed, &tunnel_changed);
--  {
--    AddressTrackerAutoLock lock(*this, connection_type_lock_);
--    connection_type_initialized_ = true;
--    connection_type_initialized_cv_.Broadcast();
--  }
--
--  if (tracking_) {
--    rv = base::MessageLoopCurrentForIO::Get()->WatchFileDescriptor(
--        netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this);
--    if (rv < 0) {
--      PLOG(ERROR) << "Could not watch NETLINK socket";
--      AbortAndForceOnline();
--      return;
--    }
--  }
-+NOTIMPLEMENTED();
-+AbortAndForceOnline();
++#if !defined(OS_FREEBSD)
+   netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
+   if (!netlink_fd_.is_valid()) {
+     PLOG(ERROR) << "Could not create NETLINK socket";
+@@ -239,6 +154,10 @@ void AddressTrackerLinux::Init() {
+       return;
+     }
+   }
++#else  // !OS_FREEBSD
++  NOTIMPLEMENTED();
++  AbortAndForceOnline();
++#endif // !OS_FREEBSD
  }
  
  void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -250,25 +79,6 @@ void AddressTrackerLinux::AbortAndForceOnline() {
+@@ -250,25 +169,6 @@ void AddressTrackerLinux::AbortAndForceOnline() {
    connection_type_initialized_cv_.Broadcast();
  }
  
@@ -221,7 +144,7 @@
  NetworkChangeNotifier::ConnectionType
  AddressTrackerLinux::GetCurrentConnectionType() {
    // http://crbug.com/125097
-@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
+@@ -326,102 +226,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
                                          bool* address_changed,
                                          bool* link_changed,
                                          bool* tunnel_changed) {
@@ -325,7 +248,7 @@
  }
  
  void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
-@@ -458,31 +173,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
+@@ -452,31 +257,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const 
  }
  
  void AddressTrackerLinux::UpdateCurrentConnectionType() {
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 51b150d18143..dbd600f5b870 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-03-11 22:01:01 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2019-04-30 22:22:54 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"
-@@ -46,7 +44,7 @@ const char* const kNameserversIPv4[] = {
+@@ -47,7 +45,7 @@ const char* const kNameserversIPv4[] = {
      "1.0.0.1",
  };
  
@@ -18,7 +18,7 @@
  const char* const kNameserversIPv6[] = {
      NULL,
      "2001:DB8:0::42",
-@@ -82,7 +80,7 @@ void InitializeResState(res_state res) {
+@@ -83,7 +81,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) {
-@@ -103,7 +101,7 @@ void InitializeResState(res_state res) {
+@@ -104,7 +102,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]);
-@@ -128,7 +126,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
+@@ -129,7 +127,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
      config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
    }
  
diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
index 3c0b7ee87598..5450f6e85ff6 100644
--- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc
+++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,8 +1,8 @@
---- net/dns/host_resolver_proc.cc.orig	2019-03-11 22:01:01 UTC
+--- net/dns/host_resolver_proc.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/dns/host_resolver_proc.cc
-@@ -195,7 +195,7 @@ int SystemHostResolverCall(const std::string& host,
-   // current process during that time.
-   base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
+@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index a8fbaf810f5f..77ae79d7aad5 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,6 +1,6 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2019-03-11 22:01:01 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/http/http_auth_gssapi_posix.cc
-@@ -431,8 +431,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+@@ -444,8 +444,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
      static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
        "/System/Library/Frameworks/GSS.framework/GSS"
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
new file mode 100644
index 000000000000..414a8510f947
--- /dev/null
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
@@ -0,0 +1,12 @@
+--- net/http/http_auth_gssapi_posix.h.orig	2019-05-04 12:57:12 UTC
++++ net/http/http_auth_gssapi_posix.h
+@@ -19,6 +19,9 @@
+ #include <GSS/gssapi.h>
+ #elif defined(OS_FREEBSD)
+ #include <gssapi/gssapi.h>
++#ifndef GSS_C_DELEG_POLICY_FLAG
++#define GSS_C_DELEG_POLICY_FLAG 32768
++#endif
+ #else
+ #include <gssapi.h>
+ #endif
diff --git a/www/chromium/files/patch-net_http_http__network__session.cc b/www/chromium/files/patch-net_http_http__network__session.cc
deleted file mode 100644
index 9552bf40336a..000000000000
--- a/www/chromium/files/patch-net_http_http__network__session.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- net/http/http_network_session.cc.orig	2019-03-11 22:01:01 UTC
-+++ net/http/http_network_session.cc
-@@ -19,7 +19,9 @@
- #include "base/trace_event/memory_dump_request_args.h"
- #include "base/trace_event/process_memory_dump.h"
- #include "base/values.h"
-+#if defined(USE_KERBEROS)
- #include "net/http/http_auth_handler_factory.h"
-+#endif
- #include "net/http/http_response_body_drainer.h"
- #include "net/http/http_stream_factory.h"
- #include "net/http/url_security_manager.h"
diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
index 1e4e2be343e0..8508a0e707d1 100644
--- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
+++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
@@ -1,6 +1,6 @@
---- net/nqe/network_quality_estimator.cc.orig	2019-03-17 14:51:31 UTC
+--- net/nqe/network_quality_estimator.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/nqe/network_quality_estimator.cc
-@@ -99,7 +99,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
+@@ -100,7 +100,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
        case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
          break;
        case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
index 0aef528f8567..b14b4ca1243b 100644
--- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
+++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
@@ -1,6 +1,6 @@
---- net/nqe/network_quality_estimator_unittest.cc.orig	2019-03-17 14:56:02 UTC
+--- net/nqe/network_quality_estimator_unittest.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/nqe/network_quality_estimator_unittest.cc
-@@ -2058,7 +2058,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
+@@ -2039,7 +2039,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
  
  // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
  // enabled only on certain platforms.
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
index 2d17877f7d8e..77c373b14850 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_resolution_service.cc.orig	2019-03-11 22:01:01 UTC
+--- net/proxy_resolution/proxy_resolution_service.cc.orig	2019-04-30 22:22:54 UTC
 +++ net/proxy_resolution/proxy_resolution_service.cc
 @@ -48,7 +48,7 @@
  #elif defined(OS_MACOSX)
@@ -18,7 +18,7 @@
  constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
      net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
        semantics {
-@@ -1577,7 +1577,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
+@@ -1578,7 +1578,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
               << "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_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc
index b24dc928bdae..d04365d4ee07 100644
--- a/www/chromium/files/patch-net_socket_socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/socket_posix.cc.orig	2019-03-17 15:48:31 UTC
+--- net/socket/socket_posix.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/socket/socket_posix.cc
-@@ -568,7 +568,7 @@ void SocketPosix::ReadCompleted() {
+@@ -569,7 +569,7 @@ void SocketPosix::ReadCompleted() {
  }
  
  int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) {
diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
index 69e902d418e4..1df3deefc418 100644
--- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc
+++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
@@ -1,4 +1,4 @@
---- net/socket/socks5_client_socket.cc.orig	2019-03-11 22:01:01 UTC
+--- net/socket/socks5_client_socket.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/socket/socks5_client_socket.cc
 @@ -4,6 +4,10 @@
  
@@ -10,4 +10,4 @@
 +
  #include <utility>
  
- #include "base/callback_helpers.h"
+ #include "base/bind.h"
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 67f6c8a4709a..ed4568bceab4 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-03-11 22:01:01 UTC
+--- net/socket/udp_socket_posix.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/socket/udp_socket_posix.cc
-@@ -68,7 +68,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
+@@ -69,7 +69,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
-@@ -97,7 +97,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
+@@ -98,7 +98,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,10 +57,10 @@
    rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));
  
    return rv == 0 ? OK : MapSystemError(errno);
-@@ -937,19 +940,24 @@ int UDPSocketPosix::SetMulticastOptions() {
-   if (multicast_interface_ != 0) {
-     switch (addr_family_) {
-       case AF_INET: {
+@@ -945,19 +948,23 @@ int UDPSocketPosix::SetMulticastOptions() {
+         return OK;
+ #endif
+ 
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_BSD)
          ip_mreq mreq = {};
@@ -77,15 +77,14 @@
 +#endif  //  !defined(OS_MACOSX) || defined(OS_BSD)
          int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
 +#if defined(OS_BSD)
-+                            reinterpret_cast<const char*>(&mreq.imr_interface.s_addr),
-+                            sizeof(mreq.imr_interface.s_addr));
++			    reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr));
 +#else
                              reinterpret_cast<const char*>(&mreq), sizeof(mreq));
 +#endif
          if (rv)
            return MapSystemError(errno);
          break;
-@@ -1011,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
+@@ -1019,7 +1026,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
  
@@ -94,7 +93,7 @@
        ip_mreq mreq = {};
        int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
                                            &mreq.imr_interface.s_addr);
-@@ -1059,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
+@@ -1067,9 +1074,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_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index d8f07ef3f0ee..152648e41c6b 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,6 +1,6 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2019-03-11 22:01:01 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
  #include "net/url_request/url_request_context_builder.h"
  #include "net/url_request/url_request_context_getter.h"
  
@@ -9,7 +9,7 @@
  #include "net/proxy_resolution/proxy_config.h"
  #include "net/proxy_resolution/proxy_config_service_fixed.h"
  #endif
-@@ -46,7 +46,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ
+@@ -47,7 +47,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ
                            base::WaitableEvent* initialization_complete_event) {
    net::URLRequestContextBuilder url_request_context_builder;
    url_request_context_builder.set_user_agent(GetUserAgent());
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 2cd0fb3a72b3..cfcf0ebc27a1 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-03-17 15:38:01 UTC
+--- net/tools/quic/quic_http_proxy_backend.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/tools/quic/quic_http_proxy_backend.cc
-@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
+@@ -161,7 +161,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__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index deed16f19611..235acd673f4a 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,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2019-03-11 22:01:01 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2019-04-30 22:22:55 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -520,7 +520,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -497,7 +497,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
@@ -9,3 +9,12 @@
      // TODO(willchan): Switch to using this code when
      // ProxyResolutionService::CreateSystemProxyConfigService()'s signature
      // doesn't suck.
+@@ -506,7 +506,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+           ProxyResolutionService::CreateSystemProxyConfigService(
+               base::ThreadTaskRunnerHandle::Get().get());
+     }
+-#endif  // !defined(OS_LINUX) && !defined(OS_ANDROID)
++#endif  // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+     proxy_resolution_service_ = CreateProxyResolutionService(
+         std::move(proxy_config_service_), context.get(),
+         context->host_resolver(), context->network_delegate(),
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index bb4fd053ed0d..a82007fde96b 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2019-03-11 22:01:01 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2019-04-30 22:22:55 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
+@@ -134,7 +134,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
  
  PDFiumEngine* g_engine_for_fontmapper = nullptr;
  
@@ -9,7 +9,7 @@
  
  PP_Instance g_last_instance_id;
  
-@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) {
+@@ -414,7 +414,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) {
    fontinfo_with_metrics->default_sysfontinfo->Release(
        fontinfo_with_metrics->default_sysfontinfo);
  }
@@ -18,7 +18,7 @@
  
  PDFiumEngine::CreateDocumentLoaderFunction
      g_create_document_loader_for_testing = nullptr;
-@@ -663,7 +663,7 @@ bool InitializeSDK() {
+@@ -664,7 +664,7 @@ bool InitializeSDK() {
    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
    FPDF_InitLibraryWithConfig(&config);
  
@@ -27,7 +27,7 @@
    // Font loading doesn't work in the renderer sandbox in Linux.
    FPDF_SetSystemFontInfo(&g_font_info);
  #else
-@@ -688,7 +688,7 @@ bool InitializeSDK() {
+@@ -689,7 +689,7 @@ bool InitializeSDK() {
  
  void ShutdownSDK() {
    FPDF_DestroyLibrary();
@@ -36,7 +36,7 @@
    delete g_font_info;
  #endif
    TearDownV8();
-@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
+@@ -713,7 +713,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, 
    IFSDK_PAUSE::user = nullptr;
    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
  
@@ -45,7 +45,7 @@
    // PreviewModeClient does not know its pp::Instance.
    pp::Instance* instance = client_->GetPluginInstance();
    if (instance)
-@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
+@@ -1177,7 +1177,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
  
    KillFormFocus();
  
@@ -54,7 +54,7 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
+@@ -2974,7 +2974,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
    DCHECK(image_data);
  
    last_progressive_start_time_ = base::Time::Now();
@@ -63,7 +63,7 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
+@@ -3449,7 +3449,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_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
index b06387323b47..e1967229aea1 100644
--- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,6 +1,6 @@
---- remoting/host/me2me_desktop_environment.cc.orig	2019-03-11 22:01:01 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig	2019-04-30 22:22:56 UTC
 +++ remoting/host/me2me_desktop_environment.cc
-@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+@@ -131,7 +131,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
  
    // Otherwise, if the session is shared with the local user start monitoring
    // the local input and create the in-session UI.
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 a9b177ae327a..a32ad8c4f6e6 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	2019-03-11 22:01:01 UTC
+--- remoting/host/remoting_me2me_host.cc.orig	2019-04-30 22:22:56 UTC
 +++ remoting/host/remoting_me2me_host.cc
 @@ -117,13 +117,13 @@
  #include "remoting/host/mac/permission_utils.h"
@@ -30,7 +30,7 @@
  
  #if defined(OS_POSIX)
  // The command line switch used to pass name of the unix domain socket used to
-@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -354,7 +354,7 @@ class HostProcess : public ConfigWatcher::Delegate,
  
    std::unique_ptr<ChromotingHostContext> context_;
  
@@ -39,7 +39,7 @@
    // Watch for certificate changes and kill the host when changes occur
    std::unique_ptr<CertificateWatcher> cert_watcher_;
  #endif
-@@ -567,10 +567,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
+@@ -563,10 +563,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;
-@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -760,7 +760,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),
-@@ -849,7 +849,7 @@ void HostProcess::StartOnUiThread() {
+@@ -846,7 +846,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()->
-@@ -858,7 +858,7 @@ void HostProcess::StartOnUiThread() {
+@@ -855,7 +855,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 =
-@@ -916,7 +916,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -912,7 +912,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.
-@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() {
+@@ -1564,7 +1564,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
  
-@@ -1719,7 +1719,7 @@ void HostProcess::OnCrash(const std::string& function_
+@@ -1736,7 +1736,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-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn
index d3b1cdf7c7eb..e89839210f01 100644
--- a/www/chromium/files/patch-services_audio_BUILD.gn
+++ b/www/chromium/files/patch-services_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- services/audio/BUILD.gn.orig	2019-03-11 22:01:01 UTC
+--- services/audio/BUILD.gn.orig	2019-04-30 22:22:56 UTC
 +++ services/audio/BUILD.gn
-@@ -106,7 +106,7 @@ source_set("lib") {
+@@ -99,7 +99,7 @@ source_set("lib") {
      "//services/service_manager/sandbox:sandbox",
    ]
  
diff --git a/www/chromium/files/patch-services_catalog_store.cc b/www/chromium/files/patch-services_catalog_store.cc
deleted file mode 100644
index 11bf71b32891..000000000000
--- a/www/chromium/files/patch-services_catalog_store.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- services/catalog/store.cc.orig	2019-03-11 22:01:01 UTC
-+++ services/catalog/store.cc
-@@ -38,5 +38,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO
- const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android";
- // static
- const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia";
-+// static
-+const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd";
- 
- }  // namespace catalog
diff --git a/www/chromium/files/patch-services_catalog_store.h b/www/chromium/files/patch-services_catalog_store.h
deleted file mode 100644
index 58ea5e1be58b..000000000000
--- a/www/chromium/files/patch-services_catalog_store.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- services/catalog/store.h.orig	2019-03-11 22:01:01 UTC
-+++ services/catalog/store.h
-@@ -38,6 +38,7 @@ class Store {
-   static const char kRequiredFilesKey_PlatformValue_MacOSX[];
-   static const char kRequiredFilesKey_PlatformValue_Android[];
-   static const char kRequiredFilesKey_PlatformValue_Fuchsia[];
-+  static const char kRequiredFilesKey_PlatformValue_FreeBSD[];
- };
- 
- }  // namespace catalog
diff --git a/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc
new file mode 100644
index 000000000000..3b0676568632
--- /dev/null
+++ b/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc
@@ -0,0 +1,20 @@
+--- services/content/simple_browser/simple_browser_service.cc.orig	2019-04-30 22:22:56 UTC
++++ services/content/simple_browser/simple_browser_service.cc
+@@ -7,7 +7,7 @@
+ #include "build/build_config.h"
+ #include "services/content/simple_browser/window.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "third_party/skia/include/ports/SkFontConfigInterface.h"  // nogncheck
+ #endif
+ 
+@@ -27,7 +27,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul
+ 
+ void SimpleBrowserService::OnStart() {
+   if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     font_loader_ =
+         sk_make_sp<font_service::FontLoader>(service_binding_.GetConnector());
+     SkFontConfigInterface::SetGlobal(font_loader_);
diff --git a/www/chromium/files/patch-services_device_device__service.h b/www/chromium/files/patch-services_device_device__service.h
index dfa9f67d0c8c..e7feec4f1ed2 100644
--- a/www/chromium/files/patch-services_device_device__service.h
+++ b/www/chromium/files/patch-services_device_device__service.h
@@ -1,6 +1,6 @@
---- services/device/device_service.h.orig	2019-03-17 14:44:04 UTC
+--- services/device/device_service.h.orig	2019-04-30 22:22:56 UTC
 +++ services/device/device_service.h
-@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service 
+@@ -200,7 +200,7 @@ class DeviceService : public service_manager::Service 
  #endif
  
  #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
index 41d470db80a2..76554ebfb66b 100644
--- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,6 +1,6 @@
---- services/device/geolocation/location_arbitrator.cc.orig	2019-03-11 22:01:01 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig	2019-04-30 22:22:56 UTC
 +++ services/device/geolocation/location_arbitrator.cc
-@@ -164,7 +164,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider(
  std::unique_ptr<LocationProvider>
  LocationArbitrator::NewSystemLocationProvider() {
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
index e32bc638f605..42e0cc8b1986 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,5 +1,5 @@
---- services/device/hid/hid_connection_freebsd.cc.orig	2019-03-30 17:42:59.718158000 -0700
-+++ services/device/hid/hid_connection_freebsd.cc	2019-03-30 21:54:38.653951000 -0700
+--- services/device/hid/hid_connection_freebsd.cc.orig	2019-05-04 09:19:19 UTC
++++ services/device/hid/hid_connection_freebsd.cc
 @@ -0,0 +1,240 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -57,7 +57,7 @@
 +             WriteCallback callback) {
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +    base::ScopedBlockingCall scoped_blocking_call(
-+        base::BlockingType::MAY_BLOCK);
++        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +
 +    auto data = buffer->front();
 +    size_t size = buffer->size();
@@ -83,7 +83,7 @@
 +                        ReadCallback callback) {
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +    base::ScopedBlockingCall scoped_blocking_call(
-+        base::BlockingType::MAY_BLOCK);
++        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +    struct usb_gen_descriptor ugd;
 +    ugd.ugd_report_type = UHID_FEATURE_REPORT;
 +    ugd.ugd_data = buffer->front();
@@ -233,7 +233,7 @@
 +    scoped_refptr<base::RefCountedBytes> buffer,
 +    WriteCallback callback) {
 +  base::ScopedBlockingCall scoped_blocking_call(
-+      base::BlockingType::MAY_BLOCK);
++      FROM_HERE, base::BlockingType::MAY_BLOCK);
 +  blocking_task_runner_->PostTask(
 +      FROM_HERE,
 +      base::BindOnce(&BlockingTaskHelper::SendFeatureReport,
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
index 62e78afde884..0b6704917991 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h
@@ -1,5 +1,5 @@
---- services/device/hid/hid_connection_freebsd.h.orig	2019-03-30 17:42:59.719257000 -0700
-+++ services/device/hid/hid_connection_freebsd.h	2019-03-30 21:53:54.126040000 -0700
+--- services/device/hid/hid_connection_freebsd.h.orig	2019-05-01 15:21:27 UTC
++++ services/device/hid/hid_connection_freebsd.h
 @@ -0,0 +1,68 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
index 325ef9709537..6c68a384318c 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service_freebsd.cc.orig	2019-03-30 17:42:59.721025000 -0700
-+++ services/device/hid/hid_service_freebsd.cc	2019-03-30 22:02:19.316167000 -0700
-@@ -0,0 +1,373 @@
+--- services/device/hid/hid_service_freebsd.cc.orig	2019-05-04 09:19:19 UTC
++++ services/device/hid/hid_service_freebsd.cc
+@@ -0,0 +1,374 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -111,7 +111,7 @@
 +
 +  void OnDeviceAdded(std::string device_id) {
 +    base::ScopedBlockingCall scoped_blocking_call(
-+        base::BlockingType::MAY_BLOCK);
++        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +    std::string device_node = "/dev/" + device_id;
 +    uint16_t vendor_id = 0xffff;
 +    uint16_t product_id = 0xffff;
@@ -171,7 +171,7 @@
 +
 +  void OnDeviceRemoved(std::string device_id) {
 +    base::ScopedBlockingCall scoped_blocking_call(
-+        base::BlockingType::MAY_BLOCK);
++        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +    task_runner_->PostTask(
 +        FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_,
 +                              device_id));
@@ -315,7 +315,8 @@
 +// static
 +void HidServiceFreeBSD::OpenOnBlockingThread(
 +    std::unique_ptr<ConnectParams> params) {
-+  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
++  base::ScopedBlockingCall scoped_blocking_call(
++      FROM_HERE, base::BlockingType::MAY_BLOCK);
 +  scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
 +
 +  base::FilePath device_path(params->device_info->device_node());
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 f8b54bcb97a3..e05dd930bc94 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,6 @@
---- services/device/serial/serial_io_handler_posix.cc.orig	2019-03-11 22:01:01 UTC
+--- services/device/serial/serial_io_handler_posix.cc.orig	2019-04-30 22:22:56 UTC
 +++ services/device/serial/serial_io_handler_posix.cc
-@@ -65,7 +65,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
+@@ -66,7 +66,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 f88e8f7016ca..6621adec914f 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	2019-03-11 22:01:01 UTC
+--- services/network/BUILD.gn.orig	2019-04-30 22:22:56 UTC
 +++ services/network/BUILD.gn
-@@ -248,7 +248,6 @@ jumbo_component("network_service") {
+@@ -249,7 +249,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 7494dd16ec70..c51d40b29b2d 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	2019-03-11 22:01:01 UTC
+--- services/network/network_context.cc.orig	2019-04-30 22:22:56 UTC
 +++ services/network/network_context.cc
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
  #endif  // defined(USE_NSS_CERTS)
  
  #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -9,7 +9,7 @@
  #include "net/cert/cert_net_fetcher.h"
  #include "net/cert_net/cert_net_fetcher_impl.h"
  #endif
-@@ -610,7 +610,7 @@ NetworkContext::~NetworkContext() {
+@@ -618,7 +618,7 @@ NetworkContext::~NetworkContext() {
  #endif
  
  #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
@@ -18,7 +18,7 @@
      net::ShutdownGlobalCertNetFetcher();
  #endif
    }
-@@ -1700,7 +1700,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
+@@ -1747,7 +1747,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
  
      net::CookieCryptoDelegate* crypto_delegate = nullptr;
      if (params_->enable_encrypted_cookies) {
@@ -27,7 +27,7 @@
        DCHECK(network_service_->os_crypt_config_set())
            << "NetworkService::SetCryptConfig must be called before creating a "
               "NetworkContext with encrypted cookies.";
-@@ -2015,7 +2015,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
+@@ -2069,7 +2069,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
      net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get());
  #endif
  #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 8ffb810f07ce..890fe4240983 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,4 +1,4 @@
---- services/network/network_service.cc.orig	2019-03-21 00:36:59 UTC
+--- services/network/network_service.cc.orig	2019-04-30 22:22:56 UTC
 +++ services/network/network_service.cc
 @@ -61,7 +61,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
@@ -9,7 +9,7 @@
  #include "components/os_crypt/key_storage_config_linux.h"
  #endif
  
-@@ -605,7 +605,7 @@ void NetworkService::OnCertDBChanged() {
+@@ -620,7 +620,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 194096d9dc92..fd2e9dffb985 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	2019-03-11 22:01:01 UTC
+--- services/network/network_service.h.orig	2019-04-30 22:22:56 UTC
 +++ services/network/network_service.h
-@@ -186,7 +186,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -187,7 +187,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
  #endif  // !BUILDFLAG(IS_CT_SUPPORTED)
    void UpdateCRLSet(base::span<const uint8_t> crl_set) override;
    void OnCertDBChanged() override;
diff --git a/www/chromium/files/patch-services_network_public_cpp_features.cc b/www/chromium/files/patch-services_network_public_cpp_features.cc
new file mode 100644
index 000000000000..eed488de5453
--- /dev/null
+++ b/www/chromium/files/patch-services_network_public_cpp_features.cc
@@ -0,0 +1,11 @@
+--- services/network/public/cpp/features.cc.orig	2019-04-30 22:22:56 UTC
++++ services/network/public/cpp/features.cc
+@@ -20,7 +20,7 @@ const base::Feature kNetworkErrorLogging{"NetworkError
+ const base::Feature kNetworkService {
+   "NetworkService",
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(IS_CHROMECAST))
++    (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
+       base::FEATURE_ENABLED_BY_DEFAULT
+ };
+ #else
diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
index 83e6eb0eaa83..df4eb423e0ea 100644
--- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
+++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
@@ -1,6 +1,6 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2019-03-11 22:01:02 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2019-04-30 22:22:56 UTC
 +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
-@@ -26,9 +26,9 @@ class COMPONENT_EXPORT(
+@@ -28,9 +28,9 @@ class COMPONENT_EXPORT(
                                      mojom::RawOSMemDump*);
    static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId);
  
@@ -12,3 +12,21 @@
  
   private:
    FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps);
+@@ -44,7 +44,7 @@ class COMPONENT_EXPORT(
+   static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId);
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   // Provides information on the dump state of resident pages.
+   enum class MappedAndResidentPagesDumpState {
+     // Access to /proc/<pid>/pagemap can be denied for android devices running
+@@ -65,7 +65,7 @@ class COMPONENT_EXPORT(
+       const size_t end_address,
+       std::vector<uint8_t>* accessed_pages_bitmap);
+ 
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ };
+ 
+ }  // namespace memory_instrumentation
diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
index 1ea42a3de872..c3400cbc3097 100644
--- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
+++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
@@ -1,6 +1,6 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2019-03-21 01:36:59.000000000 +0100
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc	2019-03-24 18:58:48.459358000 +0100
-@@ -17,8 +17,10 @@
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2019-04-30 22:22:56 UTC
++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
+@@ -19,8 +19,10 @@
  #include "build/build_config.h"
  #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"
  
@@ -11,23 +11,23 @@
  
  namespace memory_instrumentation {
  
-@@ -67,6 +69,7 @@
+@@ -69,6 +71,7 @@ struct ModuleData {
  
  ModuleData GetMainModuleData() {
    ModuleData module_data;
 +#if !defined(OS_BSD)
    Dl_info dl_info;
    if (dladdr(&__ehdr_start, &dl_info)) {
-     base::Optional<std::string> build_id =
-@@ -76,6 +79,7 @@
-       module_data.build_id = *build_id;
+     base::debug::ElfBuildIdBuffer build_id;
+@@ -79,6 +82,7 @@ ModuleData GetMainModuleData() {
+       module_data.build_id = std::string(build_id, build_id_length);
      }
    }
 +#endif
    return module_data;
  }
  
-@@ -123,14 +127,14 @@
+@@ -126,14 +130,14 @@ bool ParseSmapsHeader(const char* header_line,
    // Build ID is needed to symbolize heap profiles, and is generated only on
    // official builds. Build ID is only added for the current library (chrome)
    // since it is racy to read other libraries which can be unmapped any time.
@@ -44,18 +44,19 @@
  
    return res;
  }
-@@ -217,6 +221,9 @@
+@@ -220,6 +224,10 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) {
  // static
  bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
                                   mojom::RawOSMemDump* dump) {
 +#if defined(OS_BSD)
++  NOTIMPLEMENTED();
 +  return false;
 +#else
    base::ScopedFD autoclose = OpenStatm(pid);
    int statm_fd = autoclose.get();
  
-@@ -242,10 +249,12 @@
-   dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024;
+@@ -267,10 +275,15 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
+ #endif  //  defined(OS_ANDROID)
  
    return true;
 +#endif
@@ -64,16 +65,35 @@
  // static
  std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) {
 +#if defined(OS_BSD)
++  NOTIMPLEMENTED();
++  return std::vector<VmRegionPtr>();
++#else
    std::vector<VmRegionPtr> maps;
    uint32_t res = 0;
    if (g_proc_smaps_for_testing) {
-@@ -263,6 +272,10 @@
+@@ -288,6 +301,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa
      return std::vector<VmRegionPtr>();
  
    return maps;
-+#else
++#endif
+ }
+ 
+ // static
+@@ -295,6 +309,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
+     const size_t start_address,
+     const size_t end_address,
+     std::vector<uint8_t>* accessed_pages_bitmap) {
++#if defined(OS_BSD)
 +  NOTIMPLEMENTED();
-+  return std::vector<VmRegionPtr>();
++  return OSMetrics::MappedAndResidentPagesDumpState::kFailure;
++#else
+   const char* kPagemap = "/proc/self/pagemap";
+ 
+   base::ScopedFILE pagemap_file(fopen(kPagemap, "r"));
+@@ -336,6 +354,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
+     }
+   }
+   return OSMetrics::MappedAndResidentPagesDumpState::kSuccess;
 +#endif
  }
  
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 59c9689f2a44..9ed9e5553ae9 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-03-11 22:01:02 UTC
+--- services/service_manager/embedder/main.cc.orig	2019-04-30 22:22:56 UTC
 +++ services/service_manager/embedder/main.cc
-@@ -320,7 +320,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_public_cpp_service__executable_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
index 6be6aa5fe51e..4e2b8913bd0b 100644
--- a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
+++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
@@ -1,6 +1,6 @@
---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2019-03-11 22:01:02 UTC
+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig	2019-04-30 22:22:56 UTC
 +++ services/service_manager/public/cpp/service_executable/BUILD.gn
-@@ -30,6 +30,11 @@ source_set("support") {
+@@ -29,6 +29,11 @@ source_set("support") {
        "//sandbox/linux:seccomp_bpf",
      ]
    }
@@ -11,4 +11,4 @@
 +  }
  }
  
- # Service executable targets should link against this to get a boilerplate entry
+ source_set("switches") {
diff --git a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
deleted file mode 100644
index 05ce38ea9fad..000000000000
--- a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/service_manager/runner/host/BUILD.gn.orig	2019-03-11 22:01:02 UTC
-+++ services/service_manager/runner/host/BUILD.gn
-@@ -30,7 +30,7 @@ source_set("lib") {
-     "//mojo/public/cpp/system",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux && !is_bsd) {
-     deps += [ "//sandbox/linux:sandbox_services" ]
-   }
- 
diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
new file mode 100644
index 000000000000..c382c4b9c457
--- /dev/null
+++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
@@ -0,0 +1,20 @@
+--- services/video_capture/broadcasting_receiver.cc.orig	2019-04-30 22:22:57 UTC
++++ services/video_capture/broadcasting_receiver.cc
+@@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
+ void CloneSharedBufferToRawFileDescriptorHandle(
+     const mojo::ScopedSharedBufferHandle& source,
+     media::mojom::VideoBufferHandlePtr* target) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   media::SharedMemoryHandleProvider provider;
+   provider.InitFromMojoHandle(
+       source->Clone(mojo::SharedBufferHandle::AccessMode::READ_WRITE));
+@@ -174,7 +174,7 @@ void BroadcastingReceiver::BufferContext::
+     ConvertRawFileDescriptorToSharedBuffer() {
+   DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   media::SharedMemoryHandleProvider provider;
+   provider.InitAsReadOnlyFromRawFileDescriptor(
+       std::move(buffer_handle_->get_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 a2aa44b3e13f..589712280d71 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	2019-03-11 22:07:58 UTC
+--- third_party/angle/BUILD.gn.orig	2019-04-30 22:25:51 UTC
 +++ third_party/angle/BUILD.gn
-@@ -276,6 +276,7 @@ angle_static_library("angle_gpu_info_util") {
+@@ -327,6 +327,7 @@ angle_static_library("angle_gpu_info_util") {
          "X11",
          "Xi",
          "Xext",
@@ -8,7 +8,7 @@
        ]
      }
    }
-@@ -842,10 +843,6 @@ foreach(is_shared_library,
+@@ -938,10 +939,6 @@ foreach(is_shared_library,
      libs = []
      if (is_linux) {
        sources += util_linux_sources
diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
new file mode 100644
index 000000000000..84c27f2ec781
--- /dev/null
+++ b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
@@ -0,0 +1,11 @@
+--- third_party/angle/src/common/system_utils_posix.cpp.orig	2019-04-30 22:25:51 UTC
++++ third_party/angle/src/common/system_utils_posix.cpp
+@@ -17,7 +17,7 @@
+ 
+ // On mac, environ is not declared anywhere:
+ // https://stackoverflow.com/a/31347357/912144
+-#if defined(ANGLE_PLATFORM_APPLE)
++#if defined(ANGLE_PLATFORM_APPLE) || defined(__FreeBSD__)
+ extern char **environ;
+ #endif
+ 
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 0021521dfbc0..26112b34d95a 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,6 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig	2019-03-11 22:07:59 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2019-04-30 22:25:51 UTC
 +++ third_party/angle/src/libANGLE/Display.cpp
-@@ -64,7 +64,7 @@
+@@ -66,7 +66,7 @@
  #if defined(ANGLE_ENABLE_VULKAN)
  #    if defined(ANGLE_PLATFORM_WINDOWS)
  #        include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
@@ -9,7 +9,7 @@
  #        include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
  #    elif defined(ANGLE_PLATFORM_ANDROID)
  #        include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
-@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
+@@ -261,7 +261,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
  #if defined(ANGLE_ENABLE_VULKAN)
  #    if defined(ANGLE_PLATFORM_WINDOWS)
              impl = new rx::DisplayVkWin32(state);
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 e61a4d98148f..4a95f6891eeb 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	2019-03-11 22:08:05 UTC
+--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig	2019-04-30 22:25:57 UTC
 +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
-@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d
+@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
  }
  
  // Environment variables
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 8a28ae58a8c3..2ae943e28d09 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-03-11 22:01:03 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2019-04-30 22:23:01 UTC
 +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
+@@ -188,7 +188,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
  std::vector<std::string> InspectorMemoryAgent::Symbolize(
      const std::vector<void*>& addresses) {
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 74442a38fa4f..d95abda924a0 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	2019-03-11 22:01:03 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig	2019-04-30 22:23:01 UTC
 +++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -104,7 +104,7 @@ namespace {
+@@ -103,7 +103,7 @@ namespace {
  static CompositingQueryMode g_compositing_query_mode =
      kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index b237065ecdae..898a95ad5227 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2019-04-30 22:23:02 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.cc
-@@ -66,7 +66,7 @@ namespace blink {
+@@ -67,7 +67,7 @@ namespace blink {
  
  SkFontMgr* FontCache::static_font_manager_ = nullptr;
  
@@ -9,7 +9,7 @@
  float FontCache::device_scale_factor_ = 1.0;
  #endif
  
-@@ -89,7 +89,7 @@ FontCache::FontCache()
+@@ -90,7 +90,7 @@ FontCache::FontCache()
  FontPlatformData* FontCache::SystemFontPlatformData(
      const FontDescription& font_description) {
    const AtomicString& family = FontCache::SystemFontFamily();
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 7d9dce581b79..f3e41fe258ce 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,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2019-04-30 22:23:02 UTC
 +++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -157,7 +157,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -155,7 +155,7 @@ class PLATFORM_EXPORT FontCache {
    sk_sp<SkFontMgr> FontManager() { return font_manager_; }
    static void SetFontManager(sk_sp<SkFontMgr>);
  
@@ -9,7 +9,7 @@
    // These are needed for calling QueryRenderStyleForStrike, since
    // gfx::GetFontRenderParams makes distinctions based on DSF.
    static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -218,7 +218,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -216,7 +216,7 @@ class PLATFORM_EXPORT FontCache {
        const FontDescription&);
  #endif  // defined(OS_ANDROID)
  
@@ -18,7 +18,7 @@
    struct PlatformFallbackFont {
      String name;
      CString filename;
-@@ -230,7 +230,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -228,7 +228,7 @@ class PLATFORM_EXPORT FontCache {
    static void GetFontForCharacter(UChar32,
                                    const char* preferred_locale,
                                    PlatformFallbackFont*);
@@ -27,7 +27,7 @@
  
    scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
        const FontPlatformData*,
-@@ -294,12 +294,12 @@ class PLATFORM_EXPORT FontCache {
+@@ -292,12 +292,12 @@ class PLATFORM_EXPORT FontCache {
                                     const FontFaceCreationParams&,
                                     CString& name);
  
@@ -42,7 +42,7 @@
  
    scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&,
                                                       UChar32);
-@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache {
+@@ -328,7 +328,7 @@ class PLATFORM_EXPORT FontCache {
    bool is_test_font_mgr_ = false;
  #endif  // defined(OS_WIN)
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
index 68d27a0630f4..e3dc7c2eb546 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig	2019-03-11 22:01:04 UTC
+--- third_party/blink/renderer/platform/wtf/BUILD.gn.orig	2019-04-30 22:23:03 UTC
 +++ third_party/blink/renderer/platform/wtf/BUILD.gn
-@@ -267,8 +267,12 @@ jumbo_component("wtf") {
+@@ -268,8 +268,12 @@ jumbo_component("wtf") {
    if (is_android) {
      libs = [ "log" ]
    }
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
deleted file mode 100644
index 7d8de2b7ae80..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/blink/renderer/platform/wtf/threading.cc.orig	2019-03-11 22:01:04 UTC
-+++ third_party/blink/renderer/platform/wtf/threading.cc
-@@ -17,12 +17,16 @@
- #error Blink does not support threading on your platform.
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <sys/syscall.h>
- #elif defined(OS_ANDROID)
- #include <sys/types.h>
- #endif
- 
-+#if defined(OS_BSD)
-+#include <pthread_np.h>
-+#endif
-+
- namespace WTF {
- 
- // Current thread identity
-@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() {
-   return syscall(__NR_gettid);
- #elif defined(OS_ANDROID)
-   return gettid();
-+#elif defined(OS_BSD)
-+  return pthread_getthreadid_np();
- #else
-   return reinterpret_cast<uintptr_t>(pthread_self());
- #endif
diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn
index 2e56f692737c..21a9de63e030 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-03-11 22:01:15 UTC
+--- third_party/boringssl/BUILD.gn.orig	2019-04-30 22:23:27 UTC
 +++ third_party/boringssl/BUILD.gn
-@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -74,7 +74,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") {
+@@ -82,13 +82,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") {
+@@ -96,7 +96,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_boringssl_src_crypto_cpu-aarch64-linux.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
index 9c9a824d27df..3b078f06d076 100644
--- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
+++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
@@ -1,5 +1,5 @@
---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2019-04-05 02:55:11.000000000 +0200
-+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c	2019-04-15 08:45:47.936052000 +0200
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2019-04-30 22:25:51 UTC
++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
 @@ -14,49 +14,35 @@
  
  #include <openssl/cpu.h>
diff --git a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
index 48a524c6d8c1..bbcc2f5bb930 100644
--- a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
+++ b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
@@ -1,5 +1,5 @@
---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig	2019-04-05 02:55:11.000000000 +0200
-+++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h	2019-04-15 08:43:01.276910000 +0200
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig	2019-04-30 22:25:51 UTC
++++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
 @@ -7,8 +7,6 @@
  #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_
  #define CRC32C_CRC32C_ARM_LINUX_CHECK_H_
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
deleted file mode 100644
index 305296610dba..000000000000
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig	2019-03-11 22:08:00 UTC
-+++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
-@@ -623,7 +623,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
-   (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
- 
- // Determines whether test results can be streamed to a socket.
--#if GTEST_OS_LINUX
-+#if GTEST_OS_LINUX || GTEST_OS_FREEBSD
- # define GTEST_CAN_STREAM_RESULTS_ 1
- #endif
- 
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
index b3f414506f9d..3f024ae50bdd 100644
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
+++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
@@ -1,8 +1,8 @@
---- third_party/googletest/src/googletest/src/gtest-port.cc.orig	2019-03-11 22:08:00 UTC
+--- third_party/googletest/src/googletest/src/gtest-port.cc.orig	2019-04-30 22:25:52 UTC
 +++ third_party/googletest/src/googletest/src/gtest-port.cc
-@@ -55,6 +55,11 @@
- # include <mach/vm_map.h>
- #endif  // GTEST_OS_MAC
+@@ -63,6 +63,11 @@
+ # endif
+ #endif
  
 +#if GTEST_OS_FREEBSD
 +#include <sys/sysctl.h>
@@ -12,7 +12,7 @@
  #if GTEST_OS_QNX
  # include <devctl.h>
  # include <fcntl.h>
-@@ -129,6 +134,28 @@ size_t GetThreadCount() {
+@@ -137,6 +142,28 @@ size_t GetThreadCount() {
    } else {
      return 0;
    }
@@ -40,4 +40,4 @@
 +  return KP_NLWP(info);
  }
  
- #elif GTEST_OS_QNX
+ #elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \
diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
deleted file mode 100644
index 305637d04a46..000000000000
--- a/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig	2019-03-11 22:08:00 UTC
-+++ third_party/googletest/src/googletest/test/googletest-port-test.cc
-@@ -286,7 +286,7 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
-   EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1));
- }
- 
--#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
-+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || GTEST_OS_FREEBSD
- void* ThreadFunc(void* data) {
-   internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
-   mutex->Lock();
diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
new file mode 100644
index 000000000000..eb8e42c94bca
--- /dev/null
+++ b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
@@ -0,0 +1,20 @@
+--- third_party/harfbuzz-ng/harfbuzz.gni.orig	2019-05-04 09:19:19 UTC
++++ third_party/harfbuzz-ng/harfbuzz.gni
+@@ -3,10 +3,11 @@
+ # found in the LICENSE file.
+ 
+ declare_args() {
+-  # Blink uses a cutting-edge version of Harfbuzz; most Linux distros do not
+-  # contain a new enough version of the code to work correctly. However,
+-  # ChromeOS chroots (i.e, real ChromeOS builds for devices) do contain a
+-  # new enough version of the library, and so this variable exists so that
+-  # ChromeOS can build against the system lib and keep binary sizes smaller.
+-  use_system_harfbuzz = false
++  # Blink uses a cutting-edge version of Harfbuzz (version listed in
++  # third_party/harfbuzz-ng/README.chromium); most Linux distros do not contain
++  # a new enough version of the code to work correctly. However, ChromeOS
++  # chroots (i.e. real ChromeOS builds for devices) do contain a new enough
++  # version of the library, and so this variable exists so that ChromeOS can
++  # build against the system lib and keep binary sizes smaller.
++  use_system_harfbuzz = true
+ }
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 53a211aa8162..30a8a9b4dbb7 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	2019-03-11 22:01:15 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig	2019-04-30 22:23:32 UTC
 +++ third_party/leveldatabase/env_chromium.cc
-@@ -39,7 +39,11 @@
+@@ -40,7 +40,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_nasm_config_config-linux.h b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
new file mode 100644
index 000000000000..6846af2fe7c7
--- /dev/null
+++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
@@ -0,0 +1,29 @@
+--- third_party/nasm/config/config-linux.h.orig	2019-04-30 22:25:54 UTC
++++ third_party/nasm/config/config-linux.h
+@@ -117,7 +117,7 @@
+ #define HAVE_ACCESS 1
+ 
+ /* Define to 1 if you have the `canonicalize_file_name' function. */
+-#define HAVE_CANONICALIZE_FILE_NAME 1
++/* #undef HAVE_CANONICALIZE_FILE_NAME */
+ 
+ /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
+ /* #undef HAVE_CPU_TO_LE16 */
+@@ -161,7 +161,7 @@
+ #define HAVE_DECL_STRSEP 1
+ 
+ /* Define to 1 if you have the <endian.h> header file. */
+-#define HAVE_ENDIAN_H 1
++/* #undef HAVE_ENDIAN_H */
+ 
+ /* Define to 1 if you have the `faccessat' function. */
+ #define HAVE_FACCESSAT 1
+@@ -322,7 +322,7 @@
+ #define HAVE_SYSCONF 1
+ 
+ /* Define to 1 if you have the <sys/endian.h> header file. */
+-/* #undef HAVE_SYS_ENDIAN_H */
++#define HAVE_SYS_ENDIAN_H 1
+ 
+ /* Define to 1 if you have the <sys/mman.h> header file. */
+ #define HAVE_SYS_MMAN_H 1
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
index 0557f9bf57a8..5092acc1342f 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig	2019-03-11 22:08:02 UTC
+--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig	2019-04-30 22:25:55 UTC
 +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp
-@@ -146,9 +146,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa
+@@ -147,9 +147,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa
      const char** pUserPaths) {
    auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
    if (!pInfo->ParseFontCfg(pUserPaths)) {
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
new file mode 100644
index 000000000000..e2b4905d03eb
--- /dev/null
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h
@@ -0,0 +1,25 @@
+--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig	2019-04-30 22:25:55 UTC
++++ third_party/perfetto/include/perfetto/base/thread_utils.h
+@@ -33,6 +33,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
++#include <pthread_np.h>
++#endif
++
+ namespace perfetto {
+ namespace base {
+ 
+@@ -40,6 +44,11 @@ namespace base {
+ using PlatformThreadID = pid_t;
+ inline PlatformThreadID GetThreadId() {
+   return gettid();
++}
++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
++      using PlatformThreadID = int;
++inline PlatformThreadID GetThreadId() {
++  return pthread_getthreadid_np();
+ }
+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
+ using PlatformThreadID = pid_t;
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
index a4c74f8695d0..a24c5dbfbc22 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,6 +1,6 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig	2019-03-11 22:08:02 UTC
+--- third_party/perfetto/src/base/unix_socket.cc.orig	2019-04-30 22:25:55 UTC
 +++ third_party/perfetto/src/base/unix_socket.cc
-@@ -502,7 +502,8 @@ void UnixSocket::DoConnect(const std::string& socket_n
+@@ -524,7 +524,8 @@ void UnixSocket::DoConnect(const std::string& socket_n
  
  void UnixSocket::ReadPeerCredentials() {
  #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
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 4772343042dc..4da5e43e42ac 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	2019-03-11 22:08:02 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2019-04-30 22:25:55 UTC
 +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -1494,7 +1494,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI
+@@ -1653,7 +1653,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI
  
  void TracingServiceImpl::UpdateMemoryGuardrail() {
  #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \
@@ -10,7 +10,7 @@
    uint64_t total_buffer_bytes = 0;
  
    // Sum up all the shared memory buffers.
-@@ -1545,7 +1546,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
+@@ -1705,7 +1706,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
    protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();
  
  #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
index 7b690c4159fb..81af3cbf66e4 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
+++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
@@ -1,4 +1,4 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2019-03-11 22:08:03 UTC
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2019-04-30 22:25:56 UTC
 +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
 @@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id)
  		// FIXME: Check if display_id is the default display
@@ -18,7 +18,7 @@
  			"EGL_KHR_platform_gbm "
  #endif
  #if defined(USE_X11)
-@@ -1248,7 +1248,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
+@@ -1250,7 +1250,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
  {
  	TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list);
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
index 942ada34c1c8..3a8939da33a5 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
@@ -1,5 +1,5 @@
---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig	2019-04-05 02:55:18.000000000 +0200
-+++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h	2019-04-17 10:09:09.339341000 +0200
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig	2019-04-30 22:26:00 UTC
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
 @@ -8,15 +8,15 @@
  #define BUG_REPORT_URL "https://bugs.llvm.org/"
  
diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
index c18074e4d75b..cddea0ef0e07 100644
--- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
+++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
@@ -1,5 +1,5 @@
---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig	2019-04-05 02:55:18.000000000 +0200
-+++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h	2019-04-17 10:09:09.340636000 +0200
+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig	2019-04-30 22:26:00 UTC
++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
 @@ -28,7 +28,7 @@
  #elif defined(__arm__)
  #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf"
diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
index 5f28025bfc7a..04a6cff87c5f 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	2019-03-11 22:08:05 UTC
+--- third_party/webrtc/BUILD.gn.orig	2019-04-30 22:25:58 UTC
 +++ third_party/webrtc/BUILD.gn
-@@ -153,6 +153,9 @@ config("common_inherited_config") {
+@@ -152,6 +152,9 @@ config("common_inherited_config") {
    if (is_linux) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 4596e860ef72..bd76dbd0d3a8 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2019-03-11 22:08:06 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2019-04-30 22:25:59 UTC
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -312,7 +312,7 @@ rtc_source_set("audio_device_impl") {
+@@ -299,7 +299,7 @@ rtc_source_set("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
index edb50f296022..7301268cff8d 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/BUILD.gn.orig	2019-03-11 22:08:15 UTC
+--- third_party/webrtc/rtc_base/BUILD.gn.orig	2019-04-30 22:26:00 UTC
 +++ third_party/webrtc/rtc_base/BUILD.gn
-@@ -1088,8 +1088,6 @@ rtc_static_library("rtc_base") {
+@@ -969,8 +969,6 @@ rtc_static_library("rtc_base") {
  
    if (rtc_use_x11) {
      libs += [
@@ -9,7 +9,7 @@
        "Xext",
        "X11",
        "Xcomposite",
-@@ -1097,7 +1095,7 @@ rtc_static_library("rtc_base") {
+@@ -978,7 +976,7 @@ rtc_static_library("rtc_base") {
      ]
    }
  
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 febff7cd7555..59c6a746c174 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,4 +1,4 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2019-03-11 22:08:15 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2019-04-30 22:26:00 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
@@ -9,7 +9,7 @@
  #include <linux/if.h>
  #include <linux/route.h>
  #elif !defined(__native_client__)
-@@ -762,7 +762,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
+@@ -765,7 +765,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
  }
  #endif  // WEBRTC_WIN
  
@@ -18,7 +18,7 @@
  bool IsDefaultRoute(const std::string& network_name) {
    FILE* f = fopen("/proc/net/route", "r");
    if (!f) {
-@@ -805,7 +805,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
+@@ -808,7 +808,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
        strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
      return true;
    }
diff --git a/www/chromium/files/patch-third__party_zlib_arm__features.c b/www/chromium/files/patch-third__party_zlib_arm__features.c
index 559cd9ca0ffd..877678952a54 100644
--- a/www/chromium/files/patch-third__party_zlib_arm__features.c
+++ b/www/chromium/files/patch-third__party_zlib_arm__features.c
@@ -1,13 +1,11 @@
---- third_party/zlib/arm_features.c.orig	2019-04-05 02:50:06.000000000 +0200
-+++ third_party/zlib/arm_features.c	2019-04-15 14:59:36.552326000 +0200
-@@ -8,83 +8,30 @@
+--- third_party/zlib/arm_features.c.orig	2019-04-30 22:23:35 UTC
++++ third_party/zlib/arm_features.c
+@@ -11,20 +11,11 @@
+ int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
+ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
  
- #include "zutil.h"
- 
--int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
--int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
--
 -#if !defined(_MSC_VER)
+-
  #include <pthread.h>
  #include <stdint.h>
 +#include <machine/armreg.h>
@@ -19,62 +17,48 @@
 -#include <asm/hwcap.h>
 -#include <sys/auxv.h>
 -#else
--#error ### No ARM CPU features detection in your platform/OS
+-#error arm_features.c ARM feature detection in not defined for your platform
 -#endif
-+int ZLIB_INTERNAL arm_cpu_enable_crc32 = 0;
-+int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
- 
+-
  static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
  
- static void init_arm_features(void)
+ static void _arm_check_features(void);
+@@ -40,54 +31,14 @@ void ZLIB_INTERNAL arm_check_features(void)
+  */
+ static void _arm_check_features(void)
  {
--    uint64_t flag_crc32 = 0, flag_pmull = 0, capabilities = 0;
-+#if defined (__aarch64__)
+-#if defined(ARMV8_OS_ANDROID) && defined(__aarch64__)
+-    uint64_t features = android_getCpuFeatures();
+-    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM64_FEATURE_CRC32);
+-    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM64_FEATURE_PMULL);
+-#elif defined(ARMV8_OS_ANDROID) /* aarch32 */
+-    uint64_t features = android_getCpuFeatures();
+-    arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
+-    arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
+-#elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
+-    unsigned long features = getauxval(AT_HWCAP);
+-    arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
+-    arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
+-#elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
+-    /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
+-    unsigned long features = getauxval(AT_HWCAP2);
+-    arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+-    arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
+-#endif
+-    /* TODO(crbug.com/810125): add ARMV8_OS_ZIRCON support for fucshia */
+-}
++#if defined(__aarch64__)
 +    uint64_t id_aa64isar0;
  
--#if defined(ARMV8_OS_ANDROID)
--    flag_crc32 = ANDROID_CPU_ARM_FEATURE_CRC32;
--    flag_pmull = ANDROID_CPU_ARM_FEATURE_PMULL;
--    capabilities = android_getCpuFeatures();
--#elif defined(ARMV8_OS_LINUX)
--    #if defined(__aarch64__)
--        flag_crc32 = HWCAP_CRC32;
--        flag_pmull = HWCAP_PMULL;
--        capabilities = getauxval(AT_HWCAP);
--    #elif defined(__ARM_NEON) || defined(__ARM_NEON__)
--        /* The use of HWCAP2 is for getting features of newer ARMv8-A SoCs
--         * while running in 32bits mode (i.e. aarch32).
--         */
--        flag_crc32 = HWCAP2_CRC32;
--        flag_pmull = HWCAP2_PMULL;
--        capabilities = getauxval(AT_HWCAP2);
--    #endif
--#endif
+-#else /* _MSC_VER */
 -
--    if (capabilities & flag_crc32)
--        arm_cpu_enable_crc32 = 1;
--
--    if (capabilities & flag_pmull)
-+    id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
-+    if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
-         arm_cpu_enable_pmull = 1;
-+    if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
-+        arm_cpu_enable_crc32 = 1;
-+#endif
- }
- 
- void ZLIB_INTERNAL arm_check_features(void)
- {
-     pthread_once(&cpu_check_inited_once, init_arm_features);
- }
--#else
 -#include <windows.h>
 -
+-static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
+-
 -static BOOL CALLBACK _arm_check_features(PINIT_ONCE once,
 -                                         PVOID param,
 -                                         PVOID *context);
--static INIT_ONCE cpu_check_inited_once = INIT_ONCE_STATIC_INIT;
--
 -
 -void ZLIB_INTERNAL arm_check_features(void)
 -{
@@ -87,11 +71,17 @@
 -                                         PVOID *context)
 -{
 -    if (IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE))
--        arm_cpu_enable_crc32 = 1;
++    id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
++    if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
++         arm_cpu_enable_pmull = 1;
++    if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
+         arm_cpu_enable_crc32 = 1;
 -
 -    if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE))
 -        arm_cpu_enable_pmull = 1;
 -
 -    return TRUE;
--}
++#endif
+ }
+ 
 -#endif /* _MSC_VER */
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index c133a516bb05..20e375ba12b2 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,15 +1,15 @@
---- tools/gn/build/gen.py.orig	2019-03-11 22:12:13 UTC
+--- tools/gn/build/gen.py.orig	2019-04-30 22:29:37 UTC
 +++ tools/gn/build/gen.py
-@@ -44,7 +44,7 @@ class Platform(object):
+@@ -46,7 +46,7 @@ class Platform(object):
  
    @staticmethod
    def known_platforms():
--    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia']
-+    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd']
+-    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd']
++    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd']
  
    def platform(self):
      return self._platform
-@@ -67,6 +67,9 @@ class Platform(object):
+@@ -69,6 +69,9 @@ class Platform(object):
    def is_aix(self):
      return self._platform == 'aix'
  
@@ -17,9 +17,9 @@
 +    return self._platform == 'freebsd'
 +
    def is_posix(self):
-     return self._platform in ['linux', 'freebsd', 'darwin', 'aix']
+     return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']
  
-@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options):
+@@ -335,6 +338,11 @@ def WriteGNNinja(path, platform, host, options):
      elif platform.is_aix():
        cflags_cc.append('-maix64')
        ldflags.append('-maix64')
diff --git a/www/chromium/files/patch-tools_gn_util_sys__info.cc b/www/chromium/files/patch-tools_gn_util_sys__info.cc
index a6b8c85507ed..fdc4849fc8da 100644
--- a/www/chromium/files/patch-tools_gn_util_sys__info.cc
+++ b/www/chromium/files/patch-tools_gn_util_sys__info.cc
@@ -1,5 +1,5 @@
---- tools/gn/util/sys_info.cc.orig	2019-04-04 13:16:59.443413000 +0200
-+++ tools/gn/util/sys_info.cc	2019-04-04 13:17:14.281724000 +0200
+--- tools/gn/util/sys_info.cc.orig	2019-04-30 22:29:37 UTC
++++ tools/gn/util/sys_info.cc
 @@ -28,6 +28,8 @@ std::string OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
deleted file mode 100644
index 4157662ca703..000000000000
--- a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/base/ime/ime_engine_handler_interface.h.orig	2019-03-11 22:01:19 UTC
-+++ ui/base/ime/ime_engine_handler_interface.h
-@@ -166,7 +166,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
-   virtual void SetMirroringEnabled(bool mirroring_enabled) = 0;
-   virtual void SetCastingEnabled(bool casting_enabled) = 0;
- 
--#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- 
-   // Get the id of the IME extension.
-   virtual std::string GetExtensionId() const = 0;
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 37754d5c96d4..ff9c3893665f 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/base/ui_base_features.cc.orig	2019-04-30 22:23:41 UTC
 +++ ui/base/ui_base_features.cc
-@@ -111,7 +111,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
+@@ -118,7 +118,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
      "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
  #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
  
@@ -9,7 +9,7 @@
  // Enables stylus appearing as touch when in contact with digitizer.
  const base::Feature kDirectManipulationStylus = {
      "DirectManipulationStylus",
-@@ -121,7 +121,7 @@ const base::Feature kDirectManipulationStylus = {
+@@ -128,7 +128,7 @@ const base::Feature kDirectManipulationStylus = {
      base::FEATURE_DISABLED_BY_DEFAULT
  #endif
  };
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 b82729f15f25..208884e30587 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.h
+++ b/www/chromium/files/patch-ui_base_ui__base__features.h
@@ -1,12 +1,13 @@
---- ui/base/ui_base_features.h.orig	2019-03-11 22:01:19 UTC
+--- ui/base/ui_base_features.h.orig	2019-04-30 22:23:41 UTC
 +++ ui/base/ui_base_features.h
-@@ -46,9 +46,9 @@ UI_BASE_EXPORT bool IsUsingWMPointerForTouch();
- UI_BASE_EXPORT extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
+@@ -63,10 +63,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
  #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- UI_BASE_EXPORT extern const base::Feature kDirectManipulationStylus;
+ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ extern const base::Feature kDirectManipulationStylus;
 -#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-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index d9c4ad8f22e7..3bc3fb7c041b 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	2019-03-11 22:01:19 UTC
+--- ui/gfx/BUILD.gn.orig	2019-04-30 22:23:42 UTC
 +++ ui/gfx/BUILD.gn
-@@ -532,7 +532,7 @@ jumbo_source_set("memory_buffer_sources") {
+@@ -544,7 +544,7 @@ jumbo_source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
index 3efa8ffce8ef..cec7290a738d 100644
--- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
+++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
@@ -1,4 +1,4 @@
---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2019-04-30 22:23:42 UTC
 +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc
 @@ -5,7 +5,9 @@
  #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
@@ -10,7 +10,7 @@
  #include <stddef.h>
  #include <sys/ioctl.h>
  #include <sys/mman.h>
-@@ -18,11 +20,7 @@
+@@ -22,11 +24,7 @@
  #include "base/trace_event/trace_event.h"
  #include "build/build_config.h"
  
diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
index 2d50ce0b11f4..45d1fe4faa92 100644
--- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
+++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
@@ -1,4 +1,4 @@
---- ui/gfx/native_pixmap_handle.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/gfx/native_pixmap_handle.cc.orig	2019-04-30 22:23:42 UTC
 +++ ui/gfx/native_pixmap_handle.cc
 @@ -4,14 +4,14 @@
  
@@ -26,3 +26,11 @@
  NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
    NativePixmapHandle clone;
    std::vector<base::ScopedFD> scoped_fds;
+@@ -53,6 +53,6 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
+   clone.planes = handle.planes;
+   return clone;
+ }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ }  // namespace gfx
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index 36b25afba995..61b10ed881ae 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	2019-03-11 22:01:19 UTC
+--- ui/gl/BUILD.gn.orig	2019-04-30 22:23:42 UTC
 +++ ui/gl/BUILD.gn
-@@ -212,7 +212,7 @@ jumbo_component("gl") {
+@@ -213,7 +213,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 e9bb6663cf9d..e3ae9d9a6e2d 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	2019-03-11 22:01:19 UTC
+--- ui/gl/generate_bindings.py.orig	2019-04-30 22:23:42 UTC
 +++ ui/gl/generate_bindings.py
-@@ -2624,6 +2624,9 @@ GLX_FUNCTIONS = [
+@@ -2666,6 +2666,9 @@ GLX_FUNCTIONS = [
    'arguments':
        'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
        'int32_t* denominator' },
diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
index 72ae09b4d8c1..7295d4c6df5e 100644
--- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
+++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
@@ -1,4 +1,4 @@
---- ui/gl/sync_control_vsync_provider.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/gl/sync_control_vsync_provider.cc.orig	2019-04-30 22:23:42 UTC
 +++ ui/gl/sync_control_vsync_provider.cc
 @@ -11,7 +11,7 @@
  #include "base/trace_event/trace_event.h"
@@ -27,7 +27,7 @@
    // The actual clock used for the system time returned by glXGetSyncValuesOML
    // is unspecified. In practice, the clock used is likely to be either
    // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the
-@@ -157,11 +157,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
+@@ -156,11 +156,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
    return true;
  #else
    return false;
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 784570afe3fd..3e885edefc59 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,6 +1,6 @@
---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig	2019-04-30 22:23:43 UTC
 +++ ui/views/bubble/bubble_dialog_delegate_view.cc
-@@ -112,7 +112,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
+@@ -114,7 +114,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
    bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
    Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
  
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index b1f04455a0f4..0e6218b3eb9c 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/label.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/views/controls/label.cc.orig	2019-04-30 22:23:43 UTC
 +++ ui/views/controls/label.cc
-@@ -542,7 +542,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
+@@ -545,7 +545,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
-@@ -727,7 +727,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -730,7 +730,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 974edeb7d427..78676286af49 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2019-03-11 22:01:19 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2019-04-30 22:23:43 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -59,7 +59,7 @@
+@@ -64,7 +64,7 @@
  #include "base/win/win_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/strings/utf_string_conversions.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -162,14 +162,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
+@@ -167,14 +167,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
      case ui::VKEY_BACK:
        if (!control)
          return ui::TextEditCommand::DELETE_BACKWARD;
@@ -26,7 +26,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift && control)
          return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -228,7 +228,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -233,7 +233,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -35,7 +35,7 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -682,7 +682,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
+@@ -687,7 +687,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
-@@ -726,7 +726,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -731,7 +731,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;
-@@ -894,7 +894,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -899,7 +899,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();
-@@ -2076,7 +2076,7 @@ bool Textfield::PasteSelectionClipboard() {
+@@ -2089,7 +2089,7 @@ bool Textfield::PasteSelectionClipboard() {
  }
  
  void Textfield::UpdateSelectionClipboard() {
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 9d48115a485a..b22820c8089a 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	2019-03-17 17:58:04 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2019-04-30 22:23:43 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
+@@ -90,7 +90,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
      const Widget::InitParams& params) {
    native_widget_delegate_->OnNativeWidgetCreated();
  
@@ -9,7 +9,7 @@
    // Setup a non_client_window_event_filter, which handles resize/move, double
    // click and other events.
    DCHECK(!non_client_window_event_filter_);
-@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
+@@ -541,7 +541,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
  }
  
  void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() {
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 8e9be5b72ff6..6bb4e7c7e081 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	2019-03-11 22:08:08 UTC
+--- v8/BUILD.gn.orig	2019-04-30 22:26:01 UTC
 +++ v8/BUILD.gn
-@@ -3160,7 +3160,7 @@ v8_component("v8_libbase") {
+@@ -3302,7 +3302,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -9,7 +9,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -3180,6 +3180,12 @@ v8_component("v8_libbase") {
+@@ -3322,6 +3322,12 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
@@ -22,7 +22,7 @@
    } else if (is_android) {
      if (current_toolchain == host_toolchain) {
        libs = [
-@@ -3384,6 +3390,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
+@@ -3527,6 +3533,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
        "src/snapshot/embedded-file-writer.h",
        "src/snapshot/mksnapshot.cc",
      ]
diff --git a/www/chromium/files/patch-v8_src_api.cc b/www/chromium/files/patch-v8_src_api.cc
index 19e538ee0a8f..305809f86a7f 100644
--- a/www/chromium/files/patch-v8_src_api.cc
+++ b/www/chromium/files/patch-v8_src_api.cc
@@ -1,6 +1,6 @@
---- v8/src/api.cc.orig	2019-03-11 22:08:08 UTC
+--- v8/src/api.cc.orig	2019-04-30 22:26:01 UTC
 +++ v8/src/api.cc
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
  #include "src/wasm/wasm-result.h"
  #include "src/wasm/wasm-serialization.h"
  
@@ -9,7 +9,7 @@
  #include <signal.h>
  #include "include/v8-wasm-trap-handler-posix.h"
  #include "src/trap-handler/handler-inside-posix.h"
-@@ -5759,7 +5759,7 @@ bool v8::V8::Initialize() {
+@@ -5765,7 +5765,7 @@ bool v8::V8::Initialize() {
    return true;
  }
  
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 51fb7a8f7f0f..15da28e22f96 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	2019-03-21 01:39:38.000000000 +0100
-+++ v8/src/base/platform/platform-posix.cc	2019-03-24 19:04:25.066535000 +0100
-@@ -376,7 +376,7 @@
+--- v8/src/base/platform/platform-posix.cc.orig	2019-04-30 22:26:01 UTC
++++ v8/src/base/platform/platform-posix.cc
+@@ -376,7 +376,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.
-@@ -501,6 +501,12 @@
+@@ -501,6 +501,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/pkg-plist b/www/chromium/pkg-plist
index d18b16aa0e67..5196b58e25c6 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -317,9 +317,9 @@ bin/chrome
 %%DEBUG%%%%DATADIR%%/character_data_generator
 %%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so
-%%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so
-%%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so
-%%DEBUG%%%%DATADIR%%/libVkLayer_threading.so
+%%DEBUG%%%%DATADIR%%/libVkLayer_object_lifetimes.so
+%%DEBUG%%%%DATADIR%%/libVkLayer_stateless_validation.so
+%%DEBUG%%%%DATADIR%%/libVkLayer_thread_safety.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so
 %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so
 %%DEBUG%%%%DATADIR%%/libtest_shared_library.so