Index: www/iridium/Makefile =================================================================== --- www/iridium/Makefile +++ www/iridium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= iridium -PORTVERSION= 2019.04.73 -PORTREVISION= 3 +PORTVERSION= 2019.11.78 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -15,19 +14,22 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -BUILD_DEPENDS= gperf:devel/gperf \ +BUILD_DEPENDS= bash:shells/bash \ + gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ - bash:shells/bash \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} +BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous +ONLY_FOR_ARCHS= aarch64 amd64 i386 + LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ @@ -61,8 +63,6 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -ONLY_FOR_ARCHS= amd64 i386 - USES= bison desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg USE_GL= gl @@ -79,6 +79,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang +# TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) +# # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host @@ -106,15 +108,17 @@ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" +### SHIT FROM GOOGLE YOU SHOULD DISABLE ### +# enable_hangout_services_extension=true # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles -SUB_FILES= iridium-browser.desktop iridium +SUB_FILES= iridium-browser.desktop iridium pkg-message SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS -CODECS_DESC= Compile and enable patented codecs like H.264 +CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO @@ -141,14 +145,15 @@ DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ + GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ - WANTSPACE="lots of free diskspace (~ 13GB)" + WANTSPACE="lots of free disk space (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ + GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ - GN_ARGS+=remove_webcore_debug_symbols=true \ - WANTSPACE="a fair amount of free diskspace (~ 6.5GB)" + WANTSPACE="a fair amount of free disk space (~ 6.5GB)" KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false @@ -159,8 +164,7 @@ # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not -# support falling back to ALSA. In theory it supports falling back to -# PulseAudio, but this is untested. +# support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true @@ -179,6 +183,15 @@ MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include +.include + +# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only +.if ${ARCH} == aarch64 +PLIST_SUB+= NOT_AARCH64="@comment " +.else +PLIST_SUB+= NOT_AARCH64="" +.endif + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Iridium, you should have around 2GB of memory" @@ -197,8 +210,8 @@ @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: - # We used to remove bundled libraries to be sure that iridium uses - # system libraries and not shippen ones. + # We used to remove bundled libraries to be sure that chromium uses + # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ @@ -217,22 +230,24 @@ @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node - # Setup java dependency + # Setup java dependency on amd64 and i386 +.if ${ARCH} == amd64 || ${ARCH} == i386 @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java +.endif do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/iridium.1 -.for s in 22 24 48 64 128 256 + ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png +.for s in 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/iridium.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} - .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor @@ -245,22 +260,30 @@ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin - # ANGLE -.for f in libEGL.so libGLESv2.so + # ANGLE, EGL, Vk +.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor +.if ${BUILDTYPE} == Debug +.for f in libVkLayer_core_validation.so libVkLayer_object_lifetimes.so libVkLayer_stateless_validation.so \ + libVkLayer_thread_safety.so libVkLayer_unique_objects.so + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} +.endfor # SwiftShader +.if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor +.endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} +.endif .include Index: www/iridium/distinfo =================================================================== --- www/iridium/distinfo +++ www/iridium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555346051 -SHA256 (iridium-browser-2019.04.73.tar.xz) = f0361626a577f2c6d2a6389ea2a7cdd692fcba96229be38c84117fe0b22364a5 -SIZE (iridium-browser-2019.04.73.tar.xz) = 729035472 +TIMESTAMP = 1577996478 +SHA256 (iridium-browser-2019.11.78.tar.xz) = 8daa53114d515d55ee9060761e2201fb97f505fa948e2479c3b8de8a9a18f57c +SIZE (iridium-browser-2019.11.78.tar.xz) = 762059352 Index: www/iridium/files/extra-patch-clang =================================================================== --- www/iridium/files/extra-patch-clang +++ www/iridium/files/extra-patch-clang @@ -38,17 +38,6 @@ EXPECT_CALL(callback_, OnError()).Times(2); ---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc -@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) - std::vector::iterator it; - it = std::remove(tasks_.begin(), - tasks_.end(), -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - - tasks_.erase(it, tasks_.end()); - tasks_running_ = false; --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc @@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder( Index: www/iridium/files/patch-BUILD.gn =================================================================== --- www/iridium/files/patch-BUILD.gn +++ www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- BUILD.gn.orig 2019-10-21 19:06:17 UTC +++ BUILD.gn -@@ -381,7 +381,7 @@ group("gn_all") { +@@ -404,7 +404,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -422,8 +422,6 @@ group("gn_all") { +@@ -445,8 +445,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,10 +18,10 @@ "//testing:empty_main", ] -@@ -480,10 +478,6 @@ group("gn_all") { +@@ -501,10 +499,6 @@ group("gn_all") { + "//chrome/test:load_library_perf_tests", + "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", - "//chrome/test/chromedriver:chromedriver_tests", - "//components/sync:run_sync_testserver", - "//courgette:courgette", - "//courgette:courgette_fuzz", - "//courgette:courgette_minimal_tool", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -538,10 +532,6 @@ group("gn_all") { +@@ -560,10 +554,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -615,7 +605,7 @@ group("gn_all") { +@@ -637,7 +627,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,15 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -873,7 +863,6 @@ if (is_chromeos) { +@@ -776,7 +766,6 @@ group("gn_all") { + "//chrome/browser/vr:vr_common_perftests", + "//chrome/browser/vr:vr_common_unittests", + "//chrome/browser/vr:vr_pixeltests", +- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", + ] + if (is_desktop_linux && use_ozone) { + deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] +@@ -896,7 +885,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -57,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1001,7 +990,7 @@ if (!is_ios) { +@@ -1065,7 +1053,7 @@ if (!is_ios) { ] } @@ -66,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1010,7 +999,7 @@ if (!is_ios) { +@@ -1074,7 +1062,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1150,9 +1139,6 @@ group("chromium_builder_perf") { +@@ -1216,9 +1204,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] Index: www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc =================================================================== --- www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc +++ www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() +@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; Index: www/iridium/files/patch-base_BUILD.gn =================================================================== --- www/iridium/files/patch-base_BUILD.gn +++ www/iridium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- base/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ base/BUILD.gn -@@ -1185,7 +1185,7 @@ jumbo_component("base") { +@@ -1266,7 +1266,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. @@ -9,7 +9,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1211,7 +1211,7 @@ jumbo_component("base") { +@@ -1292,7 +1292,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +18,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1751,6 +1751,33 @@ jumbo_component("base") { +@@ -1893,6 +1893,33 @@ jumbo_component("base") { } } @@ -52,7 +52,7 @@ # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2808,6 +2835,12 @@ test("base_unittests") { +@@ -3041,6 +3068,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } Index: www/iridium/files/patch-base_allocator_allocator__shim.cc =================================================================== --- www/iridium/files/patch-base_allocator_allocator__shim.cc +++ www/iridium/files/patch-base_allocator_allocator__shim.cc @@ -1,11 +1,11 @@ ---- base/allocator/allocator_shim.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC +++ base/allocator/allocator_shim.cc -@@ -70,7 +70,7 @@ inline const allocator::AllocatorDispatch* GetChainHea +@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. - return reinterpret_cast( + return reinterpret_cast( -#if defined(OS_LINUX) && defined(__clang__) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) - *static_cast(&g_chain_head) + *static_cast(&g_chain_head) #else - subtle::NoBarrier_Load(&g_chain_head) + base::subtle::NoBarrier_Load(&g_chain_head) Index: www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc =================================================================== --- www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,15 +1,14 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -3,19 +3,28 @@ - // found in the LICENSE file. - +@@ -5,18 +5,28 @@ #include "base/allocator/allocator_shim.h" + + #include +-#include +#include +#include +#include --#include -- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. @@ -23,13 +22,13 @@ -void __libc_free(void* ptr); +void* __malloc(size_t size); +void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t size); ++void* __realloc(void* address, size_t len); +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} +int __posix_memalign(void **ptr, size_t alignment, size_t size); @@ -37,7 +36,7 @@ } // extern "C" namespace { -@@ -23,32 +32,32 @@ namespace { +@@ -24,32 +34,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { Index: www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc =================================================================== --- www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc +++ www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC -+++ base/allocator/partition_allocator/page_allocator.cc -@@ -115,7 +115,7 @@ void* AllocPages(void* address, - uintptr_t align_base_mask = ~align_offset_mask; - DCHECK(!(reinterpret_cast(address) & align_offset_mask)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // On 64 bit Linux, we may need to adjust the address space limit for - // guarded allocations. - if (length >= kMinimumGuardedMemorySize) { Index: www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h =================================================================== --- www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,38 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-03-11 22:00:51 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-10-21 19:06:18 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -14,7 +14,7 @@ - #if defined(OS_MACOSX) - #include +@@ -19,7 +19,7 @@ + #if defined(OS_ANDROID) + #include #endif -#if defined(OS_LINUX) +#if defined(OS_BSD) || defined(OS_LINUX) #include #include -@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce - } - } - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - // Multiple guarded memory regions may exceed the process address space limit. - // This function will raise or lower the limit by |amount|. -@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) { - // schemes that reduce that to 4 GiB. - constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB - --#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - void* SystemAllocPagesInternal(void* hint, - size_t length, -@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal( - void FreePagesInternal(void* address, size_t length) { - CHECK(!munmap(address, length)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // Restore the address space limit. - if (length >= kMinimumGuardedMemorySize) { - CHECK(AdjustAddressSpaceLimit(-base::checked_cast(length))); Index: www/iridium/files/patch-base_base__switches.h =================================================================== --- www/iridium/files/patch-base_base__switches.h +++ www/iridium/files/patch-base_base__switches.h @@ -0,0 +1,20 @@ +--- base/base_switches.h.orig 2019-10-21 19:06:18 UTC ++++ base/base_switches.h +@@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[]; + extern const char kDisableUsbKeyboardDetect[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kDisableDevShmUsage[]; + #endif + +@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[]; + extern const char kOrderfileMemoryOptimization[]; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kEnableThreadInstructionCount[]; + #endif + Index: www/iridium/files/patch-base_base__switches.cc =================================================================== --- www/iridium/files/patch-base_base__switches.cc +++ www/iridium/files/patch-base_base__switches.cc @@ -0,0 +1,20 @@ +--- base/base_switches.cc.orig 2019-10-21 19:06:18 UTC ++++ base/base_switches.cc +@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t + const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The /dev/shm partition is too small in certain VM environments, causing + // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to + // work-around this issue (a temporary directory will always be used to create +@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] = + const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Controls whether or not retired instruction counts are surfaced for threads + // in trace events on Linux. + // Index: www/iridium/files/patch-base_cpu.cc =================================================================== --- www/iridium/files/patch-base_cpu.cc +++ www/iridium/files/patch-base_cpu.cc @@ -0,0 +1,38 @@ +--- base/cpu.cc.orig 2019-10-21 19:06:18 UTC ++++ base/cpu.cc +@@ -14,7 +14,7 @@ + + #include "base/stl_util.h" + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #include "base/files/file_util.h" + #endif + +@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) { + + #endif // ARCH_CPU_X86_FAMILY + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + std::string* CpuInfoBrand() { + static std::string* brand = []() { + // This function finds the value from /proc/cpuinfo under the key "model +@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() { + return brand; + } + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || +- // defined(OS_LINUX)) ++ // defined(OS_LINUX) || defined(OS_BSD)) + + } // namespace + +@@ -287,7 +287,7 @@ void CPU::Initialize() { + } + } + #elif defined(ARCH_CPU_ARM_FAMILY) +-#if (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in Index: www/iridium/files/patch-base_debug_debugger__posix.cc =================================================================== --- www/iridium/files/patch-base_debug_debugger__posix.cc +++ www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/debugger_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/debug/debugger_posix.cc -@@ -86,7 +86,7 @@ bool BeingDebugged() { +@@ -90,7 +90,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -94,33 +94,35 @@ bool BeingDebugged() { +@@ -98,33 +98,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. Index: www/iridium/files/patch-base_debug_elf__reader.cc =================================================================== --- www/iridium/files/patch-base_debug_elf__reader.cc +++ www/iridium/files/patch-base_debug_elf__reader.cc @@ -0,0 +1,18 @@ +--- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC ++++ base/debug/elf_reader.cc +@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + reinterpret_cast(elf_base + header.p_vaddr); + bool found = false; + while (current_note < section_end) { ++#if !defined(OS_BSD) + if (current_note->n_type == NT_GNU_BUILD_ID) { + const char* note_name = + reinterpret_cast(current_note) + sizeof(Nhdr); +@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + break; + } + } ++#endif + + current_note = reinterpret_cast( + reinterpret_cast(current_note) + sizeof(Nhdr) + Index: www/iridium/files/patch-base_debug_elf__reader__linux.cc =================================================================== --- www/iridium/files/patch-base_debug_elf__reader__linux.cc +++ www/iridium/files/patch-base_debug_elf__reader__linux.cc @@ -1,13 +0,0 @@ ---- base/debug/elf_reader_linux.cc.orig 2019-03-11 22:00:51 UTC -+++ base/debug/elf_reader_linux.cc -@@ -41,8 +41,10 @@ Optional ElfSegmentBuildIDNoteAsString(co - const void* section_end = segment.data() + segment.size_bytes(); - const Nhdr* note_header = reinterpret_cast(segment.data()); - while (note_header < section_end) { -+#if !defined(OS_BSD) - if (note_header->n_type == NT_GNU_BUILD_ID) - break; -+#endif - note_header = reinterpret_cast( - reinterpret_cast(note_header) + sizeof(Nhdr) + - bits::Align(note_header->n_namesz, 4) + Index: www/iridium/files/patch-base_debug_stack__trace.h =================================================================== --- www/iridium/files/patch-base_debug_stack__trace.h +++ www/iridium/files/patch-base_debug_stack__trace.h @@ -1,9 +1,9 @@ ---- base/debug/stack_trace.h.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace.h.orig 2019-09-09 21:55:05 UTC +++ base/debug/stack_trace.h -@@ -16,6 +16,7 @@ - #include "build/build_config.h" - - #if defined(OS_POSIX) +@@ -19,6 +19,7 @@ + #if !defined(OS_NACL) + #include + #endif +#include #include #endif Index: www/iridium/files/patch-base_debug_stack__trace__posix.cc =================================================================== --- www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper { +@@ -657,6 +657,11 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -21,7 +21,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper { +@@ -674,6 +679,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; Index: www/iridium/files/patch-base_files_file__path__unittest.cc =================================================================== --- www/iridium/files/patch-base_files_file__path__unittest.cc +++ www/iridium/files/patch-base_files_file__path__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_unittest.cc.orig 2019-04-30 22:22:28 UTC +++ base/files/file_path_unittest.cc -@@ -1138,7 +1138,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1139,7 +1139,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; Index: www/iridium/files/patch-base_files_file__path__watcher.cc =================================================================== --- www/iridium/files/patch-base_files_file__path__watcher.cc +++ www/iridium/files/patch-base_files_file__path__watcher.cc @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.cc.orig 2019-07-29 18:12:09 UTC ++++ base/files/file_path_watcher.cc +@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() { + // static + bool FilePathWatcher::RecursiveWatchAvailable() { + #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + return true; + #else + // FSEvents isn't available on iOS. Index: www/iridium/files/patch-base_files_file__path__watcher__unittest.cc =================================================================== --- www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); Index: www/iridium/files/patch-base_files_file__util.h =================================================================== --- www/iridium/files/patch-base_files_file__util.h +++ www/iridium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2019-03-11 22:00:51 UTC +--- base/files/file_util.h.orig 2019-10-21 19:06:18 UTC +++ base/files/file_util.h -@@ -445,7 +445,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -497,7 +497,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); Index: www/iridium/files/patch-base_files_file__util__posix.cc =================================================================== --- www/iridium/files/patch-base_files_file__util__posix.cc +++ www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,7 +1,7 @@ ---- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC +--- base/files/file_util_posix.cc.orig 2019-10-21 19:06:18 UTC +++ base/files/file_util_posix.cc -@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path, - #endif // !defined(OS_NACL_NONSFI) +@@ -426,7 +426,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, + } bool CreateLocalNonBlockingPipe(int fds[2]) { -#if defined(OS_LINUX) Index: www/iridium/files/patch-base_files_memory__mapped__file__posix.cc =================================================================== --- www/iridium/files/patch-base_files_memory__mapped__file__posix.cc +++ www/iridium/files/patch-base_files_memory__mapped__file__posix.cc @@ -1,11 +0,0 @@ ---- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC -+++ base/files/memory_mapped_file_posix.cc -@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory( - // Only Android API>=21 supports the fallocate call. Older versions need - // to manually extend the file by writing zeros at block intervals. - do_manual_extension = true; -+#elif defined(OS_BSD) -+ do_manual_extension = true; - #elif defined(OS_MACOSX) - // MacOS doesn't support fallocate even though their new APFS filesystem - // does support sparse files. It does, however, have the functionality Index: www/iridium/files/patch-base_files_scoped__file.cc =================================================================== --- www/iridium/files/patch-base_files_scoped__file.cc +++ www/iridium/files/patch-base_files_scoped__file.cc @@ -0,0 +1,11 @@ +--- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC ++++ base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and Index: www/iridium/files/patch-base_i18n_icu__util.cc =================================================================== --- www/iridium/files/patch-base_i18n_icu__util.cc +++ www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/i18n/icu_util.cc.orig 2019-07-24 18:58:02 UTC +++ base/i18n/icu_util.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -315,7 +315,7 @@ bool InitializeICU() { +@@ -285,7 +285,7 @@ bool InitializeICU() { // TODO(jungshik): Some callers do not care about tz at all. If necessary, // add a boolean argument to this function to init'd the default tz only // when requested. Index: www/iridium/files/patch-base_logging__unittest.cc =================================================================== --- www/iridium/files/patch-base_logging__unittest.cc +++ www/iridium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/logging_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/logging_unittest.cc -@@ -420,7 +420,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -590,7 +590,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; Index: www/iridium/files/patch-base_memory_platform__shared__memory__region.h =================================================================== --- www/iridium/files/patch-base_memory_platform__shared__memory__region.h +++ www/iridium/files/patch-base_memory_platform__shared__memory__region.h @@ -0,0 +1,29 @@ +--- base/memory/platform_shared_memory_region.h.orig 2019-09-16 12:06:15 UTC ++++ base/memory/platform_shared_memory_region.h +@@ -28,7 +28,7 @@ + #include "base/files/scoped_file.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + namespace content { + class SandboxIPCHandler; + } +@@ -122,7 +122,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Structure to limit access to executable region creation. + struct ExecutableRegion { + private: +@@ -276,7 +276,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + CheckPlatformHandlePermissionsCorrespondToMode); + static PlatformSharedMemoryRegion Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable = false + #endif Index: www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc =================================================================== --- www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -0,0 +1,38 @@ +--- base/memory/platform_shared_memory_region_posix.cc.orig 2019-09-16 12:05:39 UTC ++++ base/memory/platform_shared_memory_region_posix.cc +@@ -76,7 +76,7 @@ FDPair ScopedFDPair::get() const { + return {fd.get(), readonly_fd.get()}; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { + PlatformSharedMemoryRegion region = +@@ -85,7 +85,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: + return region.PassPlatformHandle().fd; + return ScopedFD(); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( +@@ -224,7 +224,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable + #endif +@@ -255,7 +255,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + // flag. + FilePath directory; + if (!GetShmemTempDir( +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + executable, + #else + false /* executable */, Index: www/iridium/files/patch-base_memory_protected__memory__posix.cc =================================================================== --- www/iridium/files/patch-base_memory_protected__memory__posix.cc +++ www/iridium/files/patch-base_memory_protected__memory__posix.cc @@ -0,0 +1,31 @@ +--- base/memory/protected_memory_posix.cc.orig 2019-05-01 17:25:41 UTC ++++ base/memory/protected_memory_posix.cc +@@ -8,9 +8,9 @@ + #include + #include + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_MACOSX) && !defined(OS_IOS) + #include +@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start + return SetMemory(start, end, PROT_READ); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void AssertMemoryIsReadOnly(const void* ptr) { + #if DCHECK_IS_ON() + const uintptr_t page_mask = ~(base::GetPageSize() - 1); +@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) { + DCHECK_EQ(region_info.protection, VM_PROT_READ); + #endif // DCHECK_IS_ON() + } +-#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) ++#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) + + } // namespace base Index: www/iridium/files/patch-base_numerics_safe__math__shared__impl.h =================================================================== --- www/iridium/files/patch-base_numerics_safe__math__shared__impl.h +++ www/iridium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,13 +1,12 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2019-03-11 22:00:51 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2019-09-09 21:55:05 UTC +++ base/numerics/safe_math_shared_impl.h -@@ -19,9 +19,7 @@ - +@@ -23,8 +23,7 @@ // Where available use builtin math overflow support on Clang and GCC. - #if !defined(__native_client__) && \ -- ((defined(__clang__) && \ -- ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -+ ((defined(__clang__) && (__clang_major__ > 6)) || \ - (defined(__GNUC__) && __GNUC__ >= 5)) + #elif !defined(__native_client__) && \ + ((defined(__clang__) && \ +- ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ ++ (__clang_major__ > 6)) || \ + (defined(__GNUC__) && __GNUC__ >= 5)) #include "base/numerics/safe_math_clang_gcc_impl.h" #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) Index: www/iridium/files/patch-base_process_kill.h =================================================================== --- www/iridium/files/patch-base_process_kill.h +++ www/iridium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2019-03-11 22:00:51 UTC +--- base/process/kill.h.orig 2019-06-04 18:55:15 UTC +++ base/process/kill.h -@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); @@ -9,3 +9,8 @@ // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #endif // defined(OS_POSIX) + + // Registers |process| to be asynchronously monitored for termination, forcibly Index: www/iridium/files/patch-base_process_kill__posix.cc =================================================================== --- www/iridium/files/patch-base_process_kill__posix.cc +++ www/iridium/files/patch-base_process_kill__posix.cc @@ -1,4 +1,4 @@ ---- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/kill_posix.cc @@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); @@ -9,3 +9,12 @@ void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); +@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) { + PlatformThread::CreateNonJoinable( + 0, new BackgroundReaper(std::move(process), TimeDelta())); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #endif // !defined(OS_MACOSX) + #endif // !defined(OS_NACL_NONSFI) Index: www/iridium/files/patch-base_process_launch.h =================================================================== --- www/iridium/files/patch-base_process_launch.h +++ www/iridium/files/patch-base_process_launch.h @@ -1,20 +1,20 @@ ---- base/process/launch.h.orig 2019-03-11 22:00:51 UTC +--- base/process/launch.h.orig 2019-06-04 18:55:15 UTC +++ base/process/launch.h -@@ -175,7 +175,7 @@ struct BASE_EXPORT LaunchOptions { - FileHandleMappingVector fds_to_remap; - #endif // defined(OS_WIN) +@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions { + bool clear_environment = false; + #endif // OS_WIN || OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -188,7 +188,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - // If valid, launches the application in that job object. + #if defined(OS_MACOSX) && !defined(OS_IOS) + // Mach ports that will be accessible to the child process. These are not Index: www/iridium/files/patch-base_process_launch__posix.cc =================================================================== --- www/iridium/files/patch-base_process_launch__posix.cc +++ www/iridium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/launch_posix.cc -@@ -64,6 +64,7 @@ +@@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" #endif Index: www/iridium/files/patch-base_process_memory.h =================================================================== --- www/iridium/files/patch-base_process_memory.h +++ www/iridium/files/patch-base_process_memory.h @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2019-03-11 22:00:51 UTC +--- base/process/memory.h.orig 2019-10-21 19:06:18 UTC +++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); +@@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); Index: www/iridium/files/patch-base_process_memory__unittest.cc =================================================================== --- www/iridium/files/patch-base_process_memory__unittest.cc +++ www/iridium/files/patch-base_process_memory__unittest.cc @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/memory_unittest.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/memory_unittest.cc @@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) { // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan @@ -9,7 +9,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -527,5 +527,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == nullptr); } Index: www/iridium/files/patch-base_process_process__handle.h =================================================================== --- www/iridium/files/patch-base_process_process__handle.h +++ www/iridium/files/patch-base_process_process__handle.h @@ -1,8 +1,8 @@ ---- base/process/process_handle.h.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.h -@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); - // a process's PID. - BASE_EXPORT uint32_t GetUniqueIdForProcess(); +@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); + // processes may be reused. + BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) Index: www/iridium/files/patch-base_process_process__handle.cc =================================================================== --- www/iridium/files/patch-base_process_process__handle.cc +++ www/iridium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.cc -@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() { - return g_unique_id; +@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { + : UniqueProcId(GetCurrentProcId()); } -#if defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { - g_unique_id = MangleProcessId(pid_outside_of_namespace); + DCHECK(pid_outside_of_namespace != kNullProcessId); Index: www/iridium/files/patch-base_process_process__metrics.h =================================================================== --- www/iridium/files/patch-base_process_process__metrics.h +++ www/iridium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -44,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -53,7 +53,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -62,16 +62,16 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); + BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. - // -@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,33 +80,52 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int swap_free = 0; #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) int buffers = 0; int cached = 0; - int active_anon = 0; -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int inactive_file = 0; int dirty = 0; int reclaimable = 0; - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -- // defined(OS_FUCHSIA) -+ // defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || + // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) - int shmem = 0; -@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#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_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. +@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis + // Returns the amount of time spent in user space since boot across all CPUs. + BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); + +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + // Data from files in directory /sys/block/zram0 about ZRAM usage. +@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; Index: www/iridium/files/patch-base_process_process__metrics.cc =================================================================== --- www/iridium/files/patch-base_process_process__metrics.cc +++ www/iridium/files/patch-base_process_process__metrics.cc @@ -1,5 +1,23 @@ ---- base/process/process_metrics.cc.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr SystemMetrics::ToValue() const + std::unique_ptr res(new DictionaryValue()); + + res->SetIntKey("committed_memory", static_cast(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr meminfo = memory_info_.ToValue(); + std::unique_ptr vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif Index: www/iridium/files/patch-base_process_process__metrics__freebsd.cc =================================================================== --- www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics_freebsd.cc @@ -5,6 +5,7 @@ #include "base/process/process_metrics.h" @@ -8,7 +8,7 @@ #include #include #include -@@ -14,11 +15,15 @@ +@@ -14,11 +15,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -18,7 +18,21 @@ +#include + namespace base { ++namespace { ++int GetPageShift() { ++ int pagesize = getpagesize(); ++ int pageshift = 0; ++ ++ while (pagesize > 1) { ++ pageshift++; ++ pagesize >>= 1; ++ } ++ ++ return pageshift; ++} ++} ++ ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -26,7 +40,7 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -110,13 +124,136 @@ + return total_count; +} + ++size_t ProcessMetrics::GetResidentSetSize() const { ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t rss; ++ ++ if (nproc > 0) { ++ rss = pp->ki_rssize << GetPageShift(); ++ } else { ++ rss = 0; ++ } ++ ++ kvm_close(kd); ++ return rss; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ NOTIMPLEMENTED(); -+ return 0; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t swrss; ++ ++ if (nproc > 0) { ++ swrss = pp->ki_swrss > pp->ki_rssize ++ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() ++ : 0; ++ } else { ++ swrss = 0; ++ } ++ ++ kvm_close(kd); ++ return swrss; +} + +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; ++} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast(reads)); ++ res->SetDouble("reads_merged", static_cast(reads_merged)); ++ res->SetDouble("sectors_read", static_cast(sectors_read)); ++ res->SetDouble("read_time", static_cast(read_time)); ++ res->SetDouble("writes", static_cast(writes)); ++ res->SetDouble("writes_merged", static_cast(writes_merged)); ++ res->SetDouble("sectors_written", static_cast(sectors_written)); ++ res->SetDouble("write_time", static_cast(write_time)); ++ res->SetDouble("io", static_cast(io)); ++ res->SetDouble("io_time", static_cast(io_time)); ++ res->SetDouble("weighted_io_time", static_cast(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++std::unique_ptr SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("total", total); ++ res->SetIntKey("free", free); ++ res->SetIntKey("available", available); ++ res->SetIntKey("buffers", buffers); ++ res->SetIntKey("cached", cached); ++ res->SetIntKey("active_anon", active_anon); ++ res->SetIntKey("inactive_anon", inactive_anon); ++ res->SetIntKey("active_file", active_file); ++ res->SetIntKey("inactive_file", inactive_file); ++ res->SetIntKey("swap_total", swap_total); ++ res->SetIntKey("swap_free", swap_free); ++ res->SetIntKey("swap_used", swap_total - swap_free); ++ res->SetIntKey("dirty", dirty); ++ res->SetIntKey("reclaimable", reclaimable); ++ ++ return res; ++} ++ ++std::unique_ptr VmStatInfo::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("pswpin", pswpin); ++ res->SetIntKey("pswpout", pswpout); ++ res->SetIntKey("pgmajfault", pgmajfault); ++ return res; +} } // namespace base Index: www/iridium/files/patch-base_process_process__metrics__posix.cc =================================================================== --- www/iridium/files/patch-base_process_process__metrics__posix.cc +++ www/iridium/files/patch-base_process_process__metrics__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_metrics_posix.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics_posix.cc -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ #if defined(OS_MACOSX) #include @@ -9,7 +9,7 @@ #else #include #endif -@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -117,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() { #else return minfo.hblkhd + minfo.arena; #endif Index: www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc =================================================================== --- www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include #include #include Index: www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc =================================================================== --- www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -0,0 +1,24 @@ +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-09-09 21:55:05 UTC ++++ base/sampling_heap_profiler/sampling_heap_profiler.cc +@@ -29,6 +29,10 @@ + #include + #endif + ++#if defined(OS_BSD) ++#include ++#endif ++ + #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ + defined(OFFICIAL_BUILD) + #include "base/trace_event/cfi_backtrace_android.h" +@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() { + #elif defined(OS_MACOSX) + int err = pthread_getname_np(pthread_self(), name, kBufferLen); + if (err == 0 && *name != '\0') ++ return strdup(name); ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 ++ pthread_get_name_np(pthread_self(), name, kBufferLen); ++ if (*name != '\0') + return strdup(name); + #endif // defined(OS_LINUX) || defined(OS_ANDROID) + Index: www/iridium/files/patch-base_security__unittest.cc =================================================================== --- www/iridium/files/patch-base_security__unittest.cc +++ www/iridium/files/patch-base_security__unittest.cc @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/security_unittest.cc.orig 2019-04-30 22:22:28 UTC +++ base/security_unittest.cc -@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu +@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { Index: www/iridium/files/patch-base_syslog__logging.cc =================================================================== --- www/iridium/files/patch-base_syslog__logging.cc +++ www/iridium/files/patch-base_syslog__logging.cc @@ -0,0 +1,20 @@ +--- base/syslog_logging.cc.orig 2019-10-21 19:06:18 UTC ++++ base/syslog_logging.cc +@@ -14,7 +14,7 @@ + #include "base/debug/stack_trace.h" + #include "base/strings/string_util.h" + #include "base/win/win_util.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // defines LOG_INFO, LOG_WARNING macros that could conflict with + // base::LOG_INFO, base::LOG_WARNING. + #include +@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() { + + if (user_sid != nullptr) + ::LocalFree(user_sid); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + const char kEventSource[] = "chrome"; + openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); + // We can't use the defined names for the logging severity from syslog.h Index: www/iridium/files/patch-base_system_sys__info.h =================================================================== --- www/iridium/files/patch-base_system_sys__info.h +++ www/iridium/files/patch-base_system_sys__info.h @@ -0,0 +1,11 @@ +--- base/system/sys_info.h.orig 2019-06-04 18:55:15 UTC ++++ base/system/sys_info.h +@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo { + static bool IsLowEndDeviceImpl(); + static HardwareInfo GetHardwareInfoSync(); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + static int64_t AmountOfAvailablePhysicalMemory( + const SystemMemoryInfoKB& meminfo); + #endif Index: www/iridium/files/patch-base_system_sys__info__freebsd.cc =================================================================== --- www/iridium/files/patch-base_system_sys__info__freebsd.cc +++ www/iridium/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/system/sys_info_freebsd.cc.orig 2019-09-09 21:55:05 UTC +++ base/system/sys_info_freebsd.cc -@@ -13,26 +13,58 @@ +@@ -13,26 +13,46 @@ namespace base { int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -45,8 +45,8 @@ } - return static_cast(limit); + return static_cast((pgfree + pginact + pgcache) * page_size); -+} -+ + } + +// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; @@ -56,16 +56,4 @@ + return name; + return std::string(); +} -+ -+int SysInfo::NumberOfProcessors() { -+ int mib[] = { CTL_HW, HW_NCPU }; -+ int ncpu; -+ size_t size = sizeof(ncpu); -+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) { -+ NOTREACHED(); -+ return 1; -+ } -+ return ncpu; - } - } // namespace base Index: www/iridium/files/patch-base_system_sys__info__posix.cc =================================================================== --- www/iridium/files/patch-base_system_sys__info__posix.cc +++ www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,33 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/system/sys_info_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/system/sys_info_posix.cc -@@ -38,7 +38,7 @@ - - namespace { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) - int NumberOfProcessors() { - // sysconf returns the number of "logical" (not "physical") processors on both - // Mac and Linux. So we get the number of max available "logical" processors. -@@ -64,7 +64,7 @@ int NumberOfProcessors() { - - base::LazyInstance>:: - Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; --#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA) - - #if !defined(OS_FUCHSIA) - int64_t AmountOfVirtualMemory() { -@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, - - namespace base { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) - int SysInfo::NumberOfProcessors() { - return g_lazy_number_of_processors.Get().value(); - } -@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; Index: www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc =================================================================== --- www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc +++ www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc @@ -1,12 +0,0 @@ ---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC -+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc -@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo - EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal); - } - -+#if defined(OS_BSD) -+#define ThreadNamesSet DISABLED_ThreadNamesSet -+#endif - TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) { - constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT, - TaskShutdownBehavior::BLOCK_SHUTDOWN}; Index: www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc =================================================================== --- www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -14,7 +14,7 @@ namespace internal { + TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_NACL) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else Index: www/iridium/files/patch-base_test_fontconfig__util__linux.cc =================================================================== --- www/iridium/files/patch-base_test_fontconfig__util__linux.cc +++ www/iridium/files/patch-base_test_fontconfig__util__linux.cc @@ -0,0 +1,408 @@ +--- base/test/fontconfig_util_linux.cc.orig 2019-04-30 22:22:28 UTC ++++ base/test/fontconfig_util_linux.cc +@@ -6,24 +6,397 @@ + + #include + +-#include +- + #include "base/base_paths.h" + #include "base/environment.h" + #include "base/files/file_path.h" ++#include "base/files/file_util.h" + #include "base/logging.h" ++#include "base/macros.h" + #include "base/path_service.h" ++#include "base/strings/string_util.h" + + namespace base { + ++namespace { ++ ++const char kFontsConfTemplate[] = R"( ++ ++ ++ ++ ++ $1 ++ ++ ++ $2 ++ ++ ++ ++ ++ false ++ ++ ++ ++ ++ ++ Times ++ ++ ++ Tinos ++ ++ ++ ++ ++ ++ sans ++ ++ ++ DejaVu Sans ++ ++ ++ ++ ++ ++ sans serif ++ ++ ++ Arimo ++ ++ ++ ++ ++ ++ ++ Helvetica ++ ++ ++ Arimo ++ ++ ++ ++ ++ ++ sans-serif ++ ++ ++ Arimo ++ ++ ++ ++ ++ ++ serif ++ ++ ++ Tinos ++ ++ ++ ++ ++ ++ mono ++ ++ ++ Cousine ++ ++ ++ ++ ++ ++ monospace ++ ++ ++ Cousine ++ ++ ++ ++ ++ ++ Courier ++ ++ ++ Cousine ++ ++ ++ ++ ++ ++ cursive ++ ++ ++ Comic Sans MS ++ ++ ++ ++ ++ ++ fantasy ++ ++ ++ Impact ++ ++ ++ ++ ++ ++ Monaco ++ ++ ++ Tinos ++ ++ ++ ++ ++ ++ Arial ++ ++ ++ Arimo ++ ++ ++ ++ ++ ++ Courier New ++ ++ ++ Cousine ++ ++ ++ ++ ++ ++ Georgia ++ ++ ++ Gelasio ++ ++ ++ ++ ++ ++ Times New Roman ++ ++ ++ Tinos ++ ++ ++ ++ ++ ++ Verdana ++ ++ ++ ++ Arimo ++ ++ ++ ++ ++ ++ ++ NonAntiAliasedSans ++ ++ ++ Arimo ++ ++ ++ false ++ ++ ++ ++ ++ ++ SlightHintedGeorgia ++ ++ ++ Gelasio ++ ++ ++ hintslight ++ ++ ++ ++ ++ ++ NonHintedSans ++ ++ ++ Arimo ++ ++ ++ ++ hintfull ++ ++ ++ false ++ ++ ++ ++ ++ ++ AutohintedSerif ++ ++ ++ Arimo ++ ++ ++ true ++ ++ ++ hintmedium ++ ++ ++ ++ ++ ++ HintedSerif ++ ++ ++ Arimo ++ ++ ++ false ++ ++ ++ hintmedium ++ ++ ++ ++ ++ ++ FullAndAutoHintedSerif ++ ++ ++ Arimo ++ ++ ++ true ++ ++ ++ hintfull ++ ++ ++ ++ ++ ++ SubpixelEnabledArial ++ ++ ++ Arimo ++ ++ ++ rgb ++ ++ ++ ++ ++ ++ SubpixelDisabledArial ++ ++ ++ Arimo ++ ++ ++ none ++ ++ ++ ++ ++ ++ ++ SubpixelPositioning ++ ++ ++ Tinos ++ ++ ++ ++ ++ ++ ++ SubpixelPositioningAhem ++ ++ ++ ahem ++ ++ ++ ++ ++ ++ SlightHintedTimesNewRoman ++ ++ ++ Tinos ++ ++ ++ hintslight ++ ++ ++ ++ ++ ++ ++ DejaVu Sans ++ ++ ++ ++ ++)"; ++ ++} // namespace ++ + void SetUpFontconfig() { +- FilePath dir_module; +- CHECK(PathService::Get(DIR_MODULE, &dir_module)); ++ std::unique_ptr env = Environment::Create(); ++ if (!env->HasVar("FONTCONFIG_FILE")) { ++ // fonts.conf must be generated on-the-fly since it contains absolute paths ++ // which may be different if ++ // 1. The user moves/renames their build directory (or any parent dirs). ++ // 2. The build directory is mapped on a swarming bot at a location ++ // different from the one the buildbot used. ++ FilePath dir_module; ++ PathService::Get(DIR_MODULE, &dir_module); ++ FilePath font_cache = dir_module.Append("fontconfig_caches"); ++ FilePath test_fonts = dir_module.Append("test_fonts"); ++ std::string fonts_conf = ReplaceStringPlaceholders( ++ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr); + +- std::unique_ptr env(Environment::Create()); +- // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf. +- // Prevent fontconfig from doing this. +- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str())); ++ // Write the data to a different file and then atomically rename it to ++ // fonts.conf. This avoids the file being in a bad state when different ++ // parallel tests call this function at the same time. ++ FilePath fonts_conf_file_temp; ++ if(!CreateTemporaryFileInDir(dir_module, &fonts_conf_file_temp)) ++ CHECK(CreateTemporaryFile(&fonts_conf_file_temp)); ++ CHECK( ++ WriteFile(fonts_conf_file_temp, fonts_conf.c_str(), fonts_conf.size())); ++ FilePath fonts_conf_file = dir_module.Append("fonts.conf"); ++ if (ReplaceFile(fonts_conf_file_temp, fonts_conf_file, nullptr)) ++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file.value()); ++ else ++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file_temp.value()); ++ } + } + + } // namespace base Index: www/iridium/files/patch-base_test_generate__fontconfig__caches.cc =================================================================== --- www/iridium/files/patch-base_test_generate__fontconfig__caches.cc +++ www/iridium/files/patch-base_test_generate__fontconfig__caches.cc @@ -1,7 +1,15 @@ ---- base/test/generate_fontconfig_caches.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/generate_fontconfig_caches.cc.orig 2019-04-30 22:22:28 UTC +++ base/test/generate_fontconfig_caches.cc -@@ -57,7 +57,14 @@ int main() { - base::TearDownFontconfig(); +@@ -52,14 +52,21 @@ int main() { + + // Delete directory before generating fontconfig caches. This will notify + // future fontconfig_caches changes. +- CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); + ++ CHECK(base::DeleteFile(fontconfig_caches, /*recursive=*/true)); + base::SetUpFontconfig(); + FcInit(); + FcFini(); // Check existence of intended fontconfig cache file. +#if defined(OS_BSD) Index: www/iridium/files/patch-base_test_launcher_test__launcher.cc =================================================================== --- www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/launcher/test_launcher.cc.orig 2019-09-09 21:55:05 UTC +++ base/test/launcher/test_launcher.cc -@@ -53,6 +53,7 @@ +@@ -54,6 +54,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) Index: www/iridium/files/patch-base_threading_platform__thread.h =================================================================== --- www/iridium/files/patch-base_threading_platform__thread.h +++ www/iridium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +++ base/threading/platform_thread.h -@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread { +@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); Index: www/iridium/files/patch-base_threading_thread__task__runner__handle.cc =================================================================== --- www/iridium/files/patch-base_threading_thread__task__runner__handle.cc +++ www/iridium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,13 +1,13 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2019-04-30 22:22:28 UTC +++ base/threading/thread_task_runner_handle.cc -@@ -7,6 +7,7 @@ +@@ -8,6 +8,7 @@ #include #include "base/bind.h" +#include "base/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" - #include "base/memory/ptr_util.h" + #include "base/run_loop.h" @@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() { return !!thread_task_runner_tls.Pointer()->Get(); } @@ -16,7 +16,7 @@ // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr overriding_task_runner) { -@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo +@@ -81,6 +83,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo base::Unretained(ttrh->task_runner_.get()), std::move(no_running_during_override))); } Index: www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc =================================================================== --- www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,11 +1,11 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2019-04-30 22:22:28 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ #if defined(OS_MACOSX) #include +#elif defined(OS_BSD) -+#include "stdlib.h" ++#include #else #include #endif Index: www/iridium/files/patch-build_config_BUILD.gn =================================================================== --- www/iridium/files/patch-build_config_BUILD.gn +++ www/iridium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ build/config/BUILD.gn -@@ -162,7 +162,7 @@ config("debug") { +@@ -149,7 +149,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -263,9 +263,7 @@ config("default_libs") { +@@ -247,9 +247,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -342,7 +340,7 @@ config("executable_config") { +@@ -337,7 +335,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] Index: www/iridium/files/patch-build_config_BUILDCONFIG.gn =================================================================== --- www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false @@ -33,7 +33,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -291,10 +291,11 @@ is_android = current_os == "android" +@@ -288,10 +288,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" Index: www/iridium/files/patch-build_config_allocator.gni =================================================================== --- www/iridium/files/patch-build_config_allocator.gni +++ www/iridium/files/patch-build_config_allocator.gni @@ -1,20 +0,0 @@ ---- build/config/allocator.gni.orig 2019-03-11 22:00:52 UTC -+++ build/config/allocator.gni -@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni") - - # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. - if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || -- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { -+ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { - _default_allocator = "none" - } else { - _default_allocator = "tcmalloc" -@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls - # against the debug CRT with "is_nacl=false". - if ((is_linux || is_android || is_mac || - (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && -- !is_tsan && !is_msan) { -+ !is_tsan && !is_msan && !is_bsd) { - _default_use_allocator_shim = true - } else { - _default_use_allocator_shim = false Index: www/iridium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- www/iridium/files/patch-build_config_compiler_BUILD.gn +++ www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/compiler/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ build/config/compiler/BUILD.gn -@@ -53,7 +53,7 @@ declare_args() { +@@ -57,7 +57,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = @@ -9,16 +9,16 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -275,7 +275,7 @@ config("compiler") { +@@ -288,7 +288,7 @@ config("compiler") { + # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { +- !is_mac && !is_ios && current_os != "aix") { ++ !is_mac && !is_ios && current_os != "aix" && !is_bsd) { # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 -@@ -394,7 +394,7 @@ config("compiler") { + ldflags += [ "-Wl,--fatal-warnings" ] + } +@@ -383,7 +383,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,16 +27,16 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -502,7 +502,7 @@ config("compiler") { +@@ -483,7 +483,7 @@ config("compiler") { } } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ - # TODO(hans): Remove this once Clang generates better optimized debug info - # by default. https://crbug.com/765793 -@@ -809,7 +809,7 @@ config("compiler_cpu_abi") { + cflags += [ "-fcrash-diagnostics-dir=" + + rebase_path("//tools/clang/crashreports", root_build_dir) ] + +@@ -753,7 +753,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,16 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1494,7 +1494,7 @@ config("default_warnings") { +@@ -1104,7 +1104,7 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] +- if (!is_win) { ++ if (!is_win && !is_bsd) { + # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) + asmflags = [ "-Wa,-fdebug-compilation-dir,." ] + } +@@ -1493,7 +1493,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -54,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1694,7 +1694,7 @@ config("thin_archive") { +@@ -1722,7 +1722,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -63,16 +72,16 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2278,7 +2278,7 @@ config("symbols") { - # flag, so we can use use -g1 for pnacl and nacl-clang compiles. - # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. - if (!is_nacl || is_clang) { -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } +@@ -2292,7 +2292,7 @@ config("symbols") { + # flag, so we can use use -g1 for pnacl and nacl-clang compiles. + # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. + if (!is_nacl || is_clang) { +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] } + if (use_debug_fission && !is_nacl && !is_android) { -@@ -2299,7 +2299,7 @@ config("symbols") { +@@ -2313,7 +2313,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && Index: www/iridium/files/patch-build_config_compiler_compiler.gni =================================================================== --- www/iridium/files/patch-build_config_compiler_compiler.gni +++ www/iridium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/compiler/compiler.gni.orig 2019-10-21 19:06:18 UTC +++ build/config/compiler/compiler.gni -@@ -179,7 +179,7 @@ declare_args() { +@@ -188,7 +188,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = Index: www/iridium/files/patch-build_config_features.gni =================================================================== --- www/iridium/files/patch-build_config_features.gni +++ www/iridium/files/patch-build_config_features.gni @@ -1,7 +1,7 @@ ---- build/config/features.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/features.gni.orig 2019-10-21 19:06:18 UTC +++ build/config/features.gni -@@ -41,7 +41,7 @@ declare_args() { - } +@@ -26,7 +26,7 @@ declare_args() { + proprietary_codecs = is_chrome_branded || is_chromecast # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast Index: www/iridium/files/patch-build_config_gclient__args.gni =================================================================== --- www/iridium/files/patch-build_config_gclient__args.gni +++ www/iridium/files/patch-build_config_gclient__args.gni @@ -1,11 +0,0 @@ ---- build/config/gclient_args.gni.orig 2019-05-14 18:53:12 UTC -+++ build/config/gclient_args.gni -@@ -2,5 +2,5 @@ - build_with_chromium = true - checkout_android = false - checkout_android_native_support = false --checkout_nacl = true --checkout_oculus_sdk = false -\ No newline at end of file -+checkout_nacl = false -+checkout_oculus_sdk = false Index: www/iridium/files/patch-build_config_linux_pkg-config.py =================================================================== --- www/iridium/files/patch-build_config_linux_pkg-config.py +++ www/iridium/files/patch-build_config_linux_pkg-config.py @@ -1,7 +1,7 @@ ---- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +++ build/config/linux/pkg-config.py -@@ -57,8 +57,12 @@ def SetConfigPath(options): - print "You must specify an architecture via -a if using a sysroot." +@@ -59,8 +59,12 @@ def SetConfigPath(options): + print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) - libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' @@ -15,12 +15,12 @@ os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ def main(): +@@ -109,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if "linux" not in sys.platform: + if "bsd" not in sys.platform: - print "[[],[],[],[],[]]" + print("[[],[],[],[],[]]") return 0 Index: www/iridium/files/patch-build_detect__host__arch.py =================================================================== --- www/iridium/files/patch-build_detect__host__arch.py +++ www/iridium/files/patch-build_detect__host__arch.py @@ -0,0 +1,11 @@ +--- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC ++++ build/detect_host_arch.py +@@ -21,6 +21,8 @@ def HostArch(): + host_arch = 'ia32' + elif host_arch in ['x86_64', 'amd64']: + host_arch = 'x64' ++ elif host_arch.startswith('arm64'): ++ host_arch = 'arm64' + elif host_arch.startswith('arm'): + host_arch = 'arm' + elif host_arch.startswith('aarch64'): Index: www/iridium/files/patch-build_gn__run__binary.py =================================================================== --- www/iridium/files/patch-build_gn__run__binary.py +++ www/iridium/files/patch-build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC +--- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +++ build/gn_run_binary.py -@@ -22,7 +22,7 @@ if not os.path.isabs(path): +@@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] Index: www/iridium/files/patch-build_toolchain_gcc__toolchain.gni =================================================================== --- www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,8 +1,8 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2019-10-21 19:06:18 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -47,6 +47,11 @@ analyzer_wrapper = - rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", - root_build_dir) + " --mode=clang" +@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { + enable_resource_whitelist_generation = false + } +declare_args() { + extra_cxxflags = "" @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -610,13 +615,23 @@ template("clang_toolchain") { +@@ -589,13 +594,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { Index: www/iridium/files/patch-build_toolchain_get__concurrent__links.py =================================================================== --- www/iridium/files/patch-build_toolchain_get__concurrent__links.py +++ www/iridium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +++ build/toolchain/get_concurrent_links.py -@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes(): +@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 Index: www/iridium/files/patch-build_toolchain_linux_BUILD.gn =================================================================== --- www/iridium/files/patch-build_toolchain_linux_BUILD.gn +++ www/iridium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/toolchain/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/linux/BUILD.gn.orig 2019-04-30 22:22:28 UTC +++ build/toolchain/linux/BUILD.gn -@@ -14,7 +14,6 @@ clang_toolchain("clang_arm") { +@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { } clang_toolchain("clang_arm64") { Index: www/iridium/files/patch-cc_BUILD.gn =================================================================== --- www/iridium/files/patch-cc_BUILD.gn +++ www/iridium/files/patch-cc_BUILD.gn @@ -1,15 +1,15 @@ ---- cc/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- cc/BUILD.gn.orig 2019-10-21 19:06:18 UTC +++ cc/BUILD.gn -@@ -548,7 +548,7 @@ cc_test_static_library("test_support") { - "//ui/gl:test_support", - "//ui/latency", - ] +@@ -572,7 +572,7 @@ cc_test_static_library("test_support") { + if (enable_vulkan) { + deps += [ "//gpu/vulkan/init" ] + } - if (!is_android) { + if (!is_android && !is_bsd) { data_deps = [ "//third_party/mesa_headers", ] -@@ -746,9 +746,6 @@ cc_test("cc_unittests") { +@@ -776,9 +776,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", @@ -17,5 +17,5 @@ - data_deps = [ - "//third_party/mesa_headers", ] - } + if (enable_vulkan) { Index: www/iridium/files/patch-cc_trees_property__tree.cc =================================================================== --- www/iridium/files/patch-cc_trees_property__tree.cc +++ www/iridium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2019-03-11 22:00:52 UTC +--- cc/trees/property_tree.cc.orig 2019-10-21 19:06:18 UTC +++ cc/trees/property_tree.cc -@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1278,13 +1278,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); Index: www/iridium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc =================================================================== --- www/iridium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc +++ www/iridium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc @@ -0,0 +1,20 @@ +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-10-21 19:06:19 UTC ++++ chrome/app/chrome_content_browser_overlay_manifest.cc +@@ -69,7 +69,7 @@ + #include "chrome/services/app_service/public/cpp/manifest.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck + #include "chrome/browser/ui/webui/discards/discards.mojom.h" +@@ -205,7 +205,7 @@ const service_manager::Manifest& GetChromeContentBrows + #else + app_management::mojom::PageHandlerFactory, + #endif +-#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) + mojom::DiscardsDetailsProvider, + performance_manager::mojom::WebUIGraphDump, Index: www/iridium/files/patch-chrome_app_chrome__main.cc =================================================================== --- www/iridium/files/patch-chrome_app_chrome__main.cc +++ www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2019-04-10 10:50:03 UTC +--- chrome/app/chrome_main.cc.orig 2019-09-09 21:55:07 UTC +++ chrome/app/chrome_main.cc -@@ -110,11 +110,11 @@ int ChromeMain(int argc, const char** argv) { - #endif +@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) { + MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) Index: www/iridium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-03-11 22:00:52 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-10-21 19:06:19 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -101,7 +101,7 @@ +@@ -99,7 +99,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 -@@ -135,7 +135,7 @@ +@@ -137,7 +137,7 @@ #include "v8/include/v8.h" #endif @@ -18,7 +18,7 @@ #include "base/environment.h" #endif -@@ -232,7 +232,7 @@ bool UseHooks() { +@@ -240,7 +240,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -291,7 +291,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -299,13 +299,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +36,14 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co + bool SubprocessNeedsResourceBundle(const std::string& process_type) { + return +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The zygote process opens the resources for the renderers. + process_type == service_manager::switches::kZygoteProcess || + #endif +@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -45,7 +52,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -346,7 +346,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +61,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,7 +70,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +79,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -469,7 +469,7 @@ void InitLogging(const std::string& process_type) { +@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); @@ -81,7 +88,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -654,7 +654,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +97,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -678,7 +678,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +106,16 @@ nacl::RegisterPathProvider(); #endif -@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -872,7 +872,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_WIN) + child_process_logging::Init(); + #endif +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -996,7 +996,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -108,7 +124,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1011,7 +1011,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -117,7 +133,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1021,7 +1021,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. Index: www/iridium/files/patch-chrome_app_chromium__strings.grd =================================================================== --- www/iridium/files/patch-chrome_app_chromium__strings.grd +++ www/iridium/files/patch-chrome_app_chromium__strings.grd @@ -1,20 +1,29 @@ ---- chrome/app/chromium_strings.grd.orig 2019-04-10 10:50:02 UTC +--- chrome/app/chromium_strings.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/chromium_strings.grd -@@ -809,7 +809,7 @@ Signing in anyway will merge browser information like +@@ -694,7 +694,7 @@ Signing in anyway will merge Chromium information like + + + +- ++ + + Your system administrator has configured Chromium to open an alternative browser to access $1example.com. + +@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like - + - The profile appears to be in use by another browser process ($112345) on another computer ($2example.com). The browser 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 the browser. + 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. -@@ -1057,7 +1057,7 @@ Please check your email at $2 +@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like - + - Restart the browser to enable $1Flash + Restart Chromium to enable $1Flash Index: www/iridium/files/patch-chrome_app_generated__resources.grd =================================================================== --- www/iridium/files/patch-chrome_app_generated__resources.grd +++ www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,15 +1,15 @@ ---- chrome/app/generated_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/generated_resources.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/generated_resources.grd -@@ -5339,7 +5339,7 @@ the Bookmarks menu."> - +@@ -4885,7 +4885,7 @@ Keep your key file in a safe place. You will need it t -- -+ - - Press |$1Ctrl|+|$2Shift| followed by |$3Q| to exit + +- ++ + + Legacy Browser Support -@@ -6160,7 +6160,7 @@ the Bookmarks menu."> +@@ -6514,7 +6514,7 @@ the Bookmarks menu."> Google Pay @@ -18,7 +18,7 @@ Use system title bar and borders -@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7395,7 +7395,7 @@ Please help our engineers fix this problem. Tell us wh Set as default Index: www/iridium/files/patch-chrome_app_google__chrome__strings.grd =================================================================== --- www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ www/iridium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,15 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/app/google_chrome_strings.grd -@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b +@@ -706,7 +706,7 @@ Signing in anyway will merge Chrome information like b + + + +- ++ + + Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. + +@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b @@ -9,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. -@@ -1075,7 +1075,7 @@ Please check your email at $2 +@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b Index: www/iridium/files/patch-chrome_app_settings__strings.grdp =================================================================== --- www/iridium/files/patch-chrome_app_settings__strings.grdp +++ www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2019-03-11 22:00:52 UTC +--- chrome/app/settings_strings.grdp.orig 2019-10-21 19:06:20 UTC +++ chrome/app/settings_strings.grdp -@@ -580,7 +580,7 @@ +@@ -757,7 +757,7 @@ Themes @@ -9,7 +9,7 @@ GTK+ -@@ -594,7 +594,7 @@ +@@ -771,7 +771,7 @@ Use Classic Index: www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc =================================================================== --- www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,6 +1,6 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-03-11 22:00:52 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-04-30 22:22:32 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc -@@ -183,12 +183,18 @@ void InstallShutdownSignalHandlers( +@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -18,4 +18,4 @@ +#endif #endif ShutdownDetector* detector = new ShutdownDetector( - g_shutdown_pipe_read_fd, shutdown_callback, task_runner); + g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); Index: www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd =================================================================== --- www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,6 +1,15 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-09-09 21:55:08 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -100,7 +100,7 @@ +@@ -18,7 +18,7 @@ + + + +- ++ + + + +@@ -109,7 +109,7 @@ Index: www/iridium/files/patch-chrome_app_theme_theme__resources.grd =================================================================== --- www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -0,0 +1,11 @@ +--- chrome/app/theme/theme_resources.grd.orig 2019-10-30 15:46:23 UTC ++++ chrome/app/theme/theme_resources.grd +@@ -25,7 +25,7 @@ + +- ++ + + + Index: www/iridium/files/patch-chrome_browser_about__flags.cc =================================================================== --- www/iridium/files/patch-chrome_browser_about__flags.cc +++ www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,72 +1,162 @@ ---- chrome/browser/about_flags.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/about_flags.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/about_flags.cc -@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS - {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050, - base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}}; +@@ -162,7 +162,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/native_theme/native_theme_features.h" +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" + #endif + +@@ -716,7 +716,7 @@ const FeatureEntry::FeatureVariation + nullptr}}; + #endif // OS_ANDROID + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const FeatureEntry::FeatureParam + kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { + {autofill::features:: +@@ -763,7 +763,7 @@ const FeatureEntry::FeatureVariation + kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), + nullptr}, + }; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const FeatureEntry::Choice kMemlogModeChoices[] = { + {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, +@@ -816,7 +816,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ + heap_profiling::kMemlogSamplingRate5MB}, + }; + -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = { - {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}}; - const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = { -@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV - {"Dedicated Suggestion Line", kPedalSuggestionDedicated, - base::size(kPedalSuggestionDedicated), nullptr}, - }; + const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { + {"DocumentUseServerScore", "true"}, + {"DocumentUseClientScore", "false"}, +@@ -854,7 +854,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP + base::size(kOmniboxDocumentProviderClientScoring), nullptr}, + {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring, + base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}}; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::Choice kAutoplayPolicyChoices[] = { - {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = { - {"force-text-direction", flag_descriptions::kForceTextDirectionName, - flag_descriptions::kForceTextDirectionDescription, kOsAll, - MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, - flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-origin-trials", flag_descriptions::kOriginTrialsName, - flag_descriptions::kOriginTrialsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, + const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamNTPOmnibox[] = { + {"ZeroSuggestVariant:7:*", ZeroSuggestProvider::kRemoteNoUrlVariant}}; +@@ -932,7 +932,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), + nullptr}}; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { + {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; +@@ -948,7 +948,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU + {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}, + {"Button_GM2", kTranslateBubbleUIButtonGM2, + base::size(kTranslateBubbleUIButton), nullptr}}; +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { + {security_state::features::kMarkHttpAsFeatureParameterName, +@@ -1849,13 +1849,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCloudPrintXpsDescription, kOsWin, + SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, + #endif // OS_WIN +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + {"enable-webgl2-compute-context", + flag_descriptions::kWebGL2ComputeContextName, + flag_descriptions::kWebGL2ComputeContextDescription, + kOsWin | kOsLinux | kOsCrOS, + SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)}, +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + {"enable-webgl-draft-extensions", + flag_descriptions::kWebglDraftExtensionsName, + flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, +@@ -1904,14 +1904,14 @@ const FeatureEntry kFeatureEntries[] = { + "OverrideTranslateTriggerInIndia")}, + #endif // OS_ANDROID + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, + flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi, + kTranslateBubbleUIVariations, + "UseButtonTranslateBubbleUI")}, +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD + + #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) + {"enable-native-notifications", +@@ -1983,7 +1983,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCrostiniBackupDescription, kOsCrOS, + FEATURE_VALUE_TYPE(chromeos::features::kCrostiniBackup)}, + #endif // OS_CHROMEOS +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + {"terminal-system-app", flag_descriptions::kTerminalSystemAppName, + flag_descriptions::kTerminalSystemAppDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(features::kTerminalSystemApp)}, +@@ -1992,7 +1992,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // OS_CHROMEOS || OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX || defined(OS_BSD) + #if defined(OS_ANDROID) + {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, + flag_descriptions::kCreditCardAssistDescription, kOsAndroid, +@@ -2075,7 +2075,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + previews::features::kHTTPSServerPreviewsUsingURLLoader)}, + #endif // OS_ANDROID +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + {"enable-save-data", flag_descriptions::kEnableSaveDataName, + flag_descriptions::kEnableSaveDataDescription, kOsCrOS, + SINGLE_VALUE_TYPE( +@@ -2427,12 +2427,12 @@ const FeatureEntry kFeatureEntries[] = { + "AndroidNightMode")}, #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - {"passwords-migrate-linux-to-login-db", - flag_descriptions::kPasswordsMigrateLinuxToLoginDBName, - flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux, - FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)}, + {"enable-dbus-and-x11-status-icons", + flag_descriptions::kEnableDbusAndX11StatusIconsName, + flag_descriptions::kEnableDbusAndX11StatusIconsDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kEnableDbusAndX11StatusIcons)}, -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) {"enable-experimental-accessibility-features", flag_descriptions::kExperimentalAccessibilityFeaturesName, flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)}, - #endif // defined(OS_ANDROID) +@@ -2752,7 +2752,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName, - flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)}, -@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxDriveSuggestionsName, - flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)}, + {"omnibox-experimental-keyword-mode", + flag_descriptions::kOmniboxExperimentalKeywordModeName, + flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, +@@ -2806,7 +2806,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kDocumentProvider, + kOmniboxDocumentProviderVariations, + "OmniboxBundledExperimentV1")}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3026,13 +3026,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -75,46 +165,121 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kShowManagedUiDescription, - kOsWin | kOsMac | kOsLinux | kOsCrOS, - FEATURE_VALUE_TYPE(features::kShowManagedUi)}, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_ANDROID) - {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName, -@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, - #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if !defined(OS_ANDROID) + {"chrome-colors", flag_descriptions::kChromeColorsName, +@@ -3729,7 +3729,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(kClickToCallReceiver)}, + #endif // defined(OS_ANDROID) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"click-to-call-context-menu-selected-text", + flag_descriptions::kClickToCallContextMenuForSelectedTextName, +@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { + {"click-to-call-ui", flag_descriptions::kClickToCallUIName, + flag_descriptions::kClickToCallUIDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kClickToCallUI)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"shared-clipboard-receiver", +@@ -3859,13 +3859,13 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"enable-reopen-tab-in-product-help", + flag_descriptions::kReopenTabInProductHelpName, + flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"enable-audio-focus-enforcement", +@@ -4245,7 +4245,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, + -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-always-show-server-cards-in-sync-transport", - flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, + {"enable-autofill-save-credit-card-uses-improved-messaging", + flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, flag_descriptions:: -@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE( - autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, +@@ -4255,7 +4255,7 @@ const FeatureEntry kFeatureEntries[] = { + autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, + kAutofillSaveCreditCardUsesImprovedMessagingVariations, + "AutofillSaveCreditCardUsesImprovedMessaging")}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) - {"enable-custom-mac-paper-sizes", -@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, - #endif // OS_CHROMEOS + #if defined(OS_CHROMEOS) + {"release-notes", flag_descriptions::kReleaseNotesName, +@@ -4337,12 +4337,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-settings-split-by-card-type", - flag_descriptions::kAutofillSettingsSplitByCardTypeName, - flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)}, + {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, + flag_descriptions::kGlobalMediaControlsDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalMediaControls)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) - {"hardware-media-key-handling", + #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) + {"win-use-native-spellchecker", +@@ -4355,12 +4355,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSafetyTipDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kSafetyTipUI)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"animated-avatar-button", flag_descriptions::kAnimatedAvatarButtonName, + flag_descriptions::kAnimatedAvatarButtonDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kAnimatedAvatarButton)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + {"crostini-webui-installer", flag_descriptions::kCrostiniWebUIInstallerName, +@@ -4484,12 +4484,12 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kBundledHTTPExchangesDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kBundledHTTPExchanges)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"profile-menu-revamp", flag_descriptions::kProfileMenuRevampName, + flag_descriptions::kProfileMenuRevampDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kProfileMenuRevamp)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + {"password-leak-detection", flag_descriptions::kPasswordLeakDetectionName, + flag_descriptions::kPasswordLeakDetectionDescription, kOsAll, +@@ -4543,11 +4543,11 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)}, + #endif // !defined(OS_ANDROID) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"sync-clipboard-service", flag_descriptions::kSyncClipboardServiceName, + flag_descriptions::kSyncClipboardServiceDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kSyncClipboardServiceFeature)}, +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + #if defined(OS_ANDROID) + {"enable-clipboard-provider-text-suggestions", Index: www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc =================================================================== --- www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc +++ www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -29,7 +29,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_contents_observer.h" +@@ -32,7 +32,7 @@ + #include "chrome/browser/ui/tabs/tab_strip_model.h" + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr queue +@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -126,7 +126,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { +@@ -135,7 +135,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); Index: www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc =================================================================== --- www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-04-30 22:22:32 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ @@ -12,7 +12,7 @@ #include #include #include -@@ -105,9 +110,36 @@ class MacAddressProcessor { +@@ -106,9 +111,36 @@ class MacAddressProcessor { const char* const prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -49,7 +49,7 @@ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); -@@ -119,11 +151,18 @@ class MacAddressProcessor { +@@ -120,11 +152,18 @@ class MacAddressProcessor { const char* mac_address = static_cast(ifinfo.ifr_hwaddr.sa_data); Index: www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc =================================================================== --- www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-04-10 10:50:03 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -60,7 +60,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { @@ -9,3 +9,9 @@ // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. + return metrics::OmniboxInputType::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 + "://"); Index: www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc =================================================================== --- www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/background/background_mode_manager.cc.orig 2019-10-21 19:06:20 UTC ++++ chrome/browser/background/background_mode_manager.cc +@@ -769,7 +769,7 @@ gfx::ImageSkia GetStatusTrayIcon() { + return gfx::ImageSkia(); + + return family->CreateExact(size).AsImageSkia(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + IDR_PRODUCT_LOGO_128); + #elif defined(OS_MACOSX) Index: www/iridium/files/patch-chrome_browser_browser__features.h =================================================================== --- www/iridium/files/patch-chrome_browser_browser__features.h +++ www/iridium/files/patch-chrome_browser_browser__features.h @@ -0,0 +1,14 @@ +--- chrome/browser/browser_features.h.orig 2019-10-30 15:47:15 UTC ++++ chrome/browser/browser_features.h +@@ -20,9 +20,9 @@ namespace features { + extern const base::Feature kDoubleTapToZoomInTabletMode; + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + extern const base::Feature kSyncClipboardServiceFeature; +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + } // namespace features + Index: www/iridium/files/patch-chrome_browser_browser__features.cc =================================================================== --- www/iridium/files/patch-chrome_browser_browser__features.cc +++ www/iridium/files/patch-chrome_browser_browser__features.cc @@ -0,0 +1,14 @@ +--- chrome/browser/browser_features.cc.orig 2019-10-30 15:46:57 UTC ++++ chrome/browser/browser_features.cc +@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{ + "DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kSyncClipboardServiceFeature{ + "SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT}; +-#endif // OS_WIN || OS_MACOSX || OS_LINUX ++#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD) + + } // namespace features Index: www/iridium/files/patch-chrome_browser_browser__resources.grd =================================================================== --- www/iridium/files/patch-chrome_browser_browser__resources.grd +++ www/iridium/files/patch-chrome_browser_browser__resources.grd @@ -1,7 +1,16 @@ ---- chrome/browser/browser_resources.grd.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/browser_resources.grd.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/browser_resources.grd -@@ -679,7 +679,7 @@ - +@@ -106,7 +106,7 @@ + + + +- ++ + + + +@@ -561,7 +561,7 @@ + - Index: www/iridium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,24 +1,27 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -217,7 +217,7 @@ - #include "chromeos/settings/cros_settings_names.h" +@@ -222,9 +222,9 @@ + #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/first_run/upgrade_util_linux.h" - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -@@ -257,7 +257,7 @@ + #if defined(OS_LINUX) + #include "components/crash/content/app/breakpad_linux.h" +@@ -261,7 +261,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif - -@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1075,7 +1075,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -27,7 +30,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1084,14 +1084,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -45,24 +48,24 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); + ProfileActivityMetricsRecorder::Initialize(); #endif - metrics::RendererUptimeTracker::Initialize(); -@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1280,6 +1280,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); - BrowserThread::PostAfterStartupTask( -@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::PostTask( +@@ -1288,6 +1289,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } Index: www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc =================================================================== --- www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -13,9 +13,9 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - bluez::BluezDBusThreadManager::Initialize(); - bluez::BluezDBusManager::Initialize(); + bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif + @@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } Index: www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc =================================================================== --- www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,15 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -142,7 +142,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa + // ExitHandler takes care of deleting itself. + new ExitHandler(); + } else { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switch (signal) { + case SIGINT: + case SIGHUP: +@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. Index: www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h =================================================================== --- www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -363,12 +363,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -360,12 +360,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; @@ -13,5 +13,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #if defined(OS_WIN) - bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; - base::string16 GetAppContainerSidForSandboxType( + bool PreSpawnRenderer(sandbox::TargetPolicy* policy, + RendererSpawnFlags flags) override; Index: www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc =================================================================== --- www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,56 +1,51 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-10-21 19:06:20 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -395,7 +395,7 @@ +@@ -403,7 +403,7 @@ + #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" - #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -441,11 +441,11 @@ - #include "components/services/patch/public/interfaces/constants.mojom.h" - #endif +@@ -459,7 +459,7 @@ + #endif // !defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - #include "chrome/browser/webshare/share_service_impl.h" - #endif - --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -462,7 +462,7 @@ + +@@ -485,7 +485,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" - #endif - -@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: ++#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 +@@ -1199,7 +1199,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) - main_parts = new chromeos::ChromeBrowserMainPartsChromeos( - parameters, chrome_feature_list_creator_); + main_parts = std::make_unique( + parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) main_parts = - new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); + std::make_unique(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1225,7 +1225,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); +-#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()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1956,7 +1956,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2028,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -59,7 +54,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3550,7 +3550,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2266,7 +2266,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( + process_type, command_line); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && + command_line->HasSwitch(service_manager::switches::kNoSandbox)) { +@@ -3574,7 +3574,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -68,30 +72,12 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - handle)); +@@ -4244,7 +4244,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: -@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa - #if defined(OS_ANDROID) - frame_interfaces_parameterized_->AddInterface(base::Bind( - &ForwardToJavaWebContentsRegistry)); --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create)); - #endif - -@@ -5047,7 +5047,7 @@ std::unique_ptr - ChromeContentBrowserClient::CreateWindowForPictureInPicture( - content::PictureInPictureWindowController* controller) { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) - // Note: content::OverlayWindow::Create() is defined by platform-specific - // implementation in chrome/browser/ui/views. This layering hack, which goes - // through //content and ContentBrowserClient, allows us to work around the + MaybeCreateThrottleFor(handle); Index: www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc =================================================================== --- www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-03-17 19:35:08 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler( +@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { Index: www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc =================================================================== --- www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc @@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. Index: www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc =================================================================== --- www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1257,7 +1257,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1251,7 +1251,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1287,7 +1287,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { Index: www/iridium/files/patch-chrome_browser_download_download__commands.h =================================================================== --- www/iridium/files/patch-chrome_browser_download_download__commands.h +++ www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,7 @@ class DownloadCommands { +@@ -45,7 +45,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); @@ -8,4 +8,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - #endif + Browser* GetBrowser() const; Index: www/iridium/files/patch-chrome_browser_download_download__commands.cc =================================================================== --- www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,15 +1,24 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.cc -@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const { - return browser_displayer.browser(); +@@ -30,7 +30,7 @@ + #include "net/base/url_util.h" + #include "ui/base/clipboard/scoped_clipboard_writer.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" +@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command) + model_->ExecuteCommand(this, command); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = model_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -175,7 +175,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons + + Browser* DownloadCommands::GetBrowser() const { + chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); +@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); @@ -18,3 +27,9 @@ return IsDownloadPdf(); #endif } + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + void DownloadCommands::CopyFileAsImageToClipboard() { + if (model_->GetState() != download::DownloadItem::COMPLETE || Index: www/iridium/files/patch-chrome_browser_download_download__item__model.cc =================================================================== --- www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/download/download_item_model.cc -@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -565,7 +565,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -602,7 +602,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); Index: www/iridium/files/patch-chrome_browser_download_download__prefs.h =================================================================== --- www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_prefs.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/download_prefs.h -@@ -101,7 +101,7 @@ class DownloadPrefs { +@@ -102,7 +102,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -145,7 +145,7 @@ class DownloadPrefs { +@@ -150,7 +150,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; Index: www/iridium/files/patch-chrome_browser_download_download__prefs.cc =================================================================== --- www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_prefs.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/download_prefs.cc @@ -62,7 +62,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -257,7 +257,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); Index: www/iridium/files/patch-chrome_browser_extensions_BUILD.gn =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1104,6 +1104,12 @@ jumbo_static_library("extensions") { +@@ -1128,6 +1128,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } Index: www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,9 +1,9 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -52,7 +52,11 @@ +@@ -54,7 +54,11 @@ + #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" - #include "extensions/common/one_shot_event.h" +#if defined(OS_BSD) +#include +#else Index: www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-04-30 22:22:33 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -20,6 +20,7 @@ static base::LazyInstancePostTask( FROM_HERE, -@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); Index: www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-04-30 22:22:33 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -296,6 +296,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -299,6 +299,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; Index: www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-10-21 19:06:21 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist - settings_api::PrefType::PREF_TYPE_BOOLEAN; +@@ -155,7 +155,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -165,7 +165,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; Index: www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -0,0 +1,43 @@ +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-10-21 19:06:21 UTC ++++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +@@ -29,7 +29,7 @@ + #include "extensions/browser/process_manager.h" + #include "extensions/common/error_utils.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "extensions/common/permissions/permissions_data.h" + #endif + +@@ -38,7 +38,7 @@ namespace { + bool CanEnableAudioDebugRecordingsFromExtension( + const extensions::Extension* extension) { + bool enabled_by_permissions = false; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (extension) { + enabled_by_permissions = + extension->permissions_data()->active_permissions().HasAPIPermission( +@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi + } + + bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, + // this function shouldn't be called by a component extension on behalf of + // some web code. It returns a DirectoryEntry for use directly in the calling +@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run + &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, + this)); + return true; +-#else // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SetError("Not supported on the current OS"); + SendResponse(false); + return false; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback( Index: www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc +++ www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten - if (create_shortcuts_) { - #if !defined(OS_CHROMEOS) - web_app::ShortcutLocations creation_locations; --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - creation_locations.on_desktop = true; - #else - creation_locations.on_desktop = false; Index: www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ www/iridium/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 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -94,7 +94,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); Index: www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc =================================================================== --- www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -747,7 +747,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -765,7 +765,7 @@ void ExternalProviderImpl::CreateExternalProviders( chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } @@ -8,13 +8,13 @@ +#elif defined(OS_LINUX) || defined(OS_BSD) provider_list->push_back(std::make_unique( service, - new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders( + base::MakeRefCounted( +@@ -793,7 +793,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. --#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) ++#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) provider_list->push_back(std::make_unique( service, - new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, + base::MakeRefCounted( Index: www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h =================================================================== --- www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -0,0 +1,11 @@ +--- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC ++++ chrome/browser/first_run/first_run_dialog.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + // Hide this function on platforms where the dialog does not exist. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + class Profile; + Index: www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h =================================================================== --- www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h +++ www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -0,0 +1,18 @@ +--- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC ++++ chrome/browser/first_run/first_run_internal.h +@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); + +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For testing, forces the first run dialog to either be shown or not. If not + // called, the decision to show the dialog or not will be made by Chrome based + // on a number of factors (such as install type, whether it's a Chrome-branded + // build, etc). + void ForceFirstRunDialogShownForTesting(bool shown); +-#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace internal + } // namespace first_run Index: www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc =================================================================== --- www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-04-10 10:50:05 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc @@ -45,7 +45,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = @@ -9,7 +9,7 @@ // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -99,7 +99,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { } void DoPostImportPlatformSpecificTasks(Profile* profile) { Index: www/iridium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,32 +1,87 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/flag_descriptions.h -@@ -2192,12 +2192,12 @@ extern const char kWakeOnPacketsDescription[]; +@@ -20,9 +20,9 @@ + #include "ui/android/buildflags.h" + #endif // defined(OS_ANDROID) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // This file declares strings used in chrome://flags. These messages are not + // translated, because instead of end-users they target Chromium developers and +@@ -2178,7 +2178,7 @@ extern const char kZeroStateFilesDescription[]; + + #endif // #if defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + extern const char kTerminalSystemAppName[]; + extern const char kTerminalSystemAppDescription[]; + +@@ -2187,7 +2187,7 @@ extern const char kDynamicTcmallocName[]; + extern const char kDynamicTcmallocDescription[]; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -2206,14 +2206,14 @@ extern const char kReopenTabInProductHelpDescription[] + // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - extern const char kEnableInputImeApiName[]; - extern const char kEnableInputImeApiDescription[]; + extern const char kWebGL2ComputeContextName[]; + extern const char kWebGL2ComputeContextDescription[]; --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - extern const char kExperimentalUiName[]; - extern const char kExperimentalUiDescription[]; -@@ -2209,12 +2209,12 @@ extern const char kAutomaticTabDiscardingDescription[] +-#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) - #endif // defined(OS_WIN) || defined(OS_MACOSX) + extern const char kClickToCallContextMenuForSelectedTextName[]; +@@ -2222,10 +2222,10 @@ extern const char kClickToCallContextMenuForSelectedTe + extern const char kClickToCallUIName[]; + extern const char kClickToCallUIDescription[]; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; +@@ -2239,7 +2239,7 @@ extern const char kProfileMenuRevampDescription[]; + extern const char kSyncClipboardServiceName[]; + extern const char kSyncClipboardServiceDescription[]; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -2330,12 +2330,12 @@ extern const char kWebrtcPipeWireCapturerDescription[] + + #endif // #if defined(WEBRTC_USE_PIPEWIRE) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + extern const char kEnableDbusAndX11StatusIconsName[]; + extern const char kEnableDbusAndX11StatusIconsDescription[]; + +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + // ============================================================================ + // Don't just add flags to the end, put them in the right section in Index: www/iridium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,34 +1,79 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3656,13 +3656,13 @@ const char kWakeOnPacketsDescription[] = +@@ -3632,7 +3632,7 @@ const char kZeroStateFilesDescription[] = + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + const char kTerminalSystemAppName[] = "Terminal System App"; + const char kTerminalSystemAppDescription[] = + "Enables the Terminal System App at chrome://terminal which is used for " +@@ -3645,7 +3645,7 @@ const char kDynamicTcmallocDescription[] = + "utilization."; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -3670,15 +3670,15 @@ const char kReopenTabInProductHelpDescription[] = + // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const char kEnableInputImeApiName[] = "Enable Input IME API"; - const char kEnableInputImeApiDescription[] = - "Enable the use of chrome.input.ime API."; + const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute"; + const char kWebGL2ComputeContextDescription[] = + "Enable the use of WebGL 2.0 Compute API."; --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) +-#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) -@@ -3675,13 +3675,13 @@ const char kAutomaticTabDiscardingDescription[] = + const char kClickToCallContextMenuForSelectedTextName[] = +@@ -3693,10 +3693,10 @@ const char kClickToCallUIDescription[] = + "Enables click to call feature signals to be handled on desktop by showing " + "a list of user's available devices with telephony functionality."; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = - "If enabled, Chrome will scroll web pages on stylus drag."; +@@ -3715,7 +3715,7 @@ const char kSyncClipboardServiceName[] = "Sync Clipboa + const char kSyncClipboardServiceDescription[] = + "Enables clipboard syncing via Chrome Sync."; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -3825,7 +3825,7 @@ extern const char kWebrtcPipeWireCapturerDescription[] + + #endif // #if defined(WEBRTC_USE_PIPEWIRE) + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + const char kEnableDbusAndX11StatusIconsName[] = + "Enable DBus and X11 status icons"; +@@ -3834,7 +3834,7 @@ const char kEnableDbusAndX11StatusIconsDescription[] = + "(X11) implementations of status icons. Otherwise, uses libappindicator's " + "and GTK's implementations."; + +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + const char kAvoidFlashBetweenNavigationName[] = + "Enable flash avoidance between same-origin navigations"; Index: www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-04-30 22:22:34 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -38,10 +38,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. Index: www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-04-30 22:22:34 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -734,7 +734,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -732,7 +732,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { Index: www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc +++ www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc @@ -1,19 +1,19 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc -@@ -111,6 +111,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool incognito, CreateRouteCallback callback) { - DCHECK(!base::ContainsKey(presentations_, presentation_id)); -+#if defined(OS_BSD) // XXX -+ std::move(callback).Run(base::nullopt, nullptr, -+ std::string("Not implemented"), -+ RouteRequestResult::UNKNOWN_ERROR); -+ return; + DCHECK(!base::Contains(presentations_, presentation_id)); ++#if defined(OS_BSD) ++ std::move(callback).Run(base::nullopt, nullptr, ++ std::string("Not implemented"), ++ RouteRequestResult::UNKNOWN_ERROR); ++ return; +#else base::Optional display = GetDisplayBySinkId(sink_id); if (!display) { std::move(callback).Run(base::nullopt, nullptr, -@@ -137,6 +143,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -138,6 +144,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( std::move(callback).Run(route, nullptr, base::nullopt, RouteRequestResult::OK); NotifyRouteObservers(); Index: www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -358,6 +358,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; Index: www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h =================================================================== --- www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -0,0 +1,36 @@ +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2019-10-30 15:50:11 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.h +@@ -129,13 +129,13 @@ class WebRtcLoggingController + size_t web_app_id, + const StartEventLoggingCallback& callback); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Ensures that the WebRTC Logs directory exists and then grants render + // process access to the 'WebRTC Logs' directory, and invokes |callback| with + // the ids necessary to create a DirectoryEntry object. + void GetLogsDirectory(const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // chrome::mojom::WebRtcLoggingClient methods: + void OnAddMessages( +@@ -188,7 +188,7 @@ class WebRtcLoggingController + bool success, + const std::string& error_message); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Grants the render process access to the 'WebRTC Logs' directory, and + // invokes |callback| with the ids necessary to create a DirectoryEntry + // object. If the |logs_path| couldn't be created or found, |error_callback| +@@ -197,7 +197,7 @@ class WebRtcLoggingController + const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback, + const base::FilePath& logs_path); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + static base::FilePath GetLogDirectoryAndEnsureExists( + const base::FilePath& browser_context_directory_path); Index: www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -0,0 +1,33 @@ +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2019-10-30 15:49:45 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.cc +@@ -24,10 +24,10 @@ + #include "content/public/browser/render_process_host.h" + #include "services/service_manager/public/cpp/connector.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "content/public/browser/child_process_security_policy.h" + #include "storage/browser/fileapi/isolated_context.h" +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + using webrtc_event_logging::WebRtcEventLogManager; + +@@ -267,7 +267,7 @@ void WebRtcLoggingController::StartEventLogging( + web_app_id, callback); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void WebRtcLoggingController::GetLogsDirectory( + const LogsDirectoryCallback& callback, + const LogsDirectoryErrorCallback& error_callback) { +@@ -312,7 +312,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + void WebRtcLoggingController::OnRtpPacket( + std::unique_ptr packet_header, Index: www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h =================================================================== --- www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h +++ www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h @@ -1,36 +0,0 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig 2019-03-17 20:00:30 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h -@@ -154,13 +154,13 @@ class WebRtcLoggingHandlerHost : public content::Brows - size_t web_app_id, - const StartEventLoggingCallback& callback); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Ensures that the WebRTC Logs directory exists and then grants render - // process access to the 'WebRTC Logs' directory, and invokes |callback| with - // the ids necessary to create a DirectoryEntry object. - void GetLogsDirectory(const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - private: - friend class content::BrowserThread; -@@ -227,7 +227,7 @@ class WebRtcLoggingHandlerHost : public content::Brows - bool success, - const std::string& error_message); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Grants the render process access to the 'WebRTC Logs' directory, and - // invokes |callback| with the ids necessary to create a DirectoryEntry - // object. If the |logs_path| couldn't be created or found, |error_callback| -@@ -236,7 +236,7 @@ class WebRtcLoggingHandlerHost : public content::Brows - const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback, - const base::FilePath& logs_path); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // The render process ID this object belongs to. - const int render_process_id_; Index: www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc =================================================================== --- www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc +++ www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc @@ -1,33 +0,0 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-03-17 20:01:28 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc -@@ -26,10 +26,10 @@ - #include "content/public/browser/content_browser_client.h" - #include "content/public/browser/render_process_host.h" - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "content/public/browser/child_process_security_policy.h" - #include "storage/browser/fileapi/isolated_context.h" --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - using content::BrowserThread; - using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging( - output_period_ms, web_app_id, callback); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void WebRtcLoggingHandlerHost::GetLogsDirectory( - const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces - FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, filesystem_id, registered_name)); - } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD - - void WebRtcLoggingHandlerHost::OnRtpPacket( - std::unique_ptr packet_header, Index: www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc =================================================================== --- www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc +++ www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc @@ -1,8 +1,8 @@ ---- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/metrics/bluetooth_available_utility.cc -@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() { - if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported()) - ReportAvailability(BLUETOOTH_NOT_SUPPORTED); +@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() { + return; + } +#if !defined(OS_BSD) device::BluetoothAdapterFactory::Get().GetAdapter( Index: www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc =================================================================== --- www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -44,7 +44,9 @@ +@@ -47,7 +47,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -52,7 +54,7 @@ +@@ -55,7 +57,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif @@ -18,4 +18,4 @@ +#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #if defined(USE_OZONE) || defined(USE_X11) - #include "ui/events/devices/input_device_event_observer.h" + #include "ui/events/devices/device_data_manager.h" Index: www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc =================================================================== --- www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -0,0 +1,25 @@ +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -721,11 +721,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + #endif // defined(OS_WIN) + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique()); + #endif // defined(OS_WIN) || defined(OS_MACOSX) || \ +- // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_PLUGINS) + plugin_metrics_provider_ = new PluginMetricsProvider(local_state); +@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + } + #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // This creates the DesktopProfileSessionDurationsServices if it didn't exist + // already. + metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( Index: www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc =================================================================== --- www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -0,0 +1,20 @@ +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/metrics/process_memory_metrics_emitter.cc +@@ -378,7 +378,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + + builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); + builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / + 1024); + #endif +@@ -401,7 +401,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".SharedMemoryFootprint", + pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".PrivateSwapFootprint", + pmd.os_dump().private_footprint_swap_kb / 1024); Index: www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc =================================================================== --- www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -0,0 +1,11 @@ +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc +@@ -225,7 +225,7 @@ const struct { + {base::DIR_APP_DATA, nullptr, true}, + {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux also block access to devices via /dev, as well as security + // sensitive data in /sys and /proc. + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), true}, Index: www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc =================================================================== --- www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,23 +1,61 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -69,12 +69,12 @@ +@@ -78,11 +78,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/common/chrome_paths_internal.h" - #include "chrome/common/chrome_switches.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - namespace { + #if BUILDFLAG(ENABLE_EXTENSIONS) + #include "extensions/common/constants.h" +@@ -206,10 +206,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + auth_dynamic_params->enable_negotiate_port = + local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); -@@ -519,7 +519,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - content::GetNetworkService()->ConfigureStubHostResolver( - stub_resolver_enabled, std::move(dns_over_https_servers)); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + auth_dynamic_params->delegate_by_kdc_policy = + local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + auth_dynamic_params->ntlm_v2_enabled = +@@ -457,10 +457,10 @@ SystemNetworkContextManager::SystemNetworkContextManag + pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, + auth_pref_callback); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, + auth_pref_callback); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); +@@ -509,10 +509,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); + registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, + std::string()); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, + false); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + registry->RegisterBooleanPref( +@@ -620,7 +620,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + insecure_stub_resolver_enabled, secure_dns_mode, + std::move(dns_over_https_servers)); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) Index: www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc =================================================================== --- www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -0,0 +1,20 @@ +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/notifications/notification_display_service_impl.cc +@@ -33,7 +33,7 @@ + #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" + #endif + +@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, + std::make_unique()); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + AddNotificationHandler( + NotificationHandler::Type::SEND_TAB_TO_SELF, + std::make_unique( Index: www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc =================================================================== --- www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,8 +1,8 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -80,7 +80,11 @@ +@@ -84,7 +84,11 @@ + #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" - #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" +#if defined(OS_BSD) +#include @@ -11,4 +11,4 @@ +#endif #include "url/url_constants.h" - #if defined(SAFE_BROWSING_DB_LOCAL) + #if BUILDFLAG(FULL_SAFE_BROWSING) Index: www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc =================================================================== --- www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -300,7 +300,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60, - network_context_getter); +@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + base::TimeDelta::FromSeconds(20)); --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr notifier = std::make_unique( + IdentityManagerFactory::GetForProfile(profile)); Index: www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h =================================================================== --- www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h +++ www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h @@ -0,0 +1,11 @@ +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.h +@@ -72,7 +72,7 @@ class ProcessMetricsHistory { + uint64_t disk_usage_ = 0; + #endif + +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + int idle_wakeups_ = 0; + #endif + #if defined(OS_MACOSX) Index: www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc =================================================================== --- www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -0,0 +1,38 @@ +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.cc +@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { + #if defined(OS_WIN) + disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond(); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); + #endif + #if defined(OS_MACOSX) +@@ -88,7 +88,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kDiskUsageHistogramMin, kDiskUsageHistogramMax, + kDiskUsageHistogramBucketCount); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); + #endif +@@ -109,7 +109,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", + true); + } +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); + #endif +@@ -129,7 +129,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kHistogramBucketCount); + if (cpu_usage_ > kHighCPUUtilizationThreshold) + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", + idle_wakeups_); + #endif Index: www/iridium/files/patch-chrome_browser_platform__util.h =================================================================== --- www/iridium/files/patch-chrome_browser_platform__util.h +++ www/iridium/files/patch-chrome_browser_platform__util.h @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/platform_util.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/platform_util.h -@@ -40,7 +40,7 @@ enum OpenOperationResult { +@@ -41,7 +41,7 @@ enum OpenOperationResult { enum OpenItemType { OPEN_FILE, OPEN_FOLDER, Index: www/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc =================================================================== --- www/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ www/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/plugins/plugin_info_host_impl.cc +@@ -383,7 +383,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( + std::unique_ptr cus_plugin_info) { + if (cus_plugin_info) { + output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (cus_plugin_info->version != base::Version("0")) { + output->status = chrome::mojom::PluginStatus::kRestartRequired; + } Index: www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc =================================================================== --- www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2019-09-16 07:21:37 UTC ++++ chrome/browser/policy/browser_signin_policy_handler.cc +@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + } + switch (static_cast(int_value)) { + case BrowserSigninMode::kForced: +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); + #endif + FALLTHROUGH; Index: www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc =================================================================== --- www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,20 +1,43 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -107,7 +107,7 @@ - #include "chrome/browser/policy/browser_signin_policy_handler.h" +@@ -113,7 +113,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kEnterpriseHardwarePlatformAPIEnabled, + +@@ -333,11 +333,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kSafeBrowsingSendFilesForMalwareCheck, + base::Value::Type::INTEGER + }, +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + { key::kAuthNegotiateDelegateByKdcPolicy, + prefs::kAuthNegotiateDelegateByKdcPolicy, 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, +@@ -1064,7 +1064,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, +@@ -1125,7 +1125,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + browser_switcher::prefs::kChromeParameters, + base::Value::Type::LIST }, + #endif +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + { key::kBrowserGuestModeEnforced, + prefs::kBrowserGuestModeEnforced, + base::Value::Type::BOOLEAN }, Index: www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc =================================================================== --- www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc +++ www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc @@ -1,20 +0,0 @@ ---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc -@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() { - #endif - } - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - void CleanupUnusedPolicyDirectory() { - std::string enrollment_token = - BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken(); -@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan - void MachineLevelUserCloudPolicyController::Init( - PrefService* local_state, - scoped_refptr url_loader_factory) { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // This is a function that removes the directory we accidentally create due to - // crbug.com/880870. The directory is only removed when it's empty and - // enrollment token doesn't exist. This function is expected to be removed Index: www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc =================================================================== --- www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -185,6 +185,8 @@ class PolicyTestCase { +@@ -184,6 +184,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); Index: www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc =================================================================== --- www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -319,7 +319,7 @@ - #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" +@@ -346,7 +346,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); + +@@ -951,7 +951,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif + Index: www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc =================================================================== --- www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = { +@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif Index: www/iridium/files/patch-chrome_browser_process__singleton__posix.cc =================================================================== --- www/iridium/files/patch-chrome_browser_process__singleton__posix.cc +++ www/iridium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -93,11 +93,11 @@ +@@ -95,11 +95,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,7 +23,7 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { Index: www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc =================================================================== --- www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,11 +1,29 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !defined(OS_ANDROID) +@@ -181,7 +181,7 @@ + #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/sync/sync_clipboard_service_factory.h" + #endif + +@@ -336,7 +336,7 @@ void ChromeBrowserMainExtraPartsProfiles:: MediaGalleriesPreferencesFactory::GetInstance(); #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif + ModelTypeStoreServiceFactory::GetInstance(); +@@ -398,7 +398,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + SpellcheckServiceFactory::GetInstance(); + #endif + suggestions::SuggestionsServiceFactory::GetInstance(); +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + SyncClipboardServiceFactory::GetInstance(); + #endif + TabRestoreServiceFactory::GetInstance(); Index: www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc =================================================================== --- www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -83,7 +83,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; Index: www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc =================================================================== --- www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1507,7 +1507,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1699,7 +1699,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1549,7 +1549,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1741,7 +1741,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1823,7 +1823,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2045,7 +2045,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); Index: www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc =================================================================== --- www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -28,7 +28,7 @@ +@@ -30,7 +30,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -130,7 +130,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif Index: www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js =================================================================== --- www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ www/iridium/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-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -35,7 +35,7 @@ cr.define('settings', function() { +@@ -19,7 +19,7 @@ cr.define('settings', function() { useDefaultTheme() {} @@ -9,7 +9,7 @@ useSystemTheme() {} // -@@ -93,7 +93,7 @@ cr.define('settings', function() { +@@ -59,7 +59,7 @@ cr.define('settings', function() { chrome.send('useDefaultTheme'); } Index: www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html =================================================================== --- www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,24 +1,24 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -65,7 +65,7 @@ - hidden="[[!pageVisibility.setTheme]]" +@@ -67,7 +67,7 @@ + + on-click="openThemeUrl_" external> - + - +