www/chromium: Update to 75.0.3770.80

Changelog: https://chromium.googlesource.com/chromium/src/+log/74.0.3729.169..75.0.3770.80?pretty=fuller&n=10000

Submitted by:	Matthias Wolf <matthias@rheinwolf.de>

www/chromium/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	74.0.3729.169
+PORTVERSION=	75.0.3770.80
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
@@ -172,13 +172,14 @@ CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
+			GN_ARGS+=symbol_level=1 \
 			GN_BOOTSTRAP_FLAGS+=--debug \
 			WANTSPACE="lots of free disk space (~ 13GB)"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
+			GN_ARGS+=blink_symbol_level=0 \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
-			GN_ARGS+=remove_webcore_debug_symbols=true \
 			WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
 
 DRIVER_MAKE_ARGS=	chromedriver

www/chromium/distinfo

@@ -1,7 +1,7 @@
-TIMESTAMP = 1559408741
-SHA256 (chromium-74.0.3729.169.tar.xz) = 070f0210017f54b65264f88726431da7582e36a04caa673fe50662e8b41a0cb4
-SIZE (chromium-74.0.3729.169.tar.xz) = 749495820
-SHA256 (chromium-74.0.3729.169-testdata.tar.xz) = b0799bd6f9854778397e8946b6e02ad409e5ad305547e8ee5cf8865f04e91945
-SIZE (chromium-74.0.3729.169-testdata.tar.xz) = 350168484
+TIMESTAMP = 1559766977
+SHA256 (chromium-75.0.3770.80.tar.xz) = da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6
+SIZE (chromium-75.0.3770.80.tar.xz) = 707985016
+SHA256 (chromium-75.0.3770.80-testdata.tar.xz) = baacaa2e67df853aa4c8550da5e533a6d5c41ad31c6bf2e9588364831791ba4a
+SIZE (chromium-75.0.3770.80-testdata.tar.xz) = 351066708
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040

www/chromium/files/extra-patch-clang

@@ -38,17 +38,6 @@
  
      EXPECT_CALL(callback_, OnError()).Times(2);
  
---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig	2019-03-11 22:01:15 UTC
-+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
-@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) 
-   std::vector<Task *>::iterator it;
-   it = std::remove(tasks_.begin(),
-                    tasks_.end(),
--                   reinterpret_cast<Task *>(NULL));
-+                   static_cast<Task *>(NULL));
- 
-   tasks_.erase(it, tasks_.end());
-   tasks_running_ = false;
 --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig	2019-03-11 22:08:03 UTC
 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
 @@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(

www/chromium/files/patch-BUILD.gn

@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2019-04-30 22:22:25 UTC
+--- BUILD.gn.orig	2019-06-04 18:55:14 UTC
 +++ BUILD.gn
-@@ -387,7 +387,7 @@ group("gn_all") {
+@@ -385,7 +385,7 @@ group("gn_all") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//third_party/breakpad:breakpad_unittests",
        "//third_party/breakpad:core-2-minidump",
-@@ -428,8 +428,6 @@ group("gn_all") {
+@@ -426,8 +426,6 @@ group("gn_all") {
        "//net:disk_cache_memory_test",
        "//net:quic_client",
        "//net:quic_server",
@@ -18,10 +18,10 @@
        "//testing:empty_main",
      ]
  
-@@ -486,10 +484,6 @@ group("gn_all") {
+@@ -482,10 +480,6 @@ group("gn_all") {
+         "//chrome/test:load_library_perf_tests",
+         "//chrome/test:sync_performance_tests",
          "//chrome/test/chromedriver:chromedriver",
-         "//chrome/test/chromedriver:chromedriver_tests",
-         "//components/sync:run_sync_testserver",
 -        "//courgette:courgette",
 -        "//courgette:courgette_fuzz",
 -        "//courgette:courgette_minimal_tool",
@@ -29,7 +29,7 @@
          "//media/cast:generate_barcode_video",
          "//media/cast:generate_timecode_audio",
          "//net:crash_cache",
-@@ -544,10 +538,6 @@ group("gn_all") {
+@@ -540,10 +534,6 @@ group("gn_all") {
        "//mojo:mojo_perftests",
        "//services/service_manager/public/cpp",
        "//testing/gmock:gmock_main",
@@ -40,7 +40,7 @@
      ]
  
      if (!is_android) {
-@@ -621,7 +611,7 @@ group("gn_all") {
+@@ -618,7 +608,7 @@ group("gn_all") {
          host_os == "win") {
        deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
      }
@@ -49,7 +49,15 @@
      deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -878,7 +868,6 @@ if (is_chromeos) {
+@@ -757,7 +747,6 @@ group("gn_all") {
+       "//chrome/browser/vr:vr_common_perftests",
+       "//chrome/browser/vr:vr_common_unittests",
+       "//chrome/browser/vr:vr_pixeltests",
+-      "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
+     ]
+     if (is_desktop_linux && use_ozone) {
+       deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
+@@ -876,7 +865,6 @@ if (is_chromeos) {
        "//ppapi/examples/video_decode",
        "//sandbox/linux:chrome_sandbox",
        "//sandbox/linux:sandbox_linux_unittests",
@@ -57,7 +65,7 @@
  
        # Blocked on https://github.com/catapult-project/catapult/issues/2297
        #"//third_party/catapult/telemetry:bitmaptools",
-@@ -1029,7 +1018,7 @@ if (!is_ios) {
+@@ -1029,7 +1017,7 @@ if (!is_ios) {
        ]
      }
  
@@ -66,7 +74,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1038,7 +1027,7 @@ if (!is_ios) {
+@@ -1038,7 +1026,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -75,7 +83,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1178,9 +1167,6 @@ group("chromium_builder_perf") {
+@@ -1181,9 +1169,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc

@@ -1,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2019-03-11 22:00:51 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2019-06-04 18:55:14 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
+@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
  gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
      const gfx::Rect& client_bounds) const {
    gfx::Rect window_bounds = client_bounds;

www/chromium/files/patch-base_BUILD.gn

@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2019-04-30 22:22:27 UTC
+--- base/BUILD.gn.orig	2019-06-04 18:55:15 UTC
 +++ base/BUILD.gn
-@@ -1188,7 +1188,7 @@ jumbo_component("base") {
+@@ -1234,7 +1234,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" ]
    }
-@@ -1214,7 +1214,7 @@ jumbo_component("base") {
+@@ -1260,7 +1260,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 += [
-@@ -1764,6 +1764,33 @@ jumbo_component("base") {
+@@ -1813,6 +1813,33 @@ jumbo_component("base") {
      }
    }
  
@@ -52,7 +52,7 @@
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -2840,6 +2867,12 @@ test("base_unittests") {
+@@ -2910,6 +2937,12 @@ test("base_unittests") {
      ]
      set_sources_assignment_filter(sources_assignment_filter)
    }

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-04-30 22:22:27 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2019-06-04 18:55:15 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
 @@ -14,7 +14,7 @@
  #if defined(OS_MACOSX)
@@ -9,30 +9,3 @@
  #include <sys/resource.h>
  
  #include <algorithm>
-@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
-   }
- }
- 
--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
- 
- // Multiple guarded memory regions may exceed the process address space limit.
- // This function will raise or lower the limit by |amount|.
-@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
- // schemes that reduce that to 4 GiB.
- constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32;  // 4 GiB
- 
--#endif  // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
- 
- void* SystemAllocPagesInternal(void* hint,
-                                size_t length,
-@@ -144,7 +144,7 @@ void SetSystemPagesAccessInternal(
- void FreePagesInternal(void* address, size_t length) {
-   CHECK(!munmap(address, length));
- 
--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
-   // Restore the address space limit.
-   if (length >= kMinimumGuardedMemorySize) {
-     CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));

www/chromium/files/patch-base_debug_debugger__posix.cc

@@ -1,6 +1,6 @@
---- base/debug/debugger_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/debug/debugger_posix.cc.orig	2019-06-04 18:55:15 UTC
 +++ base/debug/debugger_posix.cc
-@@ -86,7 +86,7 @@ bool BeingDebugged() {
+@@ -87,7 +87,7 @@ bool BeingDebugged() {
      KERN_PROC,
      KERN_PROC_PID,
      getpid()
@@ -9,7 +9,7 @@
      , sizeof(struct kinfo_proc),
      0
  #endif
-@@ -94,33 +94,35 @@ bool BeingDebugged() {
+@@ -95,33 +95,35 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.

www/chromium/files/patch-base_debug_elf__reader.cc

@@ -1,14 +1,14 @@
---- base/debug/elf_reader.cc.orig	2019-04-30 22:22:28 UTC
+--- base/debug/elf_reader.cc.orig	2019-06-04 18:55:15 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);
+@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
      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,
+@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
            break;
          }
        }

www/chromium/files/patch-base_files_file__util.h

@@ -1,6 +1,6 @@
---- base/files/file_util.h.orig	2019-04-30 22:22:28 UTC
+--- base/files/file_util.h.orig	2019-06-04 18:55:15 UTC
 +++ base/files/file_util.h
-@@ -449,7 +449,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -467,7 +467,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);
  

www/chromium/files/patch-base_files_file__util__posix.cc

@@ -1,7 +1,7 @@
---- base/files/file_util_posix.cc.orig	2019-03-17 21:31:57 UTC
+--- base/files/file_util_posix.cc.orig	2019-06-04 18:55:15 UTC
 +++ base/files/file_util_posix.cc
-@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path,
- #endif  // !defined(OS_NACL_NONSFI)
+@@ -419,7 +419,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd,
+ }
  
  bool CreateLocalNonBlockingPipe(int fds[2]) {
 -#if defined(OS_LINUX)

www/chromium/files/patch-base_files_memory__mapped__file__posix.cc

@@ -1,11 +0,0 @@
---- base/files/memory_mapped_file_posix.cc.orig	2019-03-11 22:00:51 UTC
-+++ base/files/memory_mapped_file_posix.cc
-@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory(
-       // Only Android API>=21 supports the fallocate call. Older versions need
-       // to manually extend the file by writing zeros at block intervals.
-       do_manual_extension = true;
-+#elif defined(OS_BSD)
-+      do_manual_extension = true;
- #elif defined(OS_MACOSX)
-       // MacOS doesn't support fallocate even though their new APFS filesystem
-       // does support sparse files. It does, however, have the functionality

www/chromium/files/patch-base_process_kill.h

@@ -1,6 +1,6 @@
---- base/process/kill.h.orig	2019-03-11 22:00:51 UTC
+--- base/process/kill.h.orig	2019-06-04 18:55:15 UTC
 +++ base/process/kill.h
-@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
      ProcessHandle handle, int* exit_code);
  
@@ -9,3 +9,8 @@
  // Spawns a thread to wait asynchronously for the child |process| to exit
  // and then reaps it.
  BASE_EXPORT void EnsureProcessGetsReaped(Process process);
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ #endif  // defined(OS_POSIX)
+ 
+ // Registers |process| to be asynchronously monitored for termination, forcibly

www/chromium/files/patch-base_process_kill__posix.cc

@@ -1,4 +1,4 @@
---- base/process/kill_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/process/kill_posix.cc.orig	2019-06-04 18:55:15 UTC
 +++ base/process/kill_posix.cc
 @@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) {
        0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
@@ -9,3 +9,12 @@
  void EnsureProcessGetsReaped(Process process) {
    DCHECK(!process.is_current());
  
+@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) {
+   PlatformThread::CreateNonJoinable(
+       0, new BackgroundReaper(std::move(process), TimeDelta()));
+ }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #endif  // !defined(OS_MACOSX)
+ #endif  // !defined(OS_NACL_NONSFI)

www/chromium/files/patch-base_process_launch.h

@@ -1,15 +1,15 @@
---- base/process/launch.h.orig	2019-04-30 22:22:28 UTC
+--- base/process/launch.h.orig	2019-06-04 18:55:15 UTC
 +++ base/process/launch.h
-@@ -179,7 +179,7 @@ struct BASE_EXPORT LaunchOptions {
-   FileHandleMappingVector fds_to_remap;
- #endif  // defined(OS_WIN)
+@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions {
+   bool clear_environment = false;
+ #endif  // OS_WIN || OS_POSIX || OS_FUCHSIA
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // 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
-@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions {
  
    // Sets parent process death signal to SIGKILL.
    bool kill_on_parent_death = false;

www/chromium/files/patch-base_process_launch__posix.cc

@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig	2019-03-11 22:00:51 UTC
+--- base/process/launch_posix.cc.orig	2019-06-04 18:55:15 UTC
 +++ base/process/launch_posix.cc
-@@ -64,6 +64,7 @@
+@@ -65,6 +65,7 @@
  #error "macOS should use launch_mac.cc"
  #endif
  

www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc

@@ -0,0 +1,24 @@
+--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig	2019-06-04 18:55:15 UTC
++++ base/sampling_heap_profiler/sampling_heap_profiler.cc
+@@ -30,6 +30,10 @@
+ #include <sys/prctl.h>
+ #endif
+ 
++#if defined(OS_BSD)
++#include <pthread_np.h>
++#endif
++
+ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
+     defined(OFFICIAL_BUILD)
+ #include "base/trace_event/cfi_backtrace_android.h"
+@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() {
+ #elif defined(OS_MACOSX)
+   int err = pthread_getname_np(pthread_self(), name, kBufferLen);
+   if (err == 0 && *name != '\0')
++    return strdup(name);
++#elif defined(OS_BSD)
++  pthread_get_name_np(pthread_self(), name, kBufferLen);
++  if (*name != '\0')
+     return strdup(name);
+ #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
+ 

www/chromium/files/patch-base_system_sys__info.h

@@ -0,0 +1,11 @@
+--- base/system/sys_info.h.orig	2019-06-04 18:55:15 UTC
++++ base/system/sys_info.h
+@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
+   static bool IsLowEndDeviceImpl();
+   static HardwareInfo GetHardwareInfoSync();
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
+   static int64_t AmountOfAvailablePhysicalMemory(
+       const SystemMemoryInfoKB& meminfo);
+ #endif

www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc

@@ -1,12 +0,0 @@
---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig	2019-03-11 22:00:51 UTC
-+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
-@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo
-   EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
- }
- 
-+#if defined(OS_BSD)
-+#define ThreadNamesSet DISABLED_ThreadNamesSet
-+#endif
- TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) {
-   constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT,
-                                      TaskShutdownBehavior::BLOCK_SHUTDOWN};

www/chromium/files/patch-build_config_BUILD.gn

@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig	2019-04-30 22:22:28 UTC
+--- build/config/BUILD.gn.orig	2019-06-04 18:55:15 UTC
 +++ build/config/BUILD.gn
-@@ -162,7 +162,7 @@ config("debug") {
+@@ -163,7 +163,7 @@ config("debug") {
        # builds, and we have to tell it to turn it off.
        defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
      }
@@ -9,7 +9,7 @@
      # Enable libstdc++ debugging facilities to help catch problems early, see
      # http://crbug.com/65151 .
      # TODO(phajdan.jr): Should we enable this for all of POSIX?
-@@ -263,9 +263,7 @@ config("default_libs") {
+@@ -264,9 +264,7 @@ config("default_libs") {
      ]
    } else if (is_linux) {
      libs = [
@@ -19,7 +19,7 @@
      ]
    }
  }
-@@ -346,7 +344,7 @@ config("executable_config") {
+@@ -354,7 +352,7 @@ config("executable_config") {
        "//build/config/ios:ios_dynamic_flags",
        "//build/config/ios:ios_executable_flags",
      ]

www/chromium/files/patch-build_config_BUILDCONFIG.gn

@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig	2019-03-11 22:00:52 UTC
+--- build/config/BUILDCONFIG.gn.orig	2019-06-04 18:55:15 UTC
 +++ build/config/BUILDCONFIG.gn
 @@ -131,10 +131,10 @@ declare_args() {
    is_official_build = false
@@ -33,7 +33,7 @@
    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
    if (is_clang) {
      _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -291,10 +291,11 @@ is_android = current_os == "android"
+@@ -288,10 +288,11 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"

www/chromium/files/patch-build_config_compiler_BUILD.gn

@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig	2019-04-30 22:22:28 UTC
+--- build/config/compiler/BUILD.gn.orig	2019-06-04 18:55:15 UTC
 +++ build/config/compiler/BUILD.gn
 @@ -54,7 +54,7 @@ declare_args() {
    # only two architectures that are currently checked in). Turn this off when
@@ -9,7 +9,7 @@
        (current_cpu == "x64" || current_cpu == "x86")
    binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
                                root_build_dir)
-@@ -279,7 +279,7 @@ config("compiler") {
+@@ -269,7 +269,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
-@@ -381,7 +381,7 @@ config("compiler") {
+@@ -363,7 +363,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,16 +27,16 @@
        ldflags += [
          "-Wl,-z,defs",
          "-Wl,--as-needed",
-@@ -489,7 +489,7 @@ config("compiler") {
+@@ -471,7 +471,7 @@ config("compiler") {
      }
    }
  
 -  if (is_clang && !is_nacl && !use_xcode_clang) {
 +  if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) {
-     cflags += [
-       # TODO(hans): Remove this once Clang generates better optimized debug info
-       # by default. https://crbug.com/765793
-@@ -757,7 +757,7 @@ config("compiler_cpu_abi") {
+     cflags += [ "-fcrash-diagnostics-dir=" +
+                 rebase_path("//tools/clang/crashreports", root_build_dir) ]
+ 
+@@ -740,7 +740,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -45,7 +45,16 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1507,7 +1507,7 @@ config("default_warnings") {
+@@ -1174,7 +1174,7 @@ config("assembler_debug_dir") {
+   # TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move
+   # this behind the -fdebug-compilation-dir cflags in the "compiler" config.
+   if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) {
+-    if (!is_win) {
++    if (!is_win && !is_bsd) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+     }
+@@ -1490,7 +1490,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -54,7 +63,7 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1707,7 +1707,7 @@ config("thin_archive") {
+@@ -1699,7 +1699,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,16 +72,16 @@
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -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) {
--        cflags += [ "-g2" ]
-+        cflags += [ "-g0" ]
-       }
+@@ -2286,7 +2286,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) {
+-      cflags += [ "-g2" ]
++      cflags += [ "-g0" ]
      }
+ 
      if (use_debug_fission && !is_nacl && !is_android) {
-@@ -2312,7 +2312,7 @@ config("symbols") {
+@@ -2307,7 +2307,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" &&

www/chromium/files/patch-build_config_features.gni

@@ -1,6 +1,6 @@
---- build/config/features.gni.orig	2019-03-11 22:00:52 UTC
+--- build/config/features.gni.orig	2019-06-04 18:55:15 UTC
 +++ build/config/features.gni
-@@ -41,7 +41,7 @@ declare_args() {
+@@ -45,7 +45,7 @@ declare_args() {
    }
  
    # libudev usage. This currently only affects the content layer.

www/chromium/files/patch-build_toolchain_gcc__toolchain.gni

@@ -1,8 +1,8 @@
---- build/toolchain/gcc_toolchain.gni.orig	2019-04-30 22:22:28 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2019-06-04 18:55:15 UTC
 +++ build/toolchain/gcc_toolchain.gni
-@@ -44,6 +44,11 @@ analyzer_wrapper =
-     rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
-                 root_build_dir) + " --mode=clang"
+@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") {
+   enable_resource_whitelist_generation = false
+ }
  
 +declare_args() {
 +  extra_cxxflags = ""
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -636,13 +641,23 @@ template("clang_toolchain") {
+@@ -617,13 +622,23 @@ template("clang_toolchain") {
    }
  
    gcc_toolchain(target_name) {

www/chromium/files/patch-build_toolchain_get__concurrent__links.py

@@ -1,6 +1,6 @@
---- build/toolchain/get_concurrent_links.py.orig	2019-03-11 22:00:52 UTC
+--- build/toolchain/get_concurrent_links.py.orig	2019-06-04 18:55:15 UTC
 +++ build/toolchain/get_concurrent_links.py
-@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes():
+@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes():
        return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
      except Exception:
        return 0

www/chromium/files/patch-cc_BUILD.gn

@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig	2019-04-30 22:22:28 UTC
+--- cc/BUILD.gn.orig	2019-06-04 18:55:15 UTC
 +++ cc/BUILD.gn
-@@ -554,7 +554,7 @@ cc_test_static_library("test_support") {
+@@ -562,7 +562,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,7 +9,7 @@
      data_deps = [
        "//third_party/mesa_headers",
      ]
-@@ -753,9 +753,6 @@ cc_test("cc_unittests") {
+@@ -762,9 +762,6 @@ cc_test("cc_unittests") {
      "//ui/gfx/geometry",
      "//ui/gl",
      "//ui/gl:test_support",

www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc

@@ -0,0 +1,11 @@
+--- cc/scheduler/compositor_frame_reporting_controller.cc.orig	2019-06-04 18:55:15 UTC
++++ cc/scheduler/compositor_frame_reporting_controller.cc
+@@ -31,8 +31,6 @@ void CompositorFrameReportingController::WillBeginImpl
+ 
+ void CompositorFrameReportingController::WillBeginMainFrame() {
+   DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
+-  DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
+-            reporters_[PipelineStage::kBeginImplFrame]);
+   reporters_[PipelineStage::kBeginImplFrame]->StartStage(
+       "SendBeginMainFrameToCommit");
+   AdvanceReporterStage(PipelineStage::kBeginImplFrame,

www/chromium/files/patch-cc_trees_property__tree.cc

@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2019-04-30 22:22:29 UTC
+--- cc/trees/property_tree.cc.orig	2019-06-04 18:55:15 UTC
 +++ cc/trees/property_tree.cc
-@@ -1329,13 +1329,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
  

www/chromium/files/patch-chrome_app_chrome__main__delegate.cc

@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2019-04-30 22:22:30 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -101,7 +101,7 @@
+@@ -100,7 +100,7 @@
  #include "chrome/app/shutdown_signal_handlers_posix.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "base/environment.h"
  #endif
  
-@@ -238,7 +238,7 @@ bool UseHooks() {
+@@ -240,7 +240,7 @@ bool UseHooks() {
  
  #endif  // defined(OS_WIN)
  
@@ -27,7 +27,7 @@
  void AdjustLinuxOOMScore(const std::string& process_type) {
    // Browsers and zygotes should still be killable, but killed last.
    const int kZygoteScore = 0;
-@@ -297,7 +297,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -299,7 +299,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.
-@@ -342,7 +342,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -344,7 +344,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) ||
-@@ -352,7 +352,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
+@@ -354,7 +354,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) {
-@@ -406,7 +406,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -63,7 +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.
-@@ -418,7 +418,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_
        user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
      }
    }
@@ -72,7 +72,7 @@
  #if defined(OS_MACOSX)
    policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
  #endif  // OS_MAC
-@@ -475,7 +475,7 @@ void InitLogging(const std::string& process_type) {
+@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) {
  void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) {
    if (!exe_entry_point_ticks.is_null())
      startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks);
@@ -81,7 +81,7 @@
    // Record the startup process creation time on supported platforms.
    startup_metric_utils::RecordStartupProcessCreationTime(
        base::Process::Current().CreationTime());
-@@ -613,7 +613,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -619,7 +619,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
-@@ -637,7 +637,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
  #if defined(OS_CHROMEOS)
    chromeos::RegisterPathProvider();
  #endif
@@ -99,7 +99,7 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -953,7 +953,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -965,7 +965,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)
-@@ -968,7 +968,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -980,7 +980,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.
-@@ -978,7 +978,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -990,7 +990,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.

www/chromium/files/patch-chrome_app_chromium__strings.grd

@@ -1,15 +1,15 @@
---- chrome/app/chromium_strings.grd.orig	2019-04-30 22:22:30 UTC
+--- chrome/app/chromium_strings.grd.orig	2019-06-04 18:55:16 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like
+@@ -710,7 +710,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">
+         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
            Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
          </message>
-@@ -816,7 +816,7 @@ Signing in anyway will merge Chromium information like
+@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like
        </message>
  
        <!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
          </message>
-@@ -1064,7 +1064,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1098,7 +1098,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
        </message>
  
        <!-- Plugin Placeholders -->

www/chromium/files/patch-chrome_app_generated__resources.grd

@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig	2019-04-30 22:22:30 UTC
+--- chrome/app/generated_resources.grd.orig	2019-06-04 18:55:16 UTC
 +++ chrome/app/generated_resources.grd
-@@ -4737,7 +4737,7 @@ Keep your key file in a safe place. You will need it t
+@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t
        </if>
  
        <!-- chrome://browser-switch strings -->
@@ -9,7 +9,7 @@
          <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
            Legacy Browser Support
          </message>
-@@ -6228,7 +6228,7 @@ the Bookmarks menu.">
+@@ -6304,7 +6304,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>
-@@ -7012,7 +7012,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh
          Set as default
        </message>
  

www/chromium/files/patch-chrome_app_google__chrome__strings.grd

@@ -1,15 +1,15 @@
---- chrome/app/google_chrome_strings.grd.orig	2019-04-30 22:22:30 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2019-06-04 18:55:16 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -701,7 +701,7 @@ Signing in anyway will merge Chrome information like b
+@@ -722,7 +722,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">
+         <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
            Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
          </message>
-@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b
+@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b
        </message>
  
        <!-- ProcessSingleton -->
@@ -18,7 +18,7 @@
          <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
            The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
          </message>
-@@ -1082,7 +1082,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
+@@ -1117,7 +1117,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
        </message>
  
        <!-- Plugin Placeholders -->

www/chromium/files/patch-chrome_app_settings__strings.grdp

@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig	2019-04-30 22:22:32 UTC
+--- chrome/app/settings_strings.grdp.orig	2019-06-04 18:55:16 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -628,7 +628,7 @@
+@@ -634,7 +634,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>
-@@ -642,7 +642,7 @@
+@@ -648,7 +648,7 @@
        Use Classic
      </message>
    </if>

www/chromium/files/patch-chrome_browser_about__flags.cc

@@ -1,9 +1,9 @@
---- chrome/browser/about_flags.cc.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/about_flags.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/about_flags.cc
-@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = {
-      SINGLE_VALUE_TYPE(
-          spellcheck::switches::kEnableSpellingFeedbackFieldTrial)},
- #endif  // ENABLE_SPELLCHECK
+@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCloudPrintXpsDescription, kOsWin,
+      SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
+ #endif  // OS_WIN
 -#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",
@@ -16,7 +16,16 @@
      {"enable-webgl-draft-extensions",
       flag_descriptions::kWebglDraftExtensionsName,
       flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
-@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableDataSaverLiteModeRebrandName,
+      flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll,
+      FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)},
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+     {"enable-save-data", flag_descriptions::kEnableSaveDataName,
+      flag_descriptions::kEnableSaveDataDescription, kOsCrOS,
+      SINGLE_VALUE_TYPE(
+@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -28,10 +37,10 @@
                                 switches::kDisableInputImeAPI)},
 -#endif  // OS_WIN || OS_LINUX
 +#endif  // OS_WIN || OS_LINUX || OS_BSD
-     {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
-      flag_descriptions::kOriginTrialsDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-brotli", flag_descriptions::kEnableBrotliName,
+      flag_descriptions::kEnableBrotliDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kBrotliEncoding)},
+@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)},
  #endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
  #endif  // OS_ANDROID
@@ -46,16 +55,16 @@
      {"enable-experimental-accessibility-features",
       flag_descriptions::kExperimentalAccessibilityFeaturesName,
       flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS,
-@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll,
-      FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)},
+@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)},
  
 -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
      {"omnibox-experimental-keyword-mode",
       flag_descriptions::kOmniboxExperimentalKeywordModeName,
       flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOmniboxDeduplicateDriveUrlsName,
       flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)},
@@ -64,7 +73,7 @@
  
      {"enable-speculative-service-worker-start-on-query-input",
       flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
-@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kClickToOpenPDFDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)},
  
@@ -73,16 +82,16 @@
      {"direct-manipulation-stylus",
       flag_descriptions::kDirectManipulationStylusName,
       flag_descriptions::kDirectManipulationStylusDescription,
-@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription,
-      kOsWin | kOsMac | kOsLinux,
-      FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)},
+@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kShowManagedUiDescription,
+      kOsWin | kOsMac | kOsLinux | kOsCrOS,
+      FEATURE_VALUE_TYPE(features::kShowManagedUi)},
 -#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)
      {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName,
-@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)},
  #endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
  
@@ -91,7 +100,7 @@
      {"autofill-always-show-server-cards-in-sync-transport",
       flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName,
       flag_descriptions::
-@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsMac | kOsWin | kOsLinux,
       FEATURE_VALUE_TYPE(
           autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)},
@@ -100,7 +109,7 @@
  
  #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
      {"enable-custom-mac-paper-sizes",
-@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)},
  #endif  // OS_CHROMEOS
  

www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc

@@ -1,6 +1,6 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -59,7 +59,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
        return metrics::OmniboxInputType::QUERY;
  
      case ExternalProtocolHandler::UNKNOWN: {
@@ -9,3 +9,9 @@
        // Linux impl of GetApplicationNameForProtocol doesn't distinguish
        // between URL schemes with handers and those without. This will
        // make the default behaviour be search on Linux.
+       return metrics::OmniboxInputType::INVALID;
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+       // If block state is unknown, check if there is an application registered
+       // for the url scheme.
+       GURL url(scheme + "://");

www/chromium/files/patch-chrome_browser_browser__resources.grd

@@ -1,6 +1,6 @@
---- chrome/browser/browser_resources.grd.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/browser_resources.grd.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -81,7 +81,7 @@
+@@ -77,7 +77,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>
@@ -9,7 +9,7 @@
          <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 @@
+@@ -690,7 +690,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" />

www/chromium/files/patch-chrome_browser_chrome__browser__main.cc

@@ -1,15 +1,18 @@
---- chrome/browser/chrome_browser_main.cc.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -219,7 +219,7 @@
+@@ -218,9 +218,9 @@
  #include "components/arc/metrics/stability_metrics_manager.h"
  #endif  // defined(OS_CHROMEOS)
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  #include "chrome/browser/first_run/upgrade_util_linux.h"
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  
-@@ -259,7 +259,7 @@
+ #if defined(OS_LINUX)
+ #include "components/crash/content/app/breakpad_linux.h"
+@@ -258,7 +258,7 @@
  #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -18,7 +21,7 @@
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #endif
  
-@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
      }
  
@@ -27,7 +30,7 @@
      // Create directory for user-level Native Messaging manifest files. This
      // makes it less likely that the directory will be created by third-party
      // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1058,14 +1058,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
                                   &user_native_messaging_dir));
      if (!base::PathExists(user_native_messaging_dir))
        base::CreateDirectory(user_native_messaging_dir);
@@ -45,7 +48,7 @@
  
  #if defined(OS_MACOSX)
    // Get the Keychain API to register for distributed notifications on the main
-@@ -1093,7 +1093,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
    }
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -54,7 +57,7 @@
    metrics::DesktopSessionDurationTracker::Initialize();
  #endif
    metrics::RendererUptimeTracker::Initialize();
-@@ -1266,6 +1266,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
        base::TimeDelta::FromMinutes(1));
  
  #if !defined(OS_ANDROID)
@@ -62,7 +65,7 @@
    if (base::FeatureList::IsEnabled(features::kWebUsb)) {
      web_usb_detector_.reset(new WebUsbDetector());
      BrowserThread::PostAfterStartupTask(
-@@ -1274,6 +1275,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
          base::BindOnce(&WebUsbDetector::Initialize,
                         base::Unretained(web_usb_detector_.get())));
    }

www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
+@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -13,10 +13,10 @@
  void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
 -#if !defined(OS_CHROMEOS)
 +#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   bluez::BluezDBusThreadManager::Initialize();
-   bluez::BluezDBusManager::Initialize();
+   bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
  #endif
-@@ -105,7 +107,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
+ 
+@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {

www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc

@@ -1,6 +1,15 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
+     // ExitHandler takes care of deleting itself.
+     new ExitHandler();
+   } else {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+     switch (signal) {
+       case SIGINT:
+       case SIGHUP:
+@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
  void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
  #if defined(OS_CHROMEOS)
    NOTREACHED();  // Should not ever happen on ChromeOS.

www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -411,7 +411,7 @@
+@@ -418,7 +418,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,16 +9,16 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "base/android/application_status_listener.h"
-@@ -457,7 +457,7 @@
- #include "components/services/patch/public/interfaces/constants.mojom.h"
- #endif
+@@ -467,7 +467,7 @@
+ #endif  //  !defined(OS_ANDROID)
  
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
  #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
  #endif
-@@ -474,7 +474,7 @@
+ 
+@@ -493,7 +493,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -27,16 +27,16 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -1170,7 +1170,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
  #elif defined(OS_CHROMEOS)
-   main_parts = new chromeos::ChromeBrowserMainPartsChromeos(
-       parameters, chrome_feature_list_creator_);
+   main_parts =
+       new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
-   main_parts =
-       new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_);
+   main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_);
  #elif defined(OS_ANDROID)
-@@ -1190,7 +1190,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
+   main_parts = new ChromeBrowserMainPartsAndroid(parameters, startup_data_);
+@@ -1213,7 +1213,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
    // Construct additional browser parts. Stages are called in the order in
    // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -45,7 +45,7 @@
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  #else
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1994,7 +1994,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2034,7 +2034,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -54,7 +54,7 @@
  #if defined(OS_ANDROID)
    bool enable_crash_reporter = true;
  #else
-@@ -3529,7 +3529,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -63,21 +63,21 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -4281,7 +4281,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
-             handle));
+@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
    }
  
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle =
        browser_switcher::BrowserSwitcherNavigationThrottle ::
-@@ -5115,7 +5115,7 @@ std::unique_ptr<content::OverlayWindow>
+           MaybeCreateThrottleFor(handle);
+@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco
+ std::unique_ptr<content::OverlayWindow>
  ChromeContentBrowserClient::CreateWindowForPictureInPicture(
      content::PictureInPictureWindowController* controller) {
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
--    defined(OS_CHROMEOS)
-+    defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_CHROMEOS)
    // Note: content::OverlayWindow::Create() is defined by platform-specific
    // implementation in chrome/browser/ui/views. This layering hack, which goes
-   // through //content and ContentBrowserClient, allows us to work around the

www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2019-04-30 22:22:32 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2019-06-04 18:55:16 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -368,12 +368,12 @@ class ChromeContentBrowserClient : public content::Con
+@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con
    void OverridePageVisibilityState(
        content::RenderFrameHost* render_frame_host,
        content::PageVisibilityState* visibility_state) override;

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-04-30 22:22:33 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1234,7 +1234,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1228,7 +1228,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
-@@ -1254,7 +1254,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {

www/chromium/files/patch-chrome_browser_download_download__prefs.cc

@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/download/download_prefs.cc
 @@ -62,7 +62,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
@@ -18,7 +18,7 @@
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -257,7 +257,7 @@ void DownloadPrefs::RegisterProfilePrefs(
                                   default_download_path);
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);

www/chromium/files/patch-chrome_browser_download_download__prefs.h

@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.h.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/download/download_prefs.h.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/download/download_prefs.h
-@@ -104,7 +104,7 @@ class DownloadPrefs {
+@@ -102,7 +102,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);
-@@ -148,7 +148,7 @@ class DownloadPrefs {
+@@ -150,7 +150,7 @@ class DownloadPrefs {
                     AutoOpenCompareFunctor> AutoOpenSet;
    AutoOpenSet auto_open_;
  

www/chromium/files/patch-chrome_browser_extensions_BUILD.gn

@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1116,6 +1116,12 @@ jumbo_static_library("extensions") {
+@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") {
      deps += [ "//chrome/common:service_process_mojom" ]
    }
  

www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc

@@ -1,9 +1,9 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
 @@ -53,7 +53,11 @@
+ #include "extensions/browser/extensions_browser_client.h"
  #include "extensions/common/extension.h"
  #include "extensions/common/extension_messages.h"
- #include "extensions/common/one_shot_event.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else

www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc

@@ -0,0 +1,43 @@
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
+@@ -29,7 +29,7 @@
+ #include "extensions/browser/process_manager.h"
+ #include "extensions/common/error_utils.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "extensions/common/permissions/permissions_data.h"
+ #endif
+ 
+@@ -38,7 +38,7 @@ namespace {
+ bool CanEnableAudioDebugRecordingsFromExtension(
+     const extensions::Extension* extension) {
+   bool enabled_by_permissions = false;
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   if (extension) {
+     enabled_by_permissions =
+         extension->permissions_data()->active_permissions().HasAPIPermission(
+@@ -609,7 +609,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+ }
+ 
+ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() {
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
+   // this function shouldn't be called by a component extension on behalf of
+   // some web code. It returns a DirectoryEntry for use directly in the calling
+@@ -633,11 +633,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run
+           &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback,
+           this));
+   return true;
+-#else   // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#else   // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   SetError("Not supported on the current OS");
+   SendResponse(false);
+   return false;
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ }
+ 
+ void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback(

www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc

@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/bookmark_app_extension_util.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/extensions/bookmark_app_extension_util.cc
+@@ -34,7 +34,7 @@ namespace {
+ 
+ #if !defined(OS_CHROMEOS)
+ bool CanOsAddDesktopShortcuts() {
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   return true;
+ #else
+   return false;

www/chromium/files/patch-chrome_browser_flag__descriptions.cc

@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -3524,21 +3524,21 @@ extern const char kAshNotificationStackingBarRedesignD
+@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] =
  
  // Random platform combinations -----------------------------------------------
  
@@ -24,12 +24,6 @@
 -#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)
- 
-@@ -3551,13 +3551,13 @@ const char kAutomaticTabDiscardingDescription[] =
- 
- #endif  // defined(OS_WIN) || defined(OS_MACOSX)
- 
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  

www/chromium/files/patch-chrome_browser_flag__descriptions.h

@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2019-04-30 22:22:33 UTC
+--- chrome/browser/flag_descriptions.h.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -2100,19 +2100,19 @@ extern const char kAshNotificationStackingBarRedesignD
+@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[];
  
  // Random platform combinations -----------------------------------------------
  
@@ -22,12 +22,6 @@
 -#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[];
-@@ -2124,12 +2124,12 @@ extern const char kAutomaticTabDiscardingDescription[]
- 
- #endif  // defined(OS_WIN) || defined(OS_MACOSX)
- 
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
  

www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc

@@ -1,8 +1,8 @@
---- chrome/browser/metrics/bluetooth_available_utility.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/metrics/bluetooth_available_utility.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/metrics/bluetooth_available_utility.cc
-@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() {
-   if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported())
-     ReportAvailability(BLUETOOTH_NOT_SUPPORTED);
+@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() {
+     return;
+   }
  
 +#if !defined(OS_BSD)
    device::BluetoothAdapterFactory::Get().GetAdapter(

www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc

@@ -0,0 +1,11 @@
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/metrics/chrome_metrics_service_client.cc
+@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+   }
+ #endif
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // This creates the DesktopProfileSessionDurationsServices if it didn't exist
+   // already.
+   metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(

www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc

@@ -0,0 +1,20 @@
+--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/metrics/process_memory_metrics_emitter.cc
+@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+ 
+   builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024);
+   builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024);
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb /
+                                    1024);
+ #endif
+@@ -382,7 +382,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc
+   MEMORY_METRICS_HISTOGRAM_MB(
+       std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint",
+       pmd.os_dump().shared_footprint_kb / 1024);
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   MEMORY_METRICS_HISTOGRAM_MB(
+       std::string(UMA_PREFIX) + process_name + ".PrivateSwapFootprint",
+       pmd.os_dump().private_footprint_swap_kb / 1024);

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-04-30 22:22:34 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -70,12 +70,12 @@
+@@ -72,12 +72,12 @@
  #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
  #endif  // defined(OS_CHROMEOS)
  
@@ -15,7 +15,46 @@
  
  namespace {
  
-@@ -535,7 +535,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+   auth_dynamic_params->enable_negotiate_port =
+       local_state->GetBoolean(prefs::kEnableAuthNegotiatePort);
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   auth_dynamic_params->delegate_by_kdc_policy =
+       local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ #if defined(OS_POSIX)
+   auth_dynamic_params->ntlm_v2_enabled =
+@@ -433,10 +433,10 @@ SystemNetworkContextManager::SystemNetworkContextManag
+   pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort,
+                              auth_pref_callback);
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
+                              auth_pref_callback);
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ #if defined(OS_POSIX)
+   pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback);
+@@ -481,10 +481,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+   registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string());
+   registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist,
+                                std::string());
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
+                                 false);
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ 
+ #if defined(OS_POSIX)
+   registry->RegisterBooleanPref(
+@@ -532,7 +532,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    content::GetNetworkService()->ConfigureStubHostResolver(
        stub_resolver_enabled, std::move(dns_over_https_servers));
  

www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc

@@ -0,0 +1,20 @@
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/notifications/notification_display_service_impl.cc
+@@ -31,7 +31,7 @@
+ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h"
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
+ #endif
+ 
+@@ -121,7 +121,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer
+     AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT,
+                            std::make_unique<PersistentNotificationHandler>());
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+     AddNotificationHandler(
+         NotificationHandler::Type::SEND_TAB_TO_SELF,
+         std::make_unique<send_tab_to_self::DesktopNotificationHandler>(

www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc

@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -80,7 +80,11 @@
+@@ -81,7 +81,11 @@
  #include "net/cert/cert_status_flags.h"
  #include "services/identity/public/cpp/identity_manager.h"
  #include "services/metrics/public/cpp/ukm_recorder.h"
@@ -11,4 +11,4 @@
 +#endif
  #include "url/url_constants.h"
  
- #if defined(SAFE_BROWSING_DB_LOCAL)
+ #if defined(FULL_SAFE_BROWSING)

www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc

@@ -1,11 +1,11 @@
---- chrome/browser/password_manager/password_store_factory.cc.orig	2019-04-30 22:22:34 UTC
+--- chrome/browser/password_manager/password_store_factory.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/password_manager/password_store_factory.cc
-@@ -301,7 +301,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
-   password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60,
+@@ -302,7 +302,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
                                                    network_context_getter);
  
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
-     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
        std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
+           profile);

www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc

@@ -0,0 +1,38 @@
+--- chrome/browser/performance_monitor/process_metrics_history.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/performance_monitor/process_metrics_history.cc
+@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() {
+ #if defined(OS_WIN)
+   disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond();
+ #endif
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+   idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond();
+ #endif
+ #if defined(OS_MACOSX)
+@@ -87,7 +87,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+           kDiskUsageHistogramMin, kDiskUsageHistogramMax,
+           kDiskUsageHistogramBucketCount);
+ #endif
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+       UMA_HISTOGRAM_COUNTS_10000(
+           "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_);
+ #endif
+@@ -105,7 +105,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+         UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess",
+                               true);
+       }
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+       UMA_HISTOGRAM_COUNTS_10000(
+           "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_);
+ #endif
+@@ -122,7 +122,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() {
+                                   kHistogramBucketCount);
+       if (cpu_usage_ > kHighCPUUtilizationThreshold)
+         UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true);
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+       UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess",
+                                  idle_wakeups_);
+ #endif

www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h

@@ -0,0 +1,11 @@
+--- chrome/browser/performance_monitor/process_metrics_history.h.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/performance_monitor/process_metrics_history.h
+@@ -72,7 +72,7 @@ class ProcessMetricsHistory {
+   uint64_t disk_usage_ = 0;
+ #endif
+ 
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+   int idle_wakeups_ = 0;
+ #endif
+ #if defined(OS_MACOSX)

www/chromium/files/patch-chrome_browser_platform__util.h

@@ -1,6 +1,6 @@
---- chrome/browser/platform_util.h.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/platform_util.h.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/platform_util.h
-@@ -40,7 +40,7 @@ enum OpenOperationResult {
+@@ -41,7 +41,7 @@ enum OpenOperationResult {
  enum OpenItemType {
    OPEN_FILE,
    OPEN_FOLDER,

www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc

@@ -0,0 +1,11 @@
+--- chrome/browser/plugins/plugin_info_host_impl.cc.orig	2019-06-04 18:55:17 UTC
++++ chrome/browser/plugins/plugin_info_host_impl.cc
+@@ -411,7 +411,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone(
+     std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) {
+   if (cus_plugin_info) {
+     output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     if (cus_plugin_info->version != base::Version("0")) {
+       output->status = chrome::mojom::PluginStatus::kRestartRequired;
+     }

www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc

@@ -1,6 +1,6 @@
---- 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.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
  #include "chrome/browser/policy/browser_signin_policy_handler.h"
  #endif
  
@@ -9,7 +9,7 @@
      (defined(OS_LINUX) && !defined(OS_CHROMEOS))
  #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
  #endif
-@@ -962,7 +962,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kAllowPopupsDuringPageUnload,
      base::Value::Type::BOOLEAN },
  

www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc

@@ -1,20 +0,0 @@
---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig	2019-03-11 22:00:53 UTC
-+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc
-@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() {
- #endif
- }
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- void CleanupUnusedPolicyDirectory() {
-   std::string enrollment_token =
-       BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken();
-@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan
- void MachineLevelUserCloudPolicyController::Init(
-     PrefService* local_state,
-     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-   // This is a function that removes the directory we accidentally create due to
-   // crbug.com/880870. The directory is only removed when it's empty and
-   // enrollment token doesn't exist. This function is expected to be removed

www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc

@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -185,6 +185,8 @@ class PolicyTestCase {
+@@ -183,6 +183,8 @@ class PolicyTestCase {
      const std::string os("chromeos");
  #elif defined(OS_LINUX)
      const std::string os("linux");

www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc

@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2019-04-30 22:22:34 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -331,7 +331,7 @@
+@@ -332,7 +332,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
-@@ -802,7 +802,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
    safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
  #endif
  

www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc

@@ -1,6 +1,6 @@
---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2019-03-11 22:00:53 UTC
+--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
-@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -183,7 +183,7 @@ const char* const kPersistentPrefNames[] = {
      prefs::kShowFullscreenToolbar,
  #endif
  

www/chromium/files/patch-chrome_browser_process__singleton__posix.cc

@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig	2019-04-30 22:22:34 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/process_singleton_posix.cc
-@@ -93,11 +93,11 @@
+@@ -94,11 +94,11 @@
  #include "net/base/network_interfaces.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -14,7 +14,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -324,7 +324,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -325,7 +325,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);
-@@ -903,7 +903,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+@@ -901,7 +901,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
      SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
      return PROCESS_NONE;
    } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {

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-04-30 22:22:34 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -325,7 +325,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !defined(OS_ANDROID)
    MediaGalleriesPreferencesFactory::GetInstance();
  #endif

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-04-30 22:22:34 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1500,7 +1500,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1531,7 +1531,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,
-@@ -1542,7 +1542,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1573,7 +1573,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
-@@ -1816,7 +1816,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
      case IDC_CHECK_SPELLING_WHILE_TYPING:
        return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable);
  

www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc

@@ -1,4 +1,4 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2019-04-30 22:22:34 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2019-06-04 18:55:17 UTC
 +++ chrome/browser/renderer_preferences_util.cc
 @@ -29,7 +29,7 @@
  #include "ui/base/cocoa/defaults_utils.h"
@@ -25,5 +25,5 @@
 -#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
+ 

www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc

@@ -1,8 +1,8 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
 @@ -8,7 +8,12 @@
  
- #include "base/hash.h"
+ #include "base/hash/hash.h"
  #include "base/logging.h"
 +//XXX(rene) needs shim headers?
 +#if defined(USE_SYSTEM_PROTOBUF)

www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc

@@ -0,0 +1,20 @@
+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2019-06-07 20:47:39 UTC
++++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
+@@ -11,7 +11,7 @@
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
+ #endif
+ 
+@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
+ // Instantiates all the handlers relevant to this platform.
+ void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers(
+     Profile* profile) {
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+   applicable_handlers_.push_back(
+       std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile));
+ #elif defined(OS_ANDROID)

www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc

@@ -0,0 +1,11 @@
+--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig	2019-06-04 18:55:18 UTC
++++ chrome/browser/ssl/captive_portal_blocking_page.cc
+@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
+   wifi_service->GetConnectedNetworkSSID(&ssid, &error);
+   if (!error.empty())
+     return std::string();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   ssid = net::GetWifiSSID();
+ #elif defined(OS_ANDROID)
+   ssid = net::android::GetWifiSSID();

www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ssl/ssl_error_controller_client.cc
-@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() {
+@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() {
  #if defined(OS_ANDROID)
    chrome::android::OpenDateAndTimeSettings();
  
@@ -9,12 +9,12 @@
    struct ClockCommand {
      const char* const pathname;
      const char* const argument;
-@@ -222,7 +222,7 @@ void SSLErrorControllerClient::Proceed() {
+@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() {
+ }
  
  bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
--    defined(OS_WIN)
-+    defined(OS_WIN) || defined(OS_BSD)
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \
+     defined(OS_WIN)
    return true;
  #else
-   return false;

www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc

@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -427,7 +427,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
    }
  #endif  // BUILDFLAG(ENABLE_APP_LIST)
  
@@ -9,8 +9,8 @@
    // Dictionary sync is enabled by default.
    if (!disabled_types.Has(syncer::DICTIONARY)) {
      if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) {
-@@ -443,7 +443,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
-           base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
+@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+           base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI})));
      }
    }
 -#endif  // defined(OS_LINUX) || defined(OS_WIN)

www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h

@@ -1,5 +1,14 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/task_manager/sampling/task_group.h
+@@ -36,7 +36,7 @@ constexpr int kUnsupportedVMRefreshFlags =
+     REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
+     REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
+     REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+     REFRESH_TYPE_FD_COUNT |
+ #endif
+     REFRESH_TYPE_HARD_FAULTS;
 @@ -119,9 +119,9 @@ class TaskGroup {
    int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
  #endif  // BUILDFLAG(ENABLE_NACL)
@@ -11,8 +20,8 @@
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
  
    int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
-  private:
-@@ -134,9 +134,9 @@ class TaskGroup {
+ 
+@@ -135,9 +135,9 @@ class TaskGroup {
    void RefreshNaClDebugStubPort(int child_process_unique_id);
    void OnRefreshNaClDebugStubPortDone(int port);
  #endif
@@ -24,7 +33,7 @@
  
    void OnCpuRefreshDone(double cpu_usage);
    void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
-@@ -205,10 +205,10 @@ class TaskGroup {
+@@ -206,10 +206,10 @@ class TaskGroup {
  #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
  #endif  // BUILDFLAG(ENABLE_NACL)

www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc

@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
-@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
      const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
      const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -12,7 +12,7 @@
      const OnProcessPriorityCallback& on_process_priority)
      : process_(std::move(process)),
        process_metrics_(CreateProcessMetrics(process_.Handle())),
-@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler(
+@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler(
        on_cpu_refresh_callback_(on_cpu_refresh),
        on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
        on_idle_wakeups_callback_(on_idle_wakeups),
@@ -24,7 +24,7 @@
        on_process_priority_callback_(on_process_priority) {
    DCHECK(blocking_pool_runner.get());
  
-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          on_swapped_mem_refresh_callback_);
    }
  
@@ -33,7 +33,7 @@
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                      refresh_flags)) {
      base::PostTaskAndReplyWithResult(
-@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -95,9 +95,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
          on_idle_wakeups_callback_);
    }
@@ -45,7 +45,7 @@
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
                                                      refresh_flags)) {
      base::PostTaskAndReplyWithResult(
-@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
+@@ -106,7 +106,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this),
          on_open_fd_count_callback_);
    }
@@ -54,7 +54,7 @@
  
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY,
                                                      refresh_flags)) {
-@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
+@@ -151,13 +151,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
    return process_metrics_->GetIdleWakeupsPerSecond();
  }
  

www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h

@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.h
 @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread
    using OnCpuRefreshCallback = base::Callback<void(double)>;
@@ -36,7 +36,7 @@
    bool RefreshProcessPriority();
  
    // The process that holds the handle that we own so that we can use it for
-@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread
    const OnCpuRefreshCallback on_cpu_refresh_callback_;
    const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
    const OnIdleWakeupsCallback on_idle_wakeups_callback_;

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-04-30 22:22:36 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -208,11 +208,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -210,11 +210,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {

www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -82,7 +82,7 @@
+@@ -80,7 +80,7 @@
  #include "chrome/browser/ui/browser_commands_chromeos.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -220,7 +220,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -216,7 +216,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 =
-@@ -434,7 +434,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -27,7 +27,7 @@
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -879,7 +879,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -863,7 +863,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

www/chromium/files/patch-chrome_browser_ui_browser__window.h

@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_window.h.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/browser_window.h.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/browser_window.h
-@@ -426,7 +426,7 @@ class BrowserWindow : public ui::BaseWindow {
+@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow {
        bool is_source_keyboard) = 0;
  
  #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \

www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -84,7 +84,7 @@ static const char* kBadFlags[] = {
+@@ -88,7 +88,7 @@ static const char* kBadFlags[] = {
      extensions::switches::kExtensionsOnChromeURLs,
  #endif
  

www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -79,7 +79,7 @@
+@@ -82,7 +82,7 @@
  #include "chrome/browser/ui/user_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
  
-@@ -634,8 +634,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
    }
  #endif  // OS_CHROMEOS
  

www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -117,7 +117,7 @@
+@@ -118,7 +118,7 @@
  #include "components/zoom/zoom_controller.h"
  #endif  // defined(OS_ANDROID)
  

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-04-30 22:22:36 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -439,13 +439,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
+@@ -451,13 +451,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(
-@@ -605,7 +605,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -617,7 +617,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]);
-@@ -613,7 +613,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -625,7 +625,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();
-@@ -779,11 +779,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -791,11 +791,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  

www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
+@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
        return app_menu_icon_controller_->GetTypeAndSeverity().type ==
               AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
      }

www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc

@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
 @@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -27,8 +27,8 @@
      {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR,
       IDC_SHOW_BOOKMARK_BAR},
      {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS},
-@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
-     {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN},
+@@ -124,14 +124,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
+      IDC_SHOW_AVATAR_MENU},
  
    // Platform-specific key maps.
 -#if defined(OS_LINUX)

www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc

@@ -1,4 +1,4 @@
---- 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.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
 @@ -33,7 +33,7 @@
  #include "ui/wm/core/wm_state.h"
@@ -18,16 +18,16 @@
  
  ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {}
  
-@@ -91,7 +91,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+         g_browser_process->system_network_context_manager()->GetContext());
    }
- #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    // 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.
-@@ -122,7 +122,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    base::RunLoop().RunUntilIdle();
  
    exit(EXIT_FAILURE);

www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h

@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
 @@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
    HICON GetSmallWindowIcon() const override;
    int GetAppbarAutohideEdges(HMONITOR monitor,
-                              const base::Closure& callback) override;
+                              base::OnceClosure callback) override;
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    gfx::ImageSkia* GetDefaultWindowIcon() const override;
    bool WindowManagerProvidesTitleBar(bool maximized) override;
  #endif

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-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,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
  
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
  namespace {
  
  bool IsUsingGtkTheme(Profile* profile) {
@@ -18,7 +18,7 @@
    return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
  #else
    return false;
-@@ -105,7 +105,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -111,7 +111,7 @@ void BrowserFrame::InitBrowserFrame() {
      non_client_view()->set_context_menu_controller(this);
    }
  

www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2019-04-30 22:22:36 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1504,7 +1504,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
+@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
    // light to dark mode.
    const bool should_use_native_frame = frame_->ShouldUseNativeFrame();
    bool must_regenerate_frame;

www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc

@@ -1,4 +1,4 @@
---- 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.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 @@ -47,7 +47,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
@@ -9,8 +9,8 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
- void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
+@@ -353,7 +353,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source,
                                                   const gfx::Point& point,
                                                   const ui::Event* event) {
 -#if defined(OS_LINUX)
@@ -18,7 +18,7 @@
    views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
                                  views::MenuRunner::HAS_MNEMONICS);
    menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
-@@ -476,7 +476,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
+@@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
  
  OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {

www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc

@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2019-03-11 22:00:54 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
 @@ -15,7 +15,7 @@
  #include "components/sessions/core/tab_restore_service.h"
@@ -18,3 +18,12 @@
    if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
      PrefService* prefs = browser_->profile()->GetPrefs();
      return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
+@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
+ }
+ 
+ bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   bool is_maximized = browser_->window()->IsMaximized();
+   switch (command_id) {
+     case IDC_MAXIMIZE_WINDOW:

www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig	2019-03-17 19:17:01 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() {
+@@ -390,7 +390,7 @@ bool HungRendererDialogView::Cancel() {
    content::RenderProcessHost* rph =
        hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
    if (rph) {

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-04-30 22:22:37 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -64,7 +64,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
+@@ -65,7 +65,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);

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-04-30 22:22:37 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -396,7 +396,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
+@@ -436,7 +436,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,7 +9,7 @@
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -822,7 +822,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
+@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* 
      else
        target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
  
@@ -18,7 +18,7 @@
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -1997,7 +1997,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca
        exclude.insert(dragged_window);
      }
    }

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-04-30 22:22:37 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -198,11 +198,11 @@
+@@ -202,11 +202,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
  
-@@ -320,7 +320,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -322,7 +322,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)
-@@ -605,7 +605,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -619,7 +619,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
-@@ -650,12 +650,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
      return &NewWebUI<CastUI>;
    }
  #endif
@@ -47,3 +47,9 @@
    if (url.host_piece() == chrome::kChromeUIDiscardsHost)
      return &NewWebUI<DiscardsUI>;
  #endif
+ #if defined(OS_WIN) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
+     return &NewWebUI<BrowserSwitchUI>;
+ #endif

www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc

@@ -1,20 +1,20 @@
---- 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
-@@ -550,7 +550,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2019-06-04 18:55:18 UTC
++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
      {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
      {"themes", IDS_SETTINGS_THEMES},
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -568,7 +568,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
      {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
  #endif
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
      {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if defined(OS_MACOSX)

www/chromium/files/patch-chrome_common_BUILD.gn

@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig	2019-04-30 22:22:37 UTC
+--- chrome/common/BUILD.gn.orig	2019-06-04 18:55:18 UTC
 +++ chrome/common/BUILD.gn
-@@ -298,6 +298,10 @@ static_library("common") {
+@@ -306,6 +306,10 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  

www/chromium/files/patch-chrome_common_chrome__features.cc

@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.cc.orig	2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_features.cc.orig	2019-06-04 18:55:18 UTC
 +++ chrome/common/chrome_features.cc
-@@ -96,13 +96,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
- #endif  // defined(OS_WIN) || defined(OS_MACOSX)
+@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc
+                                              base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -16,7 +16,7 @@
  
  // Enables or disables whether permission prompts are automatically blocked
  // after the user has explicitly dismissed them too many times.
-@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{
      "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
  #endif
  
@@ -25,12 +25,12 @@
  // Enables the dual certificate verification trial feature.
  // https://crbug.com/649026
  const base::Feature kCertDualVerificationTrialFeature{
-@@ -216,7 +216,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+ // Enables or disables windowing related features for desktop PWAs.
  const base::Feature kDesktopPWAWindowing {
    "DesktopPWAWindowing",
- #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
--    defined(OS_MACOSX)
-+    defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     defined(OS_MACOSX)
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
-       base::FEATURE_DISABLED_BY_DEFAULT