Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile +++ head/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 81.0.4044.138 -PORTREVISION= 1 +PORTVERSION= 83.0.4103.61 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts @@ -90,7 +89,7 @@ USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt -SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper +SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -276,6 +275,11 @@ @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java .endif + + # Setup buildtools/freebsd + @${MKDIR} ${WRKSRC}/buildtools/freebsd + ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd + ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd .endif do-test-TEST-on: Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo +++ head/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1588777393 -SHA256 (chromium-81.0.4044.138.tar.xz) = f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6 -SIZE (chromium-81.0.4044.138.tar.xz) = 785960928 -SHA256 (chromium-81.0.4044.138-testdata.tar.xz) = e2083a3c9ae5bd183ebaf3dc0b701c3fc6e990a6864852a2fa961e811c99ec32 -SIZE (chromium-81.0.4044.138-testdata.tar.xz) = 257018904 +TIMESTAMP = 1590142056 +SHA256 (chromium-83.0.4103.61.tar.xz) = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc +SIZE (chromium-83.0.4103.61.tar.xz) = 802558244 +SHA256 (chromium-83.0.4103.61-testdata.tar.xz) = 06096007d6fd1a4adce3b9940a653086e380d0f2be3cf9e36d39956ba2f7363e +SIZE (chromium-83.0.4103.61-testdata.tar.xz) = 257159920 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Index: head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h =================================================================== --- head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ head/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-04-03 04:13:08 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-18 18:42:41 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) Index: head/www/chromium/files/patch-BUILD.gn =================================================================== --- head/www/chromium/files/patch-BUILD.gn +++ head/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- BUILD.gn.orig 2020-05-13 18:40:15 UTC +++ BUILD.gn @@ -418,7 +418,7 @@ group("gn_all") { ] @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -575,10 +569,6 @@ group("gn_all") { +@@ -579,10 +573,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -652,7 +642,7 @@ group("gn_all") { +@@ -656,7 +646,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -794,7 +784,6 @@ group("gn_all") { +@@ -789,7 +779,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,15 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -934,7 +923,6 @@ if (is_chromeos) { - "//ppapi/examples/video_decode", - "//sandbox/linux:chrome_sandbox", - "//sandbox/linux:sandbox_linux_unittests", -- "//third_party/breakpad:minidump_stackwalk($host_toolchain)", - - # Blocked on https://github.com/catapult-project/catapult/issues/2297 - #"//third_party/catapult/telemetry:bitmaptools", -@@ -1092,7 +1080,7 @@ if (!is_ios) { +@@ -1071,7 +1060,7 @@ if (!is_ios) { ] } @@ -74,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1101,7 +1089,7 @@ if (!is_ios) { +@@ -1080,7 +1069,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -83,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") { +@@ -1273,9 +1262,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] Index: head/www/chromium/files/patch-ash_display_mirror__window__controller.cc =================================================================== --- head/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ head/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2020-03-16 18:40:27 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-05-13 18:39:35 UTC +++ ash/display/mirror_window_controller.cc -@@ -276,7 +276,11 @@ void MirrorWindowController::UpdateWindow( +@@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); Index: head/www/chromium/files/patch-base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_BUILD.gn +++ head/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,15 @@ ---- base/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- base/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ base/BUILD.gn -@@ -912,7 +912,7 @@ jumbo_component("base") { +@@ -59,7 +59,7 @@ declare_args() { + # replacement base::Location::Current(). On by default in non-official builds + # for testing purposes. + # TODO(https://crbug.com/974061): remove this eventually. +- from_here_uses_location_builtins = !is_official_build ++ from_here_uses_location_builtins = !is_official_build && !is_bsd + + # Unsafe developer build. Has developer-friendly features that may weaken or + # disable security measures like sandboxing or ASLR. +@@ -929,7 +929,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +18,7 @@ sources += [ "profiler/stack_copier_signal.cc", "profiler/stack_copier_signal.h", -@@ -921,6 +921,12 @@ jumbo_component("base") { +@@ -938,6 +938,12 @@ jumbo_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +31,7 @@ } if (is_win) { -@@ -1305,7 +1311,7 @@ jumbo_component("base") { +@@ -1321,7 +1327,7 @@ jumbo_component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -31,7 +40,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1331,7 +1337,7 @@ jumbo_component("base") { +@@ -1347,7 +1353,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -40,7 +49,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1930,6 +1936,33 @@ jumbo_component("base") { +@@ -1942,6 +1948,33 @@ jumbo_component("base") { } } @@ -74,7 +83,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2880,7 +2913,7 @@ test("base_unittests") { +@@ -2898,7 +2931,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -83,7 +92,7 @@ sources += [ "profiler/stack_copier_signal_unittest.cc" ] } } -@@ -3068,6 +3101,12 @@ test("base_unittests") { +@@ -3087,6 +3120,12 @@ test("base_unittests") { manifest = "//build/config/fuchsia/tests.cmx" } Index: head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h =================================================================== --- head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-10-21 19:06:18 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-13 18:39:35 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -19,7 +19,7 @@ +@@ -22,7 +22,7 @@ #if defined(OS_ANDROID) #include #endif Index: head/www/chromium/files/patch-base_debug_debugger__posix.cc =================================================================== --- head/www/chromium/files/patch-base_debug_debugger__posix.cc +++ head/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2019-09-09 21:55:05 UTC +--- base/debug/debugger_posix.cc.orig 2020-05-13 18:40:16 UTC +++ base/debug/debugger_posix.cc -@@ -90,7 +90,7 @@ bool BeingDebugged() { +@@ -95,7 +95,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -98,33 +98,35 @@ bool BeingDebugged() { +@@ -103,33 +103,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. Index: head/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc =================================================================== --- head/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ head/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-05-13 18:40:16 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -430,7 +430,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -808,7 +808,7 @@ enum Permission { +@@ -803,7 +803,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -832,9 +832,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -30,7 +30,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -869,7 +869,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } Index: head/www/chromium/files/patch-base_i18n_icu__util.cc =================================================================== --- head/www/chromium/files/patch-base_i18n_icu__util.cc +++ head/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2020-03-16 18:40:27 UTC +--- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC +++ base/i18n/icu_util.cc -@@ -46,7 +46,7 @@ +@@ -49,7 +49,7 @@ #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ @@ -14,7 +14,7 @@ icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); -#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) - // To respond to the timezone change properly, the default timezone ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) + // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). Index: head/www/chromium/files/patch-base_linux__util.cc =================================================================== --- head/www/chromium/files/patch-base_linux__util.cc +++ head/www/chromium/files/patch-base_linux__util.cc @@ -1,20 +1,12 @@ ---- base/linux_util.cc.orig 2019-12-16 21:50:40 UTC +--- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +++ base/linux_util.cc -@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] = - "CrOS"; - #elif defined(OS_ANDROID) - "Android"; -+#elif defined(OS_BSD) -+ "BSD"; - #else // if defined(OS_LINUX) - "Unknown"; - #endif -@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo - } - - std::string GetLinuxDistro() { --#if defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - return g_linux_distro; - #elif defined(OS_LINUX) - LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); +@@ -78,6 +78,9 @@ class DistroNameGetter { + public: + DistroNameGetter() { + static const char* const kFilesToCheck[] = {"/etc/os-release", ++#if defined(OS_BSD) ++ "/usr/local/etc/os-release", ++#endif + "/usr/lib/os-release"}; + for (const char* file : kFilesToCheck) { + if (ReadDistroFromOSReleaseFile(file)) Index: head/www/chromium/files/patch-base_location__unittest.cc =================================================================== --- head/www/chromium/files/patch-base_location__unittest.cc +++ head/www/chromium/files/patch-base_location__unittest.cc @@ -0,0 +1,11 @@ +--- base/location_unittest.cc.orig 2020-05-26 09:56:30 UTC ++++ base/location_unittest.cc +@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { + EXPECT_EQ(here.line_number(), previous_line + 1); + EXPECT_STREQ("TestBody", here.function_name()); + #endif +-#elif defined(OFFICIAL_BUILD) ++#elif defined(OFFICIAL_BUILD) && !defined(OS_BSD) + #error Location builtins must be supported in official builds. + #elif BUILDFLAG(FROM_HERE_USES_LOCATION_BUILTINS) + #error FROM_HERE requires location builtins to be supported. Index: head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc =================================================================== --- head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ head/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-05-13 18:40:16 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { +@@ -69,7 +69,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: +@@ -78,7 +78,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: return region.PassPlatformHandle().fd; return ScopedFD(); } @@ -18,7 +18,7 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -203,7 +203,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -27,7 +27,7 @@ , bool executable #endif -@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -232,7 +232,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( Index: head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc =================================================================== --- head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ head/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2020-04-10 00:33:01 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-05-13 18:40:16 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include #include #include -@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { +@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { +@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; Index: head/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc =================================================================== --- head/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ head/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-05-13 18:40:16 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ #include #include #include Index: head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc =================================================================== --- head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ head/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,4 +1,4 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-04-03 04:10:36 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2020-05-13 18:39:35 UTC +++ base/profiler/thread_delegate_posix.cc @@ -9,6 +9,9 @@ #include "base/stl_util.h" @@ -10,7 +10,7 @@ namespace base { -@@ -17,7 +20,12 @@ +@@ -17,7 +20,12 @@ namespace { uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,7 +23,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -93,16 +103,33 @@ +@@ -93,16 +101,33 @@ std::vector ThreadDelegatePosix::GetRegist return { // Return the set of callee-save registers per the i386 System V ABI // section 2.2.3, plus the stack pointer. @@ -57,7 +57,7 @@ reinterpret_cast(&thread_context->gregs[REG_RBP]), reinterpret_cast(&thread_context->gregs[REG_RBX]), reinterpret_cast(&thread_context->gregs[REG_R12]), -@@ -110,6 +137,7 @@ +@@ -110,6 +135,7 @@ std::vector ThreadDelegatePosix::GetRegist reinterpret_cast(&thread_context->gregs[REG_R14]), reinterpret_cast(&thread_context->gregs[REG_R15]), reinterpret_cast(&thread_context->gregs[REG_RSP]), Index: head/www/chromium/files/patch-base_stl__util.h =================================================================== --- head/www/chromium/files/patch-base_stl__util.h +++ head/www/chromium/files/patch-base_stl__util.h @@ -0,0 +1,47 @@ +--- base/stl_util.h.orig 2020-05-18 14:07:28 UTC ++++ base/stl_util.h +@@ -561,14 +561,6 @@ size_t EraseIf(std::vector& container, P + return removed; + } + +-template +-size_t Erase(std::forward_list& container, const Value& value) { +- // Unlike std::forward_list::remove, this function template accepts +- // heterogeneous types and does not force a conversion to the container's +- // value type before invoking the == operator. +- return EraseIf(container, [&](const T& cur) { return cur == value; }); +-} +- + template + size_t EraseIf(std::forward_list& container, Predicate pred) { + // Note: std::forward_list does not have a size() API, thus we need to use the +@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list& contai + } + + template +-size_t Erase(std::list& container, const Value& value) { +- // Unlike std::list::remove, this function template accepts heterogeneous +- // types and does not force a conversion to the container's value type before +- // invoking the == operator. ++size_t Erase(std::forward_list& container, const Value& value) { ++ // Unlike std::forward_list::remove, this function template accepts ++ // heterogeneous types and does not force a conversion to the container's ++ // value type before invoking the == operator. + return EraseIf(container, [&](const T& cur) { return cur == value; }); + } + +@@ -592,6 +584,14 @@ size_t EraseIf(std::list& container, Pre + size_t old_size = container.size(); + container.remove_if(pred); + return old_size - container.size(); ++} ++ ++template ++size_t Erase(std::list& container, const Value& value) { ++ // Unlike std::list::remove, this function template accepts heterogeneous ++ // types and does not force a conversion to the container's value type before ++ // invoking the == operator. ++ return EraseIf(container, [&](const T& cur) { return cur == value; }); + } + + template Index: head/www/chromium/files/patch-base_system_sys__info.h =================================================================== --- head/www/chromium/files/patch-base_system_sys__info.h +++ head/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2020-03-16 18:39:41 UTC +--- base/system/sys_info.h.orig 2020-05-13 18:39:35 UTC +++ base/system/sys_info.h -@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo { +@@ -197,6 +197,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo { +@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); Index: head/www/chromium/files/patch-base_test_test__suite.cc =================================================================== --- head/www/chromium/files/patch-base_test_test__suite.cc +++ head/www/chromium/files/patch-base_test_test__suite.cc @@ -1,6 +1,6 @@ ---- base/test/test_suite.cc.orig 2020-03-23 15:30:45 UTC +--- base/test/test_suite.cc.orig 2020-05-13 18:39:35 UTC +++ base/test/test_suite.cc -@@ -68,7 +68,7 @@ +@@ -69,7 +69,7 @@ #include "base/test/test_support_ios.h" #endif @@ -9,7 +9,7 @@ #include "base/test/fontconfig_util_linux.h" #endif -@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { +@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -26,7 +26,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -620,7 +620,7 @@ void TestSuite::Initialize() { +@@ -623,7 +623,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); Index: head/www/chromium/files/patch-build_config_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn +++ head/www/chromium/files/patch-build_config_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- build/config/BUILD.gn.orig 2020-05-13 18:39:35 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. @@ -19,7 +19,7 @@ ] } } -@@ -315,7 +313,7 @@ config("executable_config") { +@@ -316,7 +314,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,24 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- build/config/compiler/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ build/config/compiler/BUILD.gn -@@ -137,7 +137,7 @@ declare_args() { - # TODO(vitalybuka): +@@ -138,7 +138,7 @@ declare_args() { # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. # 'use_xcode_clang' may call old clang. -- init_stack_vars = !is_android && !use_xcode_clang && !is_official_build -+ init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd + init_stack_vars = +- !is_android && !use_xcode_clang && (!is_official_build || is_linux) ++ !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd } declare_args() { @@ -298,7 +298,7 @@ config("compiler") { + } # Linker warnings. - if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && -- !is_mac && !is_ios && current_os != "aix") { -+ !is_mac && !is_ios && current_os != "aix" && !is_bsd) { - # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 +- if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") { ++ if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } -@@ -393,7 +393,7 @@ config("compiler") { + if (fatal_linker_warnings && (is_mac || is_ios)) { +@@ -392,7 +392,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -486,7 +486,7 @@ config("compiler") { +@@ -485,7 +485,7 @@ config("compiler") { } } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -767,7 +767,7 @@ config("compiler_cpu_abi") { +@@ -755,7 +755,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1118,7 +1118,7 @@ config("compiler_deterministic") { +@@ -1105,7 +1105,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1507,7 +1507,7 @@ config("default_warnings") { +@@ -1488,7 +1488,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1741,7 +1741,7 @@ config("thin_archive") { +@@ -1738,7 +1738,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -72,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2334,7 +2334,7 @@ config("symbols") { +@@ -2262,7 +2262,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -80,8 +80,8 @@ + cflags += [ "-g0" ] } - if (use_debug_fission && !is_nacl && !is_android) { -@@ -2355,7 +2355,7 @@ config("symbols") { + if (is_clang && !is_nacl && !use_xcode_clang) { +@@ -2290,7 +2290,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && Index: head/www/chromium/files/patch-build_config_compiler_compiler.gni =================================================================== --- head/www/chromium/files/patch-build_config_compiler_compiler.gni +++ head/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,4 +1,4 @@ ---- build/config/compiler/compiler.gni.orig 2020-03-16 18:40:27 UTC +--- build/config/compiler/compiler.gni.orig 2020-05-13 18:40:16 UTC +++ build/config/compiler/compiler.gni @@ -47,7 +47,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -200,7 +200,7 @@ declare_args() { +@@ -190,7 +190,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = Index: head/www/chromium/files/patch-build_config_linux_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_linux_BUILD.gn +++ head/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,9 +1,9 @@ ---- build/config/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/BUILD.gn.orig 2020-05-13 18:39:36 UTC +++ build/config/linux/BUILD.gn -@@ -28,7 +28,7 @@ config("runtime_library") { - } +@@ -30,7 +30,7 @@ config("runtime_library") { - if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && + if ((!(is_chromeos || chromeos_is_browser_only) || + default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { libs = [ "atomic" ] Index: head/www/chromium/files/patch-build_config_sysroot.gni =================================================================== --- head/www/chromium/files/patch-build_config_sysroot.gni +++ head/www/chromium/files/patch-build_config_sysroot.gni @@ -1,15 +1,14 @@ ---- build/config/sysroot.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/sysroot.gni.orig 2020-05-13 18:39:36 UTC +++ build/config/sysroot.gni -@@ -15,9 +15,10 @@ declare_args() { - # The absolute path to directory containing linux sysroot images - target_sysroot_dir = "//build/linux" +@@ -21,9 +21,9 @@ declare_args() { + # Controls default is_linux sysroot. If set to true, and sysroot + # is empty, default sysroot is calculated. - use_sysroot = current_cpu == "x86" || current_cpu == "x64" || -+ use_sysroot = !is_bsd && ( -+ current_cpu == "x86" || current_cpu == "x64" || ++ use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64" || - current_cpu == "mipsel" || current_cpu == "mips64el" + current_cpu == "mipsel" || current_cpu == "mips64el") } - if (current_os == target_os && current_cpu == target_cpu && + if (sysroot == "") { Index: head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni =================================================================== --- head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-03-16 18:40:27 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-05-13 18:40:16 UTC +++ build/toolchain/gcc_toolchain.gni @@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { enable_resource_whitelist_generation = false @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -577,13 +582,23 @@ template("clang_toolchain") { +@@ -589,13 +594,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { Index: head/www/chromium/files/patch-cc_BUILD.gn =================================================================== --- head/www/chromium/files/patch-cc_BUILD.gn +++ head/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2020-03-16 18:40:27 UTC +--- cc/BUILD.gn.orig 2020-05-13 18:40:16 UTC +++ cc/BUILD.gn -@@ -582,7 +582,7 @@ cc_test_static_library("test_support") { +@@ -589,7 +589,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,11 +9,11 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -788,7 +788,6 @@ cc_test("cc_unittests") { +@@ -790,7 +790,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - if (enable_vulkan) { + defines = [] Index: head/www/chromium/files/patch-cc_trees_property__tree.cc =================================================================== --- head/www/chromium/files/patch-cc_trees_property__tree.cc +++ head/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-03-16 18:40:27 UTC +--- cc/trees/property_tree.cc.orig 2020-05-13 18:40:17 UTC +++ cc/trees/property_tree.cc -@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1241,13 +1241,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); Index: head/www/chromium/files/patch-chrome_app_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_app_BUILD.gn +++ head/www/chromium/files/patch-chrome_app_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/app/BUILD.gn.orig 2020-05-18 10:34:00 UTC ++++ chrome/app/BUILD.gn +@@ -138,7 +138,7 @@ static_library("test_support") { + "//v8:v8_headers", + ] + +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + deps += [ + "//components/crash/core/app", Index: head/www/chromium/files/patch-chrome_app_chrome__command__ids.h =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ head/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,8 +1,8 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-02-03 21:53:28 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-05-13 18:39:36 UTC +++ chrome/app/chrome_command_ids.h -@@ -62,7 +62,7 @@ - #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 - #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 +@@ -60,7 +60,7 @@ + #define IDC_MAXIMIZE_WINDOW 34047 + #define IDC_ALL_WINDOWS_FRONT 34048 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-03-16 18:40:27 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-05-13 18:40:17 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -142,12 +142,12 @@ +@@ -145,12 +145,12 @@ #include "v8/include/v8.h" #endif @@ -22,18 +22,18 @@ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" - #include "components/crash/content/app/crashpad.h" + #include "components/crash/core/app/crashpad.h" #endif -@@ -246,7 +246,7 @@ bool UseHooks() { +@@ -276,7 +276,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) void AdjustLinuxOOMScore(const std::string& process_type) { - // Browsers and zygotes should still be killable, but killed last. - const int kZygoteScore = 0; -@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty + int score = -1; + +@@ -316,13 +316,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -49,7 +49,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -361,7 +361,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +58,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -371,7 +371,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -425,7 +425,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +76,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -437,7 +437,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,16 +85,25 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -483,7 +483,7 @@ void InitLogging(const std::string& process_type) { - void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { - if (!exe_entry_point_ticks.is_null()) - startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); +@@ -509,7 +509,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat + startup_metric_utils::RecordApplicationStartTime(now); + #endif + -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -701,7 +701,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi + v8_crashpad_support::SetUp(); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + if (!crash_reporter::IsCrashpadEnabled()) { + breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); + } +@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -103,7 +112,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -112,7 +121,16 @@ nacl::RegisterPathProvider(); #endif -@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -916,7 +916,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + + crash_reporter::InitializeCrashKeys(); + +-#if defined(OS_POSIX) ++#if defined(OS_POSIX) && !defined(OS_BSD) + ChromeCrashReporterClient::Create(); + #endif + +@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -121,16 +139,16 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - InitializePDF(); - #endif +@@ -1047,7 +1047,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + locale; + } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1068,7 +1068,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -139,7 +157,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -1059,7 +1059,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1082,7 +1082,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. @@ -148,7 +166,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1128,7 +1128,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ @@ -157,3 +175,21 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"", NULL}, // To avoid constant array of size 0 +@@ -1156,7 +1156,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str + #endif // !defined(OS_ANDROID) + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + void ChromeMainDelegate::ZygoteStarting( + std::vector>* + delegates) { +@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ZygoteForked() { + crash_keys::SetCrashKeysFromCommandLine(*command_line); + } + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) && !defined(OS_BSD) + + content::ContentClient* ChromeMainDelegate::CreateContentClient() { + return &chrome_content_client_; Index: head/www/chromium/files/patch-chrome_app_chromium__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2020-03-16 18:40:27 UTC +--- chrome/app/chromium_strings.grd.orig 2020-05-13 18:40:17 UTC +++ chrome/app/chromium_strings.grd -@@ -649,7 +649,7 @@ Chromium is unable to recover your settings. +@@ -680,7 +680,7 @@ Chromium is unable to recover your settings. @@ -9,7 +9,7 @@ Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -750,7 +750,7 @@ Chromium is unable to recover your settings. +@@ -781,7 +781,7 @@ Chromium is unable to recover your settings. @@ -18,7 +18,7 @@ The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). 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. -@@ -972,7 +972,7 @@ Chromium is unable to recover your settings. +@@ -1003,7 +1003,7 @@ Chromium is unable to recover your settings. Index: head/www/chromium/files/patch-chrome_app_generated__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_generated__resources.grd +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2020-03-16 18:40:27 UTC +--- chrome/app/generated_resources.grd.orig 2020-05-13 18:40:17 UTC +++ chrome/app/generated_resources.grd -@@ -5141,7 +5141,7 @@ Keep your key file in a safe place. You will need it t +@@ -5137,7 +5137,7 @@ Keep your key file in a safe place. You will need it t @@ -9,7 +9,7 @@ Legacy Browser Support -@@ -6861,7 +6861,7 @@ the Bookmarks menu."> +@@ -6880,7 +6880,7 @@ the Bookmarks menu."> Google Pay @@ -18,7 +18,7 @@ Use system title bar and borders -@@ -7822,7 +7822,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7806,7 +7806,7 @@ Please help our engineers fix this problem. Tell us wh Set as default Index: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2020-03-16 18:40:27 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-05-13 18:40:17 UTC +++ chrome/app/google_chrome_strings.grd -@@ -661,7 +661,7 @@ Google Chrome is unable to recover your settings. +@@ -692,7 +692,7 @@ Google Chrome is unable to recover your settings. @@ -9,7 +9,7 @@ Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. -@@ -762,7 +762,7 @@ Google Chrome is unable to recover your settings. +@@ -793,7 +793,7 @@ Google Chrome is unable to recover your settings. @@ -18,7 +18,7 @@ The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). 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. -@@ -991,7 +991,7 @@ Google Chrome is unable to recover your settings. +@@ -1022,7 +1022,7 @@ Google Chrome is unable to recover your settings. Index: head/www/chromium/files/patch-chrome_app_settings__strings.grdp =================================================================== --- head/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2020-03-16 18:40:29 UTC +--- chrome/app/settings_strings.grdp.orig 2020-05-13 18:40:22 UTC +++ chrome/app/settings_strings.grdp -@@ -811,7 +811,7 @@ +@@ -111,7 +111,7 @@ Themes @@ -9,7 +9,7 @@ GTK+ -@@ -825,7 +825,7 @@ +@@ -125,7 +125,7 @@ Use Classic Index: head/www/chromium/files/patch-chrome_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_BUILD.gn +++ head/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -0,0 +1,22 @@ +--- chrome/browser/BUILD.gn.orig 2020-05-13 18:40:22 UTC ++++ chrome/browser/BUILD.gn +@@ -4195,7 +4195,9 @@ jumbo_static_library("browser") { + configs += [ "//build/config/linux:x11" ] + deps += [ "//ui/gfx/x" ] + } +- deps += [ "//services/service_manager/zygote" ] ++ if (!is_bsd) { ++ deps += [ "//services/service_manager/zygote" ] ++ } + + if (use_allocator == "tcmalloc") { + deps += [ "//chrome/common/performance_manager/mojom" ] +@@ -4408,7 +4410,7 @@ jumbo_static_library("browser") { + ] + } + +- if (is_posix && !is_mac) { ++ if (is_posix && !is_mac && !is_bsd) { + # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + sources += [ + "//chrome/app/chrome_crash_reporter_client.cc", Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2020-04-03 04:11:28 UTC +--- chrome/browser/about_flags.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/about_flags.cc -@@ -170,7 +170,7 @@ +@@ -173,7 +173,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -834,7 +834,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -873,7 +873,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,16 +18,16 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -872,7 +872,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP - base::size(kOmniboxDocumentProviderClientScoring), nullptr}, - {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring, - base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}}; +@@ -1038,7 +1038,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc + nullptr, + }}; + -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}}; -@@ -994,14 +994,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat +@@ -1154,14 +1154,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), nullptr}}; @@ -44,7 +44,7 @@ const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { {security_state::features::kMarkHttpAsFeatureParameterName, -@@ -2031,13 +2031,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2264,13 +2264,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -60,7 +60,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2074,14 +2074,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2307,14 +2307,14 @@ const FeatureEntry kFeatureEntries[] = { "OverrideTranslateTriggerInIndia")}, #endif // OS_ANDROID @@ -77,7 +77,7 @@ #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) {"enable-native-notifications", -@@ -2159,13 +2159,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2404,13 +2404,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, #endif // OS_CHROMEOS @@ -93,7 +93,7 @@ #if defined(OS_ANDROID) {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2239,7 +2239,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2475,7 +2475,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, #endif // OS_ANDROID @@ -102,7 +102,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS, SINGLE_VALUE_TYPE( -@@ -2907,7 +2907,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, @@ -111,16 +111,16 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2956,7 +2956,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxAutocompleteTitlesName, - flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)}, +@@ -3204,7 +3204,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, + kOmniboxRichAutocompletionVariations, + "OmniboxBundledExperimentV1")}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3182,13 +3182,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3416,13 +3416,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -136,8 +136,8 @@ #if !defined(OS_ANDROID) {"ntp-confirm-suggestion-removals", -@@ -3850,12 +3850,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(kClickToCallDetectionV2)}, +@@ -4052,7 +4052,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ @@ -145,22 +145,25 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, - FEATURE_VALUE_TYPE(kRemoteCopyReceiver)}, +@@ -4065,7 +4065,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kRemoteCopyProgressNotificationName, + flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) - {"shared-clipboard-receiver", -@@ -3899,7 +3899,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSharingUseDeviceInfoDescription, kOsAll, - FEATURE_VALUE_TYPE(kSharingUseDeviceInfo)}, + {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, +@@ -4107,7 +4107,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingDeriveVapidKeyDescription, kOsAll, + FEATURE_VALUE_TYPE(kSharingDeriveVapidKey)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"sharing-peer-connection-receiver", flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -3910,7 +3910,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4118,7 +4118,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingPeerConnectionSenderName, flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, @@ -169,7 +172,7 @@ // defined(OS_CHROMEOS) {"sharing-qr-code-generator", -@@ -3985,13 +3985,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4193,13 +4193,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -185,7 +188,7 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4436,7 +4436,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4654,7 +4654,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, @@ -194,7 +197,7 @@ {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, -@@ -4453,7 +4453,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4671,7 +4671,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, kOsWin | kOsMac | kOsLinux | kOsCrOS, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, Index: head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-09-09 21:55:09 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -86,7 +86,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { @@ -9,9 +9,12 @@ // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. - return metrics::OmniboxInputType::EMPTY; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - // If block state is unknown, check if there is an application registered - // for the url scheme. - GURL url(scheme + "://"); +@@ -99,7 +99,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch + shell_integration::GetApplicationNameForProtocol(url); + return application_name.empty() ? metrics::OmniboxInputType::EMPTY + : metrics::OmniboxInputType::URL; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + } + NOTREACHED(); Index: head/www/chromium/files/patch-chrome_browser_browser__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,7 +1,7 @@ ---- chrome/browser/browser_resources.grd.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/browser_resources.grd.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/browser_resources.grd -@@ -54,7 +54,7 @@ - +@@ -63,7 +63,7 @@ + - Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-03-17 09:35:03 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -97,7 +97,7 @@ +@@ -109,7 +109,7 @@ #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h" #endif @@ -9,8 +9,8 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -471,7 +471,7 @@ void PopulateChromeWebUIFrameBinders( - map); +@@ -532,7 +532,7 @@ void PopulateChromeWebUIFrameBinders( + media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -224,9 +224,9 @@ +@@ -208,11 +208,11 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -10,9 +10,12 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #if defined(OS_LINUX) - #include "components/crash/content/app/breakpad_linux.h" -@@ -265,7 +265,7 @@ +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + #include "components/crash/core/app/breakpad_linux.h" + #include "components/crash/core/app/crashpad.h" + #endif +@@ -246,7 +246,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,7 +24,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif -@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -919,7 +919,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,7 +33,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -928,7 +928,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -39,7 +42,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -966,7 +966,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -48,7 +51,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1119,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -56,7 +59,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1127,6 +1128,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,14 +1,17 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2020-05-13 18:39:37 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -81,14 +81,16 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -83,6 +83,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); +#if !defined(OS_BSD) - bool enabled = (crash_reporter::IsCrashpadEnabled() && - crash_reporter::GetUploadsEnabled()) || - breakpad::IsCrashReporterEnabled(); - g_browser_process->metrics_service()->RecordBreakpadRegistration(enabled); + bool breakpad_registered; + if (crash_reporter::IsCrashpadEnabled()) { + // If we're using crashpad, there's no breakpad and crashpad is always +@@ -100,10 +101,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { + } + g_browser_process->metrics_service()->RecordBreakpadRegistration( + breakpad_registered); +#endif } @@ -18,7 +21,7 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -111,7 +113,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -364,12 +364,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -369,12 +369,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -390,7 +390,7 @@ +@@ -396,7 +396,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -444,7 +444,7 @@ +@@ -450,12 +450,12 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,16 +18,22 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #include "services/service_manager/sandbox/features.h" #endif -@@ -477,7 +477,7 @@ + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + #include "components/crash/core/app/crash_switches.h" + #include "components/crash/core/app/crashpad.h" + #endif +@@ -483,7 +483,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(USE_X11) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" - #else -@@ -820,11 +820,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" + #endif + +@@ -789,11 +789,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -41,7 +47,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1269,7 +1271,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1230,7 +1232,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique( parameters, startup_data_); @@ -50,16 +56,16 @@ main_parts = std::make_unique(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1295,7 +1297,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1256,7 +1258,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(USE_X11) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else -@@ -2020,7 +2022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); +@@ -1979,7 +1981,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -68,7 +74,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2288,7 +2290,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2256,7 +2258,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -77,7 +83,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(service_manager::switches::kNoSandbox)) { -@@ -3564,7 +3566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3546,7 +3548,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -86,7 +92,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3696,7 +3698,7 @@ void ChromeContentBrowserClient::BindCredentialManager +@@ -3681,7 +3683,7 @@ void ChromeContentBrowserClient::BindCredentialManager } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -95,7 +101,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { const base::Value* audio_sandbox_enabled_policy_value = policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3714,7 +3716,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& +@@ -3699,7 +3701,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -104,7 +110,7 @@ if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -3999,7 +4001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -3984,7 +3986,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ Index: head/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ head/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,8 +1,8 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2020-03-17 09:36:38 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa - - +@@ -61,7 +61,7 @@ This file specifies browser resources for developer-fa + + - + Index: head/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ head/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2020-05-15 14:52:43 UTC ++++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc +@@ -28,7 +28,7 @@ std::unique_ptr CreatePlatform + #if defined(OS_CHROMEOS) + return std::make_unique( + local_state); +-#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + DCHECK(base::FeatureList::IsEnabled(policy::features::kCBCMServiceAccounts)); + return std::make_unique(local_state); + #else Index: head/www/chromium/files/patch-chrome_browser_download_download__commands.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ head/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/download/download_commands.cc.orig 2020-05-13 18:39:37 UTC +++ chrome/browser/download/download_commands.cc -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "net/base/url_util.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -153,7 +153,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -154,7 +154,7 @@ void DownloadCommands::ExecuteCommand(Command command) model_->ExecuteCommand(this, command); } @@ -18,7 +18,7 @@ Browser* DownloadCommands::GetBrowser() const { chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); -@@ -176,12 +176,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -177,12 +177,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); Index: head/www/chromium/files/patch-chrome_browser_download_download__item__model.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ head/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/download/download_item_model.cc -@@ -592,7 +592,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -595,7 +595,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -632,7 +632,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -635,7 +635,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); Index: head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1175,6 +1175,12 @@ jumbo_static_library("extensions") { +@@ -1185,6 +1185,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } Index: head/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-03-18 08:39:42 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-05-13 18:39:37 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc @@ -8,7 +8,9 @@ #include @@ -10,7 +10,7 @@ #include -@@ -90,6 +92,7 @@ enterprise_reporting_private::SettingValue GetScreenlo +@@ -91,6 +93,7 @@ enterprise_reporting_private::SettingValue GetScreenlo // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. enterprise_reporting_private::SettingValue GetDiskEncrypted() { @@ -18,7 +18,7 @@ struct stat info; // First figure out the device identifier. stat("/", &info); -@@ -109,6 +112,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr +@@ -110,6 +113,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr return is_encrypted ? enterprise_reporting_private::SETTING_VALUE_ENABLED : enterprise_reporting_private::SETTING_VALUE_DISABLED; } @@ -26,7 +26,7 @@ return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; } -@@ -120,7 +124,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de +@@ -121,7 +125,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de DeviceInfo DeviceInfoFetcherLinux::Fetch() { DeviceInfo device_info; Index: head/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-04-03 04:11:29 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-05-18 18:39:09 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ #include "base/win/registry.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -382,7 +382,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -384,7 +384,7 @@ base::FilePath GetEndpointVerificationDir() { return *GetEndpointVerificationDirOverride(); #if defined(OS_WIN) if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) @@ -18,7 +18,7 @@ std::unique_ptr env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -393,7 +393,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -395,7 +395,7 @@ base::FilePath GetEndpointVerificationDir() { if (true) #endif return path; Index: head/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2020-05-13 18:39:37 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -21,6 +21,7 @@ static base::LazyInstancePostTask( FROM_HERE, -@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -35,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); Index: head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -160,7 +160,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -161,7 +161,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -170,7 +170,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; Index: head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-10-21 19:06:21 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -29,7 +29,7 @@ #include "extensions/browser/process_manager.h" @@ -18,24 +18,22 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi - } +@@ -569,7 +569,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi - bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() { + ExtensionFunction::ResponseAction + WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run +@@ -592,9 +592,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); - return true; + return RespondLater(); -#else // defined(OS_LINUX) || defined(OS_CHROMEOS) +#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetError("Not supported on the current OS"); - SendResponse(false); - return false; + return RespondNow(Error("Not supported on the current OS")); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } Index: head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:39 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -96,7 +96,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() extensions::IdentityAPI::GetFactoryInstance(); extensions::InstallTrackerFactory::GetInstance(); extensions::InstallVerifierFactory::GetInstance(); Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,8 +1,8 @@ ---- chrome/browser/flag_descriptions.h.orig 2020-04-03 04:11:29 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/flag_descriptions.h -@@ -21,9 +21,9 @@ - #include "ui/android/buildflags.h" - #endif // defined(OS_ANDROID) +@@ -18,9 +18,9 @@ + #include "ppapi/buildflags/buildflags.h" + #include "printing/buildflags/buildflags.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2128,14 +2128,14 @@ extern const char kZeroStateFilesDescription[]; +@@ -2167,14 +2167,14 @@ extern const char kZeroStateFilesDescription[]; #endif // #if defined(OS_CHROMEOS) @@ -29,7 +29,7 @@ // All views-based platforms -------------------------------------------------- -@@ -2154,12 +2154,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2193,12 +2193,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- @@ -44,7 +44,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -2171,21 +2171,21 @@ extern const char kClickToCallDetectionV2Description[] +@@ -2207,7 +2207,7 @@ extern const char kClickToCallUIDescription[]; #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -53,10 +53,12 @@ defined(OS_CHROMEOS) extern const char kRemoteCopyReceiverName[]; - extern const char kRemoteCopyReceiverDescription[]; +@@ -2219,15 +2219,15 @@ extern const char kRemoteCopyImageNotificationDescript + extern const char kRemoteCopyProgressNotificationName[]; + extern const char kRemoteCopyProgressNotificationDescription[]; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-04-03 04:11:29 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3646,7 +3646,7 @@ const char kZeroStateFilesDescription[] = +@@ -3723,7 +3723,7 @@ const char kZeroStateFilesDescription[] = #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #if BUILDFLAG(USE_TCMALLOC) const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3655,7 +3655,7 @@ const char kDynamicTcmallocDescription[] = +@@ -3732,7 +3732,7 @@ const char kDynamicTcmallocDescription[] = "utilization."; #endif // BUILDFLAG(USE_TCMALLOC) @@ -18,7 +18,7 @@ // All views-based platforms -------------------------------------------------- -@@ -3680,13 +3680,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -3757,13 +3757,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- @@ -34,7 +34,7 @@ #if BUILDFLAG(ENABLE_CLICK_TO_CALL) -@@ -3703,7 +3703,7 @@ const char kClickToCallDetectionV2Description[] = +@@ -3775,7 +3775,7 @@ const char kClickToCallUIDescription[] = #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -43,9 +43,9 @@ defined(OS_CHROMEOS) const char kRemoteCopyReceiverName[] = -@@ -3712,16 +3712,16 @@ const char kRemoteCopyReceiverDescription[] = - "Enables the remote copy feature to handle messages by writing content to " - "the clipboard and showing a notification to the user."; +@@ -3796,16 +3796,16 @@ const char kRemoteCopyProgressNotificationDescription[ + "Enables progress notifications to be shown for the remote copy feature " + "when receiving a message."; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || Index: head/www/chromium/files/patch-chrome_browser_memory__details.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_memory__details.cc +++ head/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/memory_details.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/memory_details.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #include "services/service_manager/zygote/zygote_host_linux.h" #endif -@@ -336,7 +336,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } Index: head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc +++ head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc @@ -1,13 +0,0 @@ ---- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-06-04 18:55:17 UTC -+++ chrome/browser/metrics/bluetooth_available_utility.cc -@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() { - return; - } - -+#if !defined(OS_BSD) - device::BluetoothAdapterFactory::Get().GetAdapter( - base::BindOnce(&OnGetAdapter)); -+#endif - } - - } // namespace bluetooth_utility Index: head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -718,11 +718,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -679,11 +679,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -980,7 +980,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -941,7 +941,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ Index: head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -438,7 +438,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -462,7 +462,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / 1024); #endif -@@ -461,7 +461,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -485,7 +485,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / 1024); Index: head/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ head/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-05-13 18:39:37 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -144,7 +144,7 @@ const struct { +@@ -150,7 +150,7 @@ const struct { {base::DIR_APP_DATA, nullptr, true}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, #endif Index: head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -79,11 +79,11 @@ +@@ -74,11 +74,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -12,9 +12,9 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) - #include "content/public/common/network_service_util.h" -@@ -160,10 +160,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + #if BUILDFLAG(ENABLE_EXTENSIONS) + #include "extensions/common/constants.h" +@@ -137,10 +137,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -429,10 +429,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -349,10 +349,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -485,10 +485,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -397,10 +397,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -53,9 +53,9 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -610,7 +610,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - insecure_stub_resolver_enabled, secure_dns_mode, - std::move(dns_over_https_servers)); +@@ -485,7 +485,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + // NetworkContext is created, but before anything has the chance to use it. + stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -33,7 +33,7 @@ +@@ -36,7 +36,7 @@ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" #endif @@ -9,7 +9,25 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #endif -@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -49,7 +49,7 @@ namespace { + + #if !defined(OS_CHROMEOS) + bool NativeNotificationsEnabled(Profile* profile) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (profile) { + PrefService* prefs = profile->GetPrefs(); + if (!prefs->GetBoolean(prefs::kAllowNativeNotifications)) +@@ -131,7 +131,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer + // static + void NotificationDisplayServiceImpl::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); + #endif + } +@@ -148,7 +148,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique()); Index: head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -189,7 +189,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( base::TimeDelta::FromSeconds(20)); #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -8,4 +8,4 @@ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr notifier = std::make_unique( - IdentityManagerFactory::GetForProfile(profile)); + profile); Index: head/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ head/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2019-09-16 07:21:37 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2020-05-13 18:39:38 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc -@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c +@@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c } switch (static_cast(int_value)) { case BrowserSigninMode::kForced: Index: head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,18 +1,9 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -118,7 +118,7 @@ - #endif - - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" - #endif - -@@ -355,11 +355,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - { key::kWebComponentsV0Enabled, - prefs::kWebComponentsV0Enabled, +@@ -1162,11 +1162,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, + #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) + -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, @@ -20,24 +11,20 @@ base::Value::Type::BOOLEAN }, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_POSIX) - { key::kNtlmV2Enabled, - prefs::kNtlmV2Enabled, -@@ -1163,7 +1163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, + + #if !defined(OS_MACOSX) + { key::kFullscreenAllowed, +@@ -1234,11 +1234,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - { key::kAlternativeBrowserPath, - browser_switcher::prefs::kAlternativeBrowserPath, - base::Value::Type::STRING }, -@@ -1203,7 +1203,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - browser_switcher::prefs::kChromeParameters, - base::Value::Type::LIST }, - #endif --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) - { key::kBrowserGuestModeEnforced, - prefs::kBrowserGuestModeEnforced, + #endif // BUILDFLAG(ENABLE_SPELLCHECK) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + { key::kAllowNativeNotifications, + prefs::kAllowNativeNotifications, base::Value::Type::BOOLEAN }, +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + { key::kRequiredClientCertificateForUser, Index: head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-02-03 21:52:40 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -250,6 +250,8 @@ class PolicyTestCase { +@@ -296,6 +296,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); Index: head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -360,7 +360,7 @@ +@@ -375,7 +375,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1022,7 +1022,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1078,7 +1078,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ Index: head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2020-05-13 18:39:38 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -187,7 +187,7 @@ const char* const kPersistentPrefNames[] = { +@@ -133,7 +133,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif Index: head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ head/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-03-16 18:39:44 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -108,7 +108,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -135,7 +135,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; Index: head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1702,7 +1702,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1678,7 +1678,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1744,7 +1744,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1720,7 +1720,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2059,7 +2059,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); Index: head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py +++ head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -1,19 +0,0 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py -@@ -31,6 +31,7 @@ def PlatformTypes(): - "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, - "chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS, - "linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, -+ "bsd": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, - "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC, - "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS, - } -@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera - 'Outfile must have a %d for version and %s for platform.') - parser.add_option('-t', '--type', - help='The platform type. One of android, chromeos, ' + -- 'linux, mac, win') -+ 'linux, bsd, mac, win') - - def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command): - if opts.type is not None: Index: head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-10-21 19:06:23 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -19,7 +19,7 @@ cr.define('settings', function() { +@@ -24,7 +24,7 @@ cr.define('settings', function() { useDefaultTheme() {} @@ -9,7 +9,7 @@ useSystemTheme() {} // -@@ -59,7 +59,7 @@ cr.define('settings', function() { +@@ -64,7 +64,7 @@ cr.define('settings', function() { chrome.send('useDefaultTheme'); } Index: head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ head/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -49,7 +49,7 @@ +@@ -52,7 +52,7 @@ @@ -9,7 +9,7 @@ @@ -18,7 +18,7 @@