D23181.1789740788.diff
No OneTemporary
Actions

Size

851 KB

Referenced Files

None

Subscribers

None

D23181.1789740788.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	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 <bsd.port.options.mk>
	+
	+# 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 <bsd.port.mk>
	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<Task *>::iterator it;
	- it = std::remove(tasks_.begin(),
	- tasks_.end(),
	-- reinterpret_cast<Task *>(NULL));
	-+ static_cast<Task *>(NULL));
	-
	- tasks_.erase(it, tasks_.end());
	- tasks_running_ = false;
	--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC
	+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
	@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
	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 <atomic> if using newer C++ library than sysroot, except if
	# building inside the cros_sdk environment - use host_toolchain as a
	# more robust check for this.
	@@ -9,7 +9,7 @@
	host_toolchain != "//build/toolchain/cros:host") {
	libs += [ "atomic" ]
	}
	-@@ -1211,7 +1211,7 @@ jumbo_component("base") {
	+@@ -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<const allocator::AllocatorDispatch*>(
	+ return reinterpret_cast<const base::allocator::AllocatorDispatch*>(
	-#if defined(OS_LINUX) && defined(__clang__)
	+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(__clang__)
	- static_cast<const volatile subtle::AtomicWord>(&g_chain_head)
	+ static_cast<const volatile base::subtle::AtomicWord>(&g_chain_head)
	#else
	- subtle::NoBarrier_Load(&g_chain_head)
	+ base::subtle::NoBarrier_Load(&g_chain_head)
	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 <dlfcn.h>
	+-#include <malloc.h>
	+#include <stdio.h>
	+#include <stdlib.h>
	+#include <malloc_np.h>

	--#include <malloc.h>
	--
	// 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<uintptr_t>(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 <mach/mach.h>
	+@@ -19,7 +19,7 @@
	+ #if defined(OS_ANDROID)
	+ #include <sys/prctl.h>
	#endif
	-#if defined(OS_LINUX)
	+#if defined(OS_BSD) \|\| defined(OS_LINUX)
	#include <sys/resource.h>

	#include <algorithm>
	-@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
	- }
	- }
	-
	--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
	-
	- // Multiple guarded memory regions may exceed the process address space limit.
	- // This function will raise or lower the limit by \|amount\|.
	-@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
	- // schemes that reduce that to 4 GiB.
	- constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB
	-
	--#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
	-+#endif // (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
	-
	- void* SystemAllocPagesInternal(void* hint,
	- size_t length,
	-@@ -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<int64_t>(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<const Nhdr*>(elf_base + header.p_vaddr);
	+ bool found = false;
	+ while (current_note < section_end) {
	++#if !defined(OS_BSD)
	+ if (current_note->n_type == NT_GNU_BUILD_ID) {
	+ const char* note_name =
	+ reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
	+@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
	+ break;
	+ }
	+ }
	++#endif
	+
	+ current_note = reinterpret_cast<const Nhdr*>(
	+ reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
	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<std::string> ElfSegmentBuildIDNoteAsString(co
	- const void* section_end = segment.data() + segment.size_bytes();
	- const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
	- while (note_header < section_end) {
	-+#if !defined(OS_BSD)
	- if (note_header->n_type == NT_GNU_BUILD_ID)
	- break;
	-+#endif
	- note_header = reinterpret_cast<const Nhdr*>(
	- reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
	- bits::Align(note_header->n_namesz, 4) +
	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 <signal.h>
	+ #endif
	+#include <sys/stdint.h>
	#include <unistd.h>
	#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 <AvailabilityMacros.h>
	@@ -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 <sys/mman.h>
	+ #include <unistd.h>
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include <sys/resource.h>
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_MACOSX) && !defined(OS_IOS)
	+ #include <mach/mach.h>
	+@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
	+ return SetMemory(start, end, PROT_READ);
	+ }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ void AssertMemoryIsReadOnly(const void* ptr) {
	+ #if DCHECK_IS_ON()
	+ const uintptr_t page_mask = ~(base::GetPageSize() - 1);
	+@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
	+ DCHECK_EQ(region_info.protection, VM_PROT_READ);
	+ #endif // DCHECK_IS_ON()
	+ }
	+-#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS))
	++#endif // defined(OS_LINUX) \|\| (defined(OS_MACOSX) && !defined(OS_IOS)) \|\| defined(OS_BSD)
	+
	+ } // namespace base
	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/<pid>/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<Value> SystemMetrics::ToValue() const
	+ std::unique_ptr<DictionaryValue> res(new DictionaryValue());
	+
	+ res->SetIntKey("committed_memory", static_cast<int>(committed_memory_));
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue();
	+ std::unique_ptr<DictionaryValue> 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 <sys/sysctl.h>
	#include <sys/user.h>
	#include <unistd.h>
	-@@ -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 <libutil.h>
	+
	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> ProcessMetrics::CreateProcessMetrics(
	-@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() {
	+@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() {
	return mem_total - (mem_freepagesize) - (mem_inactivepagesize);
	}

	@@ -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<Value> SystemDiskInfo::ToValue() const {
	++ auto res = std::make_unique<DictionaryValue>();
	++
	++ // 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<double>(reads));
	++ res->SetDouble("reads_merged", static_cast<double>(reads_merged));
	++ res->SetDouble("sectors_read", static_cast<double>(sectors_read));
	++ res->SetDouble("read_time", static_cast<double>(read_time));
	++ res->SetDouble("writes", static_cast<double>(writes));
	++ res->SetDouble("writes_merged", static_cast<double>(writes_merged));
	++ res->SetDouble("sectors_written", static_cast<double>(sectors_written));
	++ res->SetDouble("write_time", static_cast<double>(write_time));
	++ res->SetDouble("io", static_cast<double>(io));
	++ res->SetDouble("io_time", static_cast<double>(io_time));
	++ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time));
	++
	++ return std::move(res);
	++}
	++
	++std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const {
	++ auto res = std::make_unique<DictionaryValue>();
	++ 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<DictionaryValue> VmStatInfo::ToValue() const {
	++ auto res = std::make_unique<DictionaryValue>();
	++ 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 <malloc/malloc.h>
	@@ -9,7 +9,7 @@
	#else
	#include <malloc.h>
	#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 <intrin.h>
	#include <malloc.h>
	#include <windows.h>
	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 <sys/prctl.h>
	+ #endif
	+
	++#if defined(OS_BSD)
	++#include <pthread_np.h>
	++#endif
	++
	+ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
	+ defined(OFFICIAL_BUILD)
	+ #include "base/trace_event/cfi_backtrace_android.h"
	+@@ -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)
	+ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
	+ // base::LOG_INFO, base::LOG_WARNING.
	+ #include <syslog.h>
	+@@ -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<uint64_t>(limit);
	+ return static_cast<int64_t>((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<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
	- 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 <fontconfig/fontconfig.h>
	+
	+-#include <memory>
	+-
	+ #include "base/base_paths.h"
	+ #include "base/environment.h"
	+ #include "base/files/file_path.h"
	++#include "base/files/file_util.h"
	+ #include "base/logging.h"
	++#include "base/macros.h"
	+ #include "base/path_service.h"
	++#include "base/strings/string_util.h"
	+
	+ namespace base {
	+
	++namespace {
	++
	++const char kFontsConfTemplate[] = R"(<?xml version="1.0"?>
	++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
	++<fontconfig>
	++
	++ <!-- Cache location. -->
	++ <cachedir>$1</cachedir>
	++
	++ <!-- GCS-synced fonts. -->
	++ <dir>$2</dir>
	++
	++ <!-- Default properties. -->
	++ <match target="font">
	++ <edit name="embeddedbitmap" mode="append_last">
	++ <bool>false</bool>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Times</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>sans</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>DejaVu Sans</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>sans serif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ </match>
	++
	++ <!-- Some layout tests specify Helvetica as a family and we need to make sure
	++ that we don't fallback to Tinos for them -->
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Helvetica</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>sans-serif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>serif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>mono</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Cousine</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>monospace</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Cousine</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Courier</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Cousine</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>cursive</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Comic Sans MS</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>fantasy</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Impact</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Monaco</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Arial</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Courier New</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Cousine</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Georgia</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Gelasio</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Times New Roman</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test qual="any" name="family">
	++ <string>Verdana</string>
	++ </test>
	++ <!-- NOT metrically compatible! -->
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ </match>
	++
	++ <!-- TODO(thomasanderson): Move these configs to be test-specific. -->
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>NonAntiAliasedSans</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="antialias" mode="assign">
	++ <bool>false</bool>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>SlightHintedGeorgia</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Gelasio</string>
	++ </edit>
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintslight</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>NonHintedSans</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <!-- These deliberately contradict each other. The 'hinting' preference
	++ should take priority -->
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintfull</const>
	++ </edit>
	++ <edit name="hinting" mode="assign">
	++ <bool>false</bool>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>AutohintedSerif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="autohint" mode="assign">
	++ <bool>true</bool>
	++ </edit>
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintmedium</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>HintedSerif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="autohint" mode="assign">
	++ <bool>false</bool>
	++ </edit>
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintmedium</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>FullAndAutoHintedSerif</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="autohint" mode="assign">
	++ <bool>true</bool>
	++ </edit>
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintfull</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>SubpixelEnabledArial</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="rgba" mode="assign">
	++ <const>rgb</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>SubpixelDisabledArial</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Arimo</string>
	++ </edit>
	++ <edit name="rgba" mode="assign">
	++ <const>none</const>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <!-- FontConfig doesn't currently provide a well-defined way to turn on
	++ subpixel positioning. This is just an arbitrary pattern to use after
	++ turning subpixel positioning on globally to ensure that we don't have
	++ issues with our style getting cached for other tests. -->
	++ <test name="family" compare="eq">
	++ <string>SubpixelPositioning</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <!-- See comments above -->
	++ <test name="family" compare="eq">
	++ <string>SubpixelPositioningAhem</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>ahem</string>
	++ </edit>
	++ </match>
	++
	++ <match target="pattern">
	++ <test name="family" compare="eq">
	++ <string>SlightHintedTimesNewRoman</string>
	++ </test>
	++ <edit name="family" mode="assign">
	++ <string>Tinos</string>
	++ </edit>
	++ <edit name="hintstyle" mode="assign">
	++ <const>hintslight</const>
	++ </edit>
	++ </match>
	++
	++ <!-- When we encounter a character that the current font doesn't
	++ support, gfx::GetFallbackFontForChar() returns the first font
	++ that does have a glyph for the character. The list of fonts is
	++ sorted by a pattern that includes the current locale, but doesn't
	++ include a font family (which means that the fallback font depends
	++ on the locale but not on the current font).
	++
	++ DejaVu Sans is commonly the only font that supports some
	++ characters, such as "⇧", and even when other candidates are
	++ available, DejaVu Sans is commonly first among them, because of
	++ the way Fontconfig is ordinarily configured. For example, the
	++ configuration in the Fonconfig source lists DejaVu Sans under the
	++ sans-serif generic family, and appends sans-serif to patterns
	++ that don't already include a generic family (such as the pattern
	++ in gfx::GetFallbackFontForChar()).
	++
	++ To get the same fallback font in the layout tests, we could
	++ duplicate this configuration here, or more directly, simply
	++ append DejaVu Sans to all patterns. -->
	++ <match target="pattern">
	++ <edit name="family" mode="append_last">
	++ <string>DejaVu Sans</string>
	++ </edit>
	++ </match>
	++
	++</fontconfig>
	++)";
	++
	++} // namespace
	++
	+ void SetUpFontconfig() {
	+- FilePath dir_module;
	+- CHECK(PathService::Get(DIR_MODULE, &dir_module));
	++ std::unique_ptr<Environment> env = Environment::Create();
	++ if (!env->HasVar("FONTCONFIG_FILE")) {
	++ // fonts.conf must be generated on-the-fly since it contains absolute paths
	++ // which may be different if
	++ // 1. The user moves/renames their build directory (or any parent dirs).
	++ // 2. The build directory is mapped on a swarming bot at a location
	++ // different from the one the buildbot used.
	++ FilePath dir_module;
	++ PathService::Get(DIR_MODULE, &dir_module);
	++ FilePath font_cache = dir_module.Append("fontconfig_caches");
	++ FilePath test_fonts = dir_module.Append("test_fonts");
	++ std::string fonts_conf = ReplaceStringPlaceholders(
	++ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr);
	+
	+- std::unique_ptr<Environment> env(Environment::Create());
	+- // TODO(thomasanderson): This still stat()'s the real /etc/fonts/fonts.conf.
	+- // Prevent fontconfig from doing this.
	+- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str()));
	++ // Write the data to a different file and then atomically rename it to
	++ // fonts.conf. This avoids the file being in a bad state when different
	++ // parallel tests call this function at the same time.
	++ FilePath fonts_conf_file_temp;
	++ if(!CreateTemporaryFileInDir(dir_module, &fonts_conf_file_temp))
	++ CHECK(CreateTemporaryFile(&fonts_conf_file_temp));
	++ CHECK(
	++ WriteFile(fonts_conf_file_temp, fonts_conf.c_str(), fonts_conf.size()));
	++ FilePath fonts_conf_file = dir_module.Append("fonts.conf");
	++ if (ReplaceFile(fonts_conf_file_temp, fonts_conf_file, nullptr))
	++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file.value());
	++ else
	++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file_temp.value());
	++ }
	+ }
	+
	+ } // namespace base
	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 <utility>

	#include "base/bind.h"
	+#include "base/callback_helpers.h"
	#include "base/lazy_instance.h"
	#include "base/logging.h"
	- #include "base/memory/ptr_util.h"
	+ #include "base/run_loop.h"
	@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
	return !!thread_task_runner_tls.Pointer()->Get();
	}
	@@ -16,7 +16,7 @@
	// static
	ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
	scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
	-@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
	+@@ -81,6 +83,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
	base::Unretained(ttrh->task_runner_.get()),
	std::move(no_running_during_override)));
	}
	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 <malloc/malloc.h>
	+#elif defined(OS_BSD)
	-+#include "stdlib.h"
	++#include <stdlib.h>
	#else
	#include <malloc.h>
	#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
	+ </if>
	+
	+ <!-- about:browser-switch strings -->
	+- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
	++ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
	+ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
	+ Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
	+ </message>
	+@@ -825,7 +825,7 @@ Signing in anyway will merge Chromium information like
	</message>

	<!-- ProcessSingleton -->
	- <if expr="is_linux or is_macosx">
	+ <if expr="is_linux or is_macosx or is_posix">
	<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
	- The profile appears to be in use by another browser process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). 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 (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
	</message>
	-@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
	+@@ -1069,7 +1069,7 @@ Signing in anyway will merge Chromium information like
	</message>

	<!-- Plugin Placeholders -->
	- <if expr="is_linux">
	+ <if expr="is_posix">
	<message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
	- Restart the browser to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
	+ Restart Chromium to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
	</message>
	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.">
	- </message>
	+@@ -4885,7 +4885,7 @@ Keep your key file in a safe place. You will need it t
	</if>

	-- <if expr="is_win or (is_linux and not chromeos)">
	-+ <if expr="is_win or (is_posix and not chromeos)">
	- <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
	- Press \|<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>\|+\|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>\| followed by \|<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>\| to exit
	+ <!-- chrome://browser-switch strings -->
	+- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
	++ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
	+ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
	+ Legacy Browser Support
	</message>
	-@@ -6160,7 +6160,7 @@ the Bookmarks menu.">
	+@@ -6514,7 +6514,7 @@ the Bookmarks menu.">
	Google Pay
	</message>

	@@ -18,7 +18,7 @@
	<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
	Use system title bar and borders
	</message>
	-@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh
	+@@ -7395,7 +7395,7 @@ Please help our engineers fix this problem. Tell us wh
	Set as default
	</message>

	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
	+ </if>
	+
	+ <!-- about:browser-switch strings -->
	+- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
	++ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
	+ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
	+ Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
	+ </message>
	+@@ -837,7 +837,7 @@ Signing in anyway will merge Chrome information like b
	</message>

	<!-- ProcessSingleton -->
	@@ -9,7 +18,7 @@
	<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
	The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
	</message>
	-@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
	+@@ -1088,7 +1088,7 @@ Signing in anyway will merge Chrome information like b
	</message>

	<!-- Plugin Placeholders -->
	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
	</message>
	</if>
	@@ -9,7 +9,7 @@
	<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
	GTK+
	</message>
	-@@ -594,7 +594,7 @@
	+@@ -771,7 +771,7 @@
	Use Classic
	</message>
	</if>
	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 @@
	+ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
	+ <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" />
	+ <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" />
	+- <if expr="is_linux">
	++ <if expr="is_posix">
	+ <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
	+ <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
	+ </if>
	+@@ -109,7 +109,7 @@
	<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
	<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
	</if>
	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 @@
	+ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
	+ BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
	+ SAME CONDITIONALS. -->
	+- <if expr="is_linux or is_win or chromeos">
	++ <if expr="is_posix or is_win or chromeos">
	+ <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" />
	+ </if>
	+ <if expr="toolkit_views and not is_macosx">
	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<AfterStartupTask> queue
	+@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> 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 <ifaddrs.h>
	#include <net/if.h>
	#include <stddef.h>
	-@@ -105,9 +110,36 @@ class MacAddressProcessor {
	+@@ -106,9 +111,36 @@ class MacAddressProcessor {
	const char* const prefixes[],
	size_t prefixes_count) {
	const int MAC_LENGTH = 6;
	@@ -49,7 +49,7 @@
	strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);

	int sd = socket(AF_INET, SOCK_DGRAM, 0);
	-@@ -119,11 +151,18 @@ class MacAddressProcessor {
	+@@ -120,11 +152,18 @@ class MacAddressProcessor {

	const char* mac_address =
	static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
	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 @@
	- <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
	+@@ -106,7 +106,7 @@
	+ <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" />
	+ <include name="IDR_DISCARDS_WEBUI_GRAPH_DUMP_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\performance_manager\webui_graph_dump.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
	+ </if>
	+- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
	++ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)">
	+ <include name="IDR_BROWSER_SWITCH_APP_HTML" file="resources\browser_switch\app.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
	+ <include name="IDR_BROWSER_SWITCH_APP_JS" file="resources\browser_switch\app.js" compress="gzip" type="BINDATA" />
	+ <include name="IDR_BROWSER_SWITCH_PROXY_HTML" file="resources\browser_switch\browser_switch_proxy.html" compress="gzip" allowexternalscript="true" type="BINDATA" />
	+@@ -561,7 +561,7 @@
	+ <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_window_close_hover.png" type="BINDATA" />
	</if>
	<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
	- <if expr="is_android or is_linux">
	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<chromeos::ChromeBrowserMainPartsChromeos>(
	+ parameters, startup_data_);
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	main_parts =
	- new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_);
	+ std::make_unique<ChromeBrowserMainPartsLinux>(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<content::NavigationThrottle> browser_switcher_throttle =
	browser_switcher::BrowserSwitcherNavigationThrottle ::
	-@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa
	- #if defined(OS_ANDROID)
	- frame_interfaces_parameterized_->AddInterface(base::Bind(
	- &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>));
	--#elif defined(OS_LINUX) \|\| defined(OS_WIN)
	-+#elif defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	- frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create));
	- #endif
	-
	-@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow>
	- 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 <re2/re2.h>
	+#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::LazyInstance<scoped_refptr<StorageDeviceL
	+@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL

	void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
	DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
	@@ -8,7 +8,7 @@
	if (g_test_device_list.Get().get() != nullptr) {
	base::ThreadTaskRunnerHandle::Get()->PostTask(
	FROM_HERE,
	-@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
	+@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
	base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
	base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
	std::move(callback));
	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<ExternalProviderImpl>(
	service,
	- new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
	-@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders(
	+ base::MakeRefCounted<ExternalPrefLoader>(
	+@@ -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<ExternalProviderImpl>(
	service,
	- new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
	+ base::MakeRefCounted<ExternalPrefLoader>(
	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> 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<uint8_t[]> 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<uint8_t[]> 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 <gnu/libc-version.h>
	@@ -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<DesktopPlatformFeaturesMetricsProvider>());
	+ #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<PersistentNotificationHandler>());
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ AddNotificationHandler(
	+ NotificationHandler::Type::SEND_TAB_TO_SELF,
	+ std::make_unique<send_tab_to_self::DesktopNotificationHandler>(
	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 <re2/re2.h>
	@@ -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<password_manager::PasswordStoreSigninNotifier> notifier =
	std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
	+ 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<component_updater::ComponentInfo> cus_plugin_info) {
	+ if (cus_plugin_info) {
	+ output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired;
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (cus_plugin_info->version != base::Version("0")) {
	+ output->status = chrome::mojom::PluginStatus::kRestartRequired;
	+ }
	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<BrowserSigninMode>(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<network::SharedURLLoaderFactory> url_loader_factory) {
	--#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	-+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	- // This is a function that removes the directory we accidentally create due to
	- // crbug.com/880870. The directory is only removed when it's empty and
	- // enrollment token doesn't exist. This function is expected to be removed
	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() {}

	// </if>
	-@@ -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 @@
	+ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
	label="$i18n{themes}" sub-label="[[themeSublabel_]]"
	- on-click="openThemeUrl_"></cr-link-row>
	+ on-click="openThemeUrl_" external></cr-link-row>
	-<if expr="not is_linux or chromeos">
	+<if expr="not is_posix or chromeos">
	<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
	<div class="separator"></div>
	- <paper-button id="useDefault" on-click="onUseDefaultTap_"
	-@@ -74,7 +74,7 @@
	- </paper-button>
	+ <cr-button id="useDefault" on-click="onUseDefaultTap_">
	+@@ -75,7 +75,7 @@
	+ </cr-button>
	</template>
	</if>
	-<if expr="is_linux and not chromeos">
	+<if expr="is_posix and not chromeos">
	<div class="settings-row continuation"
	hidden="[[!showThemesSecondary_(
	- prefs.extensions.theme.id.value, useSystemTheme_)]]"
	-@@ -139,7 +139,7 @@
	+ prefs.extensions.theme.id.value, useSystemTheme_)]]"
	+@@ -138,7 +138,7 @@
	pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
	label="$i18n{showBookmarksBar}">
	</settings-toggle-button>
	Index: www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
	===================================================================
	--- www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
	+++ www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
	@@ -1,6 +1,6 @@
	---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/resources/settings/appearance_page/appearance_page.js
	-@@ -120,7 +120,7 @@ Polymer({
	+@@ -130,7 +130,7 @@ Polymer({
	'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
	'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',

	@@ -9,8 +9,8 @@
	// NOTE: this pref only exists on Linux.
	'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
	// </if>
	-@@ -223,7 +223,7 @@ Polymer({
	- this.browserProxy_.useDefaultTheme();
	+@@ -238,7 +238,7 @@ Polymer({
	+ this.appearanceBrowserProxy_.useDefaultTheme();
	},

	- // <if expr="is_linux and not chromeos">
	@@ -18,7 +18,7 @@
	/**
	* @param {boolean} useSystemTheme
	* @private
	-@@ -292,10 +292,10 @@ Polymer({
	+@@ -315,10 +315,10 @@ Polymer({
	}

	let i18nId;
	Index: www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
	+++ www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
	@@ -1,8 +1,8 @@
	---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
	@@ -8,7 +8,12 @@

	- #include "base/hash.h"
	+ #include "base/hash/hash.h"
	#include "base/logging.h"
	+//XXX(rene) needs shim headers?
	+#if defined(USE_SYSTEM_PROTOBUF)
	Index: www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
	+++ www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-04-10 10:50:04 UTC
	+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
	-@@ -718,7 +718,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
	+@@ -713,7 +713,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
	environment_collection_pending_ = false;

	// Process::Current().CreationTime() is missing on some platforms.
	Index: www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc
	+++ www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc
	@@ -1,16 +0,0 @@
	---- chrome/browser/search/local_files_ntp_source.cc.orig 2019-03-11 22:00:54 UTC
	-+++ chrome/browser/search/local_files_ntp_source.cc
	-@@ -20,8 +20,13 @@
	- #include "build/build_config.h"
	- #include "chrome/common/url_constants.h"
	- #include "content/public/browser/url_data_source.h"
	-+#if defined(OS_BSD)
	-+#include <re2/re2.h>
	-+#include <re2/stringpiece.h>
	-+#else
	- #include "third_party/re2/src/re2/re2.h"
	- #include "third_party/re2/src/re2/stringpiece.h"
	-+#endif
	-
	- namespace {
	-
	Index: www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
	+++ www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc
	@@ -0,0 +1,14 @@
	+--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2019-09-09 21:55:10 UTC
	++++ chrome/browser/search/search_suggest/search_suggest_service.cc
	+@@ -17,7 +17,11 @@
	+ #include "components/prefs/scoped_user_pref_update.h"
	+ #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
	+ #include "components/signin/public/identity_manager/identity_manager.h"
	++#if defined(OS_BSD)
	++#include <re2/re2.h>
	++#else
	+ #include "third_party/re2/src/re2/re2.h"
	++#endif
	+
	+ namespace {
	+
	Index: www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
	+++ www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
	@@ -0,0 +1,20 @@
	+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2019-06-07 20:47:39 UTC
	++++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
	+@@ -11,7 +11,7 @@
	+ #include "chrome/browser/profiles/profile.h"
	+ #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h"
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
	+ #endif
	+
	+@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry
	+ // Instantiates all the handlers relevant to this platform.
	+ void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers(
	+ Profile* profile) {
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ applicable_handlers_.push_back(
	+ std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile));
	+ #elif defined(OS_ANDROID)
	Index: www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
	+++ www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc
	@@ -0,0 +1,11 @@
	+--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC
	++++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc
	+@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa
	+ void SendTabToSelfClientService::EntriesAddedRemotely(
	+ const std::vector<const SendTabToSelfEntry*>& new_entries) {
	+ for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) {
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ // Only respond to notifications corresponding to this service's profile
	+ // for these OSes; mobile does not have a Profile.
	+ // Cast note: on desktop, handlers are guaranteed to be the derived class
	Index: www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.h
	+++ www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.h
	@@ -0,0 +1,20 @@
	+--- chrome/browser/sharing/click_to_call/feature.h.orig 2019-10-21 19:06:23 UTC
	++++ chrome/browser/sharing/click_to_call/feature.h
	+@@ -13,7 +13,7 @@
	+ extern const base::Feature 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)
	+ // Feature to allow click to call gets processed on desktop.
	+ extern const base::Feature kClickToCallUI;
	+@@ -21,7 +21,7 @@ extern const base::Feature kClickToCallUI;
	+ // Feature to show click to call in context menu when selected text is a phone
	+ // number.
	+ extern const base::Feature kClickToCallContextMenuForSelectedText;
	+-#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)
	+
	+ #endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_FEATURE_H_
	Index: www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.cc
	+++ www/iridium/files/patch-chrome_browser_sharing_click__to__call_feature.cc
	@@ -0,0 +1,17 @@
	+--- chrome/browser/sharing/click_to_call/feature.cc.orig 2019-10-21 19:06:23 UTC
	++++ chrome/browser/sharing/click_to_call/feature.cc
	+@@ -9,12 +9,12 @@ const base::Feature kClickToCallReceiver{"ClickToCallR
	+ base::FEATURE_ENABLED_BY_DEFAULT};
	+ #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)
	+ const base::Feature kClickToCallContextMenuForSelectedText{
	+ "ClickToCallContextMenuForSelectedText", base::FEATURE_DISABLED_BY_DEFAULT};
	+
	+ const base::Feature kClickToCallUI{"ClickToCallUI",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\|
	++#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD) \|\|
	+ // defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-chrome_browser_signin_signin__util.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_signin_signin__util.cc
	+++ www/iridium/files/patch-chrome_browser_signin_signin__util.cc
	@@ -1,6 +1,15 @@
	---- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/signin/signin_util.cc.orig 2019-09-09 21:55:10 UTC
	+++ chrome/browser/signin/signin_util.cc
	-@@ -42,7 +42,7 @@ namespace {
	+@@ -34,7 +34,7 @@
	+ #include "google_apis/gaia/gaia_auth_util.h"
	+ #include "ui/base/l10n/l10n_util.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_finder.h"
	+ #include "chrome/browser/ui/browser_list.h"
	+ #include "chrome/browser/ui/browser_list_observer.h"
	+@@ -46,7 +46,7 @@ namespace {

	constexpr char kSignoutSettingKey[] = "signout_setting";

	Index: www/iridium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
	+++ www/iridium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc
	@@ -0,0 +1,11 @@
	+--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2019-06-04 18:55:18 UTC
	++++ chrome/browser/ssl/captive_portal_blocking_page.cc
	+@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c
	+ wifi_service->GetConnectedNetworkSSID(&ssid, &error);
	+ if (!error.empty())
	+ return std::string();
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ ssid = net::GetWifiSSID();
	+ #elif defined(OS_ANDROID)
	+ ssid = net::android::GetWifiSSID();
	Index: www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
	+++ www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-09-09 21:55:10 UTC
	+++ chrome/browser/ssl/ssl_error_controller_client.cc
	-@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() {
	+@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() {
	#if defined(OS_ANDROID)
	chrome::android::OpenDateAndTimeSettings();

	@@ -9,12 +9,12 @@
	struct ClockCommand {
	const char* const pathname;
	const char* const argument;
	-@@ -219,7 +219,7 @@ void SSLErrorControllerClient::Proceed() {
	+@@ -204,7 +204,7 @@ void SSLErrorControllerClient::Proceed() {
	+ }

	bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
	- #if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| \
	-- defined(OS_WIN)
	-+ defined(OS_WIN) \|\| defined(OS_BSD)
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| \
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_WIN)
	return true;
	#else
	- return false;
	Index: www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
	+++ www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
	@@ -1,17 +1,17 @@
	---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/sync/chrome_sync_client.cc
	-@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
	- }
	+@@ -389,7 +389,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
	+ GetSyncableServiceForType(syncer::APP_LIST), dump_stack));
	#endif // BUILDFLAG(ENABLE_APP_LIST)

	-#if defined(OS_LINUX) \|\| defined(OS_WIN)
	+#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	// Dictionary sync is enabled by default.
	if (!disabled_types.Has(syncer::DICTIONARY)) {
	- if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) {
	-@@ -444,7 +444,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
	- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
	- }
	+ controllers.push_back(
	+@@ -397,7 +397,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
	+ syncer::DICTIONARY, GetModelTypeStoreService()->GetStoreFactory(),
	+ GetSyncableServiceForType(syncer::DICTIONARY), dump_stack));
	}
	-#endif // defined(OS_LINUX) \|\| defined(OS_WIN)
	+#endif // defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
	+++ www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
	@@ -1,6 +1,15 @@
	---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/task_manager/sampling/task_group.h
	-@@ -106,9 +106,9 @@ class TaskGroup {
	+@@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags =
	+ REFRESH_TYPE_WEBCACHE_STATS \| REFRESH_TYPE_NETWORK_USAGE \|
	+ REFRESH_TYPE_NACL \| REFRESH_TYPE_IDLE_WAKEUPS \| REFRESH_TYPE_HANDLES \|
	+ REFRESH_TYPE_START_TIME \| REFRESH_TYPE_CPU_TIME \| REFRESH_TYPE_PRIORITY \|
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ REFRESH_TYPE_FD_COUNT \|
	+ #endif
	+ REFRESH_TYPE_HARD_FAULTS;
	+@@ -122,9 +122,9 @@ class TaskGroup {
	int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
	#endif // BUILDFLAG(ENABLE_NACL)

	@@ -11,8 +20,8 @@
	+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)

	int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
	- private:
	-@@ -121,9 +121,9 @@ class TaskGroup {
	+
	+@@ -138,9 +138,9 @@ class TaskGroup {
	void RefreshNaClDebugStubPort(int child_process_unique_id);
	void OnRefreshNaClDebugStubPortDone(int port);
	#endif
	@@ -24,7 +33,7 @@

	void OnCpuRefreshDone(double cpu_usage);
	void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
	-@@ -191,10 +191,10 @@ class TaskGroup {
	+@@ -209,10 +209,10 @@ class TaskGroup {
	#if BUILDFLAG(ENABLE_NACL)
	int nacl_debug_stub_port_;
	#endif // BUILDFLAG(ENABLE_NACL)
	Index: www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
	+++ www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
	@@ -1,4 +1,4 @@
	---- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-09-09 21:55:10 UTC
	+++ chrome/browser/task_manager/sampling/task_group.cc
	@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask =
	#if defined(OS_WIN)
	@@ -12,7 +12,7 @@
	#if BUILDFLAG(ENABLE_NACL)
	REFRESH_TYPE_NACL \|
	#endif // BUILDFLAG(ENABLE_NACL)
	-@@ -112,9 +112,9 @@ TaskGroup::TaskGroup(
	+@@ -114,9 +114,9 @@ TaskGroup::TaskGroup(
	#if BUILDFLAG(ENABLE_NACL)
	nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
	#endif // BUILDFLAG(ENABLE_NACL)
	@@ -23,8 +23,8 @@
	+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	idle_wakeups_per_second_(-1),
	gpu_memory_has_duplicates_(false),
	- is_backgrounded_(false),
	-@@ -128,10 +128,10 @@ TaskGroup::TaskGroup(
	+ is_backgrounded_(false) {
	+@@ -129,10 +129,10 @@ TaskGroup::TaskGroup(
	weak_ptr_factory_.GetWeakPtr()),
	base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
	weak_ptr_factory_.GetWeakPtr()),
	@@ -37,7 +37,7 @@
	base::Bind(&TaskGroup::OnProcessPriorityDone,
	weak_ptr_factory_.GetWeakPtr()));

	-@@ -296,14 +296,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
	+@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
	}
	#endif // BUILDFLAG(ENABLE_NACL)

	Index: www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
	+++ www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
	@@ -1,4 +1,4 @@
	---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/task_manager/sampling/task_group_sampler.h
	@@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread
	using OnCpuRefreshCallback = base::Callback<void(double)>;
	@@ -36,7 +36,7 @@
	bool RefreshProcessPriority();

	// The process that holds the handle that we own so that we can use it for
	-@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread
	+@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread
	const OnCpuRefreshCallback on_cpu_refresh_callback_;
	const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
	const OnIdleWakeupsCallback on_idle_wakeups_callback_;
	Index: www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
	+++ www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-09-09 21:55:10 UTC
	+++ chrome/browser/task_manager/sampling/task_group_sampler.cc
	-@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler(
	+@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler(
	const OnCpuRefreshCallback& on_cpu_refresh,
	const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
	const OnIdleWakeupsCallback& on_idle_wakeups,
	@@ -12,7 +12,7 @@
	const OnProcessPriorityCallback& on_process_priority)
	: process_(std::move(process)),
	process_metrics_(CreateProcessMetrics(process_.Handle())),
	-@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler(
	+@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler(
	on_cpu_refresh_callback_(on_cpu_refresh),
	on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
	on_idle_wakeups_callback_(on_idle_wakeups),
	@@ -24,7 +24,7 @@
	on_process_priority_callback_(on_process_priority) {
	DCHECK(blocking_pool_runner.get());

	-@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	+@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	on_swapped_mem_refresh_callback_);
	}

	@@ -33,7 +33,7 @@
	if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
	refresh_flags)) {
	base::PostTaskAndReplyWithResult(
	-@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	+@@ -95,9 +95,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
	on_idle_wakeups_callback_);
	}
	@@ -45,7 +45,7 @@
	if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
	refresh_flags)) {
	base::PostTaskAndReplyWithResult(
	-@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	+@@ -106,7 +106,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
	base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this),
	on_open_fd_count_callback_);
	}
	@@ -54,7 +54,7 @@

	if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY,
	refresh_flags)) {
	-@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
	+@@ -149,13 +149,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
	return process_metrics_->GetIdleWakeupsPerSecond();
	}

	Index: www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
	+++ www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
	-@@ -207,11 +207,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
	+@@ -219,11 +219,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
	}

	int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
	Index: www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
	+++ www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc
	@@ -0,0 +1,29 @@
	+--- chrome/browser/themes/theme_service_factory.cc.orig 2019-10-30 15:53:20 UTC
	++++ chrome/browser/themes/theme_service_factory.cc
	+@@ -18,7 +18,7 @@
	+
	+ #if defined(OS_WIN)
	+ #include "chrome/browser/themes/theme_service_win.h"
	+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ #include "chrome/browser/themes/theme_service_aura_linux.h"
	+ #include "ui/views/linux_ui/linux_ui.h"
	+ #endif
	+@@ -60,7 +60,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
	+ ThemeService* provider = NULL;
	+ #if defined(OS_WIN)
	+ provider = new ThemeServiceWin;
	+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ provider = new ThemeServiceAuraLinux;
	+ #else
	+ provider = new ThemeService;
	+@@ -72,7 +72,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
	+
	+ void ThemeServiceFactory::RegisterProfilePrefs(
	+ user_prefs::PrefRegistrySyncable* registry) {
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ bool default_uses_system_theme = false;
	+
	+ const views::LinuxUI* linux_ui = views::LinuxUI::instance();
	Index: www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
	+++ www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-10-21 19:06:23 UTC
	+++ chrome/browser/tracing/crash_service_uploader.cc
	-@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
	+@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground
	const char product[] = "Chrome_Linux";
	#elif defined(OS_ANDROID)
	const char product[] = "Chrome_Android";
	Index: www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
	+++ www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/browser_command_controller.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/browser_command_controller.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/browser_command_controller.cc
	-@@ -79,7 +79,7 @@
	+@@ -81,7 +81,7 @@
	#include "chrome/browser/ui/browser_commands_chromeos.h"
	#endif

	@@ -9,7 +9,7 @@
	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
	#endif

	-@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
	+@@ -251,7 +251,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
	#endif
	}

	@@ -18,7 +18,7 @@
	// If this key was registered by the user as a content editing hotkey, then
	// it is not reserved.
	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
	-@@ -421,7 +421,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
	+@@ -467,7 +467,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
	break;
	#endif

	@@ -27,7 +27,7 @@
	case IDC_MINIMIZE_WINDOW:
	browser_->window()->Minimize();
	break;
	-@@ -860,7 +860,7 @@ void BrowserCommandController::InitCommandState() {
	+@@ -925,7 +925,7 @@ void BrowserCommandController::InitCommandState() {
	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
	command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
	#endif
	Index: www/iridium/files/patch-chrome_browser_ui_browser__window.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_browser__window.h
	+++ www/iridium/files/patch-chrome_browser_ui_browser__window.h
	@@ -1,11 +0,0 @@
	---- chrome/browser/ui/browser_window.h.orig 2019-04-05 00:49:05 UTC
	-+++ chrome/browser/ui/browser_window.h
	-@@ -425,7 +425,7 @@ class BrowserWindow : public ui::BaseWindow {
	- bool is_source_keyboard) = 0;
	-
	- #if defined(OS_CHROMEOS) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| \
	-- defined(OS_LINUX)
	-+ defined(OS_LINUX) \|\| defined(OS_BSD)
	- virtual void ShowHatsBubbleFromAppMenuButton() = 0;
	- #endif
	-
	Index: www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
	+++ www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
	@@ -1,11 +0,0 @@
	---- chrome/browser/ui/input_method/input_method_engine.h.orig 2019-03-11 22:00:54 UTC
	-+++ chrome/browser/ui/input_method/input_method_engine.h
	-@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase
	-
	- // ui::IMEEngineHandlerInterface:
	- bool IsActive() const override;
	-- std::string GetExtensionId() const override;
	-+ std::string GetExtensionId() const;
	-
	- // Creates and shows the IME window.
	- // Returns 0 for errors and \|error\| will contains the error message.
	Index: www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
	+++ www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-04-30 22:22:36 UTC
	+++ chrome/browser/ui/input_method/input_method_engine_base.cc
	-@@ -29,7 +29,7 @@
	+@@ -30,7 +30,7 @@
	#include "ui/base/ime/chromeos/ime_keymap.h"
	#elif defined(OS_WIN)
	#include "ui/events/keycodes/keyboard_codes_win.h"
	Index: www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
	+++ www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc
	-@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog(
	+@@ -336,6 +336,7 @@ void PrintDialogGtk::ShowDialog(
	// Since we only generate PDF, only show printers that support PDF.
	// TODO(thestig) Add more capabilities to support?
	GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
	Index: www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
	+++ www/iridium/files/patch-chrome_browser_ui_sad__tab.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/sad_tab.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/sad_tab.cc.orig 2019-09-09 21:55:10 UTC
	+++ chrome/browser/ui/sad_tab.cc
	-@@ -180,7 +180,7 @@ std::vector<int> SadTab::GetSubMessages() {
	+@@ -181,7 +181,7 @@ std::vector<int> SadTab::GetSubMessages() {
	// Only show incognito suggestion if not already in Incognito mode.
	if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
	message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
	Index: www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
	+++ www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/startup/bad_flags_prompt.cc
	-@@ -84,7 +84,7 @@ static const char* kBadFlags[] = {
	+@@ -89,7 +89,7 @@ static const char* kBadFlags[] = {
	extensions::switches::kExtensionsOnChromeURLs,
	#endif

	Index: www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
	+++ www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/startup/startup_browser_creator.cc
	-@@ -79,7 +79,7 @@
	+@@ -85,7 +85,7 @@
	#include "chrome/browser/ui/user_manager.h"
	#endif

	@@ -9,7 +9,16 @@
	#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
	#endif

	-@@ -633,8 +633,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
	+@@ -295,7 +295,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co
	+ // true, send a warning if guest mode is requested but not allowed by policy.
	+ bool IsGuestModeEnforced(const base::CommandLine& command_line,
	+ bool show_warning) {
	+-#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)
	++#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ PrefService* service = g_browser_process->local_state();
	+ DCHECK(service);
	+
	+@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
	}
	#endif // OS_CHROMEOS

	Index: www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
	+++ www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/tab_helpers.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/tab_helpers.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/tab_helpers.cc
	-@@ -116,7 +116,7 @@
	+@@ -121,7 +121,7 @@
	#include "components/zoom/zoom_controller.h"
	#endif // defined(OS_ANDROID)

	@@ -9,7 +9,7 @@
	#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
	#include "chrome/browser/ui/hats/hats_helper.h"
	#endif
	-@@ -309,11 +309,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
	+@@ -313,11 +313,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
	#endif

	#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	@@ -21,5 +21,5 @@
	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	if (base::FeatureList::IsEnabled(
	- features::kHappinessTrackingSurveysForDesktop)) {
	- HatsHelper::CreateForWebContents(web_contents);
	+ features::kHappinessTrackingSurveysForDesktop) \|\|
	+ base::FeatureList::IsEnabled(
	Index: www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
	+++ www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
	-@@ -430,13 +430,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
	+@@ -451,13 +451,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
	? stringifier_->backgrounded_string()
	: stringifier_->foregrounded_string();

	@@ -16,7 +16,7 @@

	case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: {
	return stringifier_->GetKeepaliveCountText(
	-@@ -590,7 +590,7 @@ int TaskManagerTableModel::CompareValues(int row1,
	+@@ -617,7 +617,7 @@ int TaskManagerTableModel::CompareValues(int row1,
	return BooleanCompare(is_proc1_bg, is_proc2_bg);
	}

	@@ -25,7 +25,7 @@
	case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
	const int proc1_fd_count =
	observed_task_manager()->GetOpenFdCount(tasks_[row1]);
	-@@ -598,7 +598,7 @@ int TaskManagerTableModel::CompareValues(int row1,
	+@@ -625,7 +625,7 @@ int TaskManagerTableModel::CompareValues(int row1,
	observed_task_manager()->GetOpenFdCount(tasks_[row2]);
	return ValueCompare(proc1_fd_count, proc2_fd_count);
	}
	@@ -34,7 +34,7 @@

	default:
	NOTREACHED();
	-@@ -760,11 +760,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
	+@@ -791,11 +791,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
	type = REFRESH_TYPE_KEEPALIVE_COUNT;
	break;

	Index: www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
	+++ www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
	@@ -1,11 +1,11 @@
	---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/toolbar/app_menu_model.cc
	-@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
	+@@ -685,7 +685,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id)
	return app_menu_icon_controller_->GetTypeAndSeverity().type ==
	AppMenuIconController::IconType::UPGRADE_NOTIFICATION;
	}
	-#if !defined(OS_LINUX) \|\| defined(USE_AURA)
	+#if (!defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(USE_AURA)
	- case IDC_BOOKMARK_PAGE:
	- return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
	+ case IDC_BOOKMARK_THIS_TAB:
	+ return !chrome::ShouldRemoveBookmarkThisTabUI(browser_->profile());
	case IDC_BOOKMARK_ALL_TABS:
	Index: www/iridium/files/patch-chrome_browser_ui_ui__features.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_ui__features.h
	+++ www/iridium/files/patch-chrome_browser_ui_ui__features.h
	@@ -0,0 +1,11 @@
	+--- chrome/browser/ui/ui_features.h.orig 2019-10-21 19:06:24 UTC
	++++ chrome/browser/ui/ui_features.h
	+@@ -46,7 +46,7 @@ extern const base::Feature kWebFooterExperiment;
	+
	+ extern const base::Feature kWebUITabStrip;
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ extern const base::Feature kEnableDbusAndX11StatusIcons;
	+ #endif
	+
	Index: www/iridium/files/patch-chrome_browser_ui_ui__features.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_ui__features.cc
	+++ www/iridium/files/patch-chrome_browser_ui_ui__features.cc
	@@ -0,0 +1,11 @@
	+--- chrome/browser/ui/ui_features.cc.orig 2019-10-21 19:06:24 UTC
	++++ chrome/browser/ui/ui_features.cc
	+@@ -74,7 +74,7 @@ const base::Feature kWebFooterExperiment{"WebFooterExp
	+ const base::Feature kWebUITabStrip{"WebUITabStrip",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ constexpr base::Feature kEnableDbusAndX11StatusIcons{
	+ "EnableDbusAndX11StatusIcons", base::FEATURE_ENABLED_BY_DEFAULT};
	+ #endif
	Index: www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-09-09 21:55:11 UTC
	+++ chrome/browser/ui/views/accelerator_table.cc
	-@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	+@@ -51,7 +51,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
	{ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
	{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
	@@ -9,7 +9,7 @@
	{ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
	{ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
	{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN \| ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
	-@@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	+@@ -81,7 +81,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	{ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
	{ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
	{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
	@@ -18,7 +18,7 @@
	{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
	{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
	{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
	-@@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	+@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
	{ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
	{ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
	{ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR},
	@@ -27,8 +27,8 @@
	{ui::VKEY_B, ui::EF_SHIFT_DOWN \| ui::EF_PLATFORM_ACCELERATOR,
	IDC_SHOW_BOOKMARK_BAR},
	{ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS},
	-@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
	- {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN},
	+@@ -125,14 +125,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
	+ IDC_SHOW_AVATAR_MENU},

	// Platform-specific key maps.
	-#if defined(OS_LINUX)
	Index: www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
	-@@ -35,7 +35,7 @@
	+@@ -36,7 +36,7 @@
	#include "ui/wm/core/wm_state.h"
	#endif // defined(USE_AURA)

	@@ -9,25 +9,25 @@
	#include <sys/stat.h>
	#include <sys/types.h>
	#include <unistd.h>
	-@@ -45,7 +45,7 @@
	+@@ -46,7 +46,7 @@
	#include "chrome/grit/generated_resources.h"
	#include "content/public/common/content_switches.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)

	- ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {}
	-
	-@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
	+ // This connector is used in ui_devtools's TracingAgent to hook up with the
	+ // tracing service.
	+@@ -109,7 +109,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
	+ devtools_server_->tracing_agent());
	}
	- #endif

	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	// On the Linux desktop, we want to prevent the user from logging in as root,
	// so that we don't destroy the profile. Now that we have some minimal ui
	// initialized, check to see if we're running as root and bail if we are.
	-@@ -124,7 +124,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
	+@@ -140,7 +140,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
	base::RunLoop().RunUntilIdle();

	exit(EXIT_FAILURE);
	Index: www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
	+++ www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
	@@ -1,11 +1,11 @@
	---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/ui/views/chrome_views_delegate.h
	@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
	HICON GetSmallWindowIcon() const override;
	int GetAppbarAutohideEdges(HMONITOR monitor,
	- const base::Closure& callback) override;
	+ base::OnceClosure callback) override;
	-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#elif (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	gfx::ImageSkia* GetDefaultWindowIcon() const override;
	bool WindowManagerProvidesTitleBar(bool maximized) override;
	#endif
	Index: www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
	@@ -1,4 +1,4 @@
	---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-09-09 21:55:11 UTC
	+++ chrome/browser/ui/views/first_run_dialog.cc
	@@ -37,8 +37,10 @@
	namespace {
	@@ -11,14 +11,14 @@
	}

	} // namespace
	-@@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() {
	+@@ -108,8 +110,10 @@ std::unique_ptr<views::View> FirstRunDialog::CreateExt
	bool FirstRunDialog::Accept() {
	GetWidget()->Hide();

	+#if !defined(OS_BSD)
	- ChangeMetricsReportingStateWithReply(report_crashes_->checked(),
	+ ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(),
	base::Bind(&InitCrashReporterIfEnabled));
	+#endif

	- if (make_default_->checked())
	+ if (make_default_->GetChecked())
	shell_integration::SetAsDefaultBrowser();
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
	@@ -1,15 +1,6 @@
	---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/frame/browser_frame.cc
	-@@ -37,7 +37,7 @@
	- #include "components/user_manager/user_manager.h"
	- #endif
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
	- #endif
	-
	-@@ -48,7 +48,7 @@
	+@@ -46,7 +46,7 @@
	namespace {

	bool IsUsingGtkTheme(Profile* profile) {
	@@ -18,12 +9,3 @@
	return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
	#else
	return false;
	-@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
	- non_client_view()->set_context_menu_controller(this);
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
	- #endif
	- }
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h
	@@ -1,20 +0,0 @@
	---- chrome/browser/ui/views/frame/browser_view.h.orig 2019-04-05 00:49:05 UTC
	-+++ chrome/browser/ui/views/frame/browser_view.h
	-@@ -50,7 +50,7 @@
	- #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
	- #endif // defined(OS_CHROMEOS)
	-
	--#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	-+#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- #include "chrome/browser/ui/views/quit_instruction_bubble_controller.h"
	- #endif
	-
	-@@ -853,7 +853,7 @@ class BrowserView : public BrowserWindow,
	- };
	- base::Optional<ResizeSession> interactive_resize_;
	-
	--#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	-+#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- scoped_refptr<QuitInstructionBubbleController>
	- quit_instruction_bubble_controller_;
	- #endif
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
	@@ -1,29 +1,11 @@
	---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-04-05 00:49:05 UTC
	+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/frame/browser_view.cc
	-@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
	- }
	+@@ -1581,7 +1581,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT
	+ const bool should_use_native_frame = frame_->ShouldUseNativeFrame();

	- void BrowserView::DestroyBrowser() {
	--#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	-+#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- if (quit_instruction_bubble_controller_) {
	- GetWidget()->GetNativeView()->RemovePreTargetHandler(
	- quit_instruction_bubble_controller_.get());
	-@@ -2155,7 +2155,7 @@ views::View* BrowserView::CreateOverlayView() {
	- }
	-
	- void BrowserView::OnWidgetDestroying(views::Widget* widget) {
	--#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	-+#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- if (quit_instruction_bubble_controller_) {
	- GetWidget()->GetNativeView()->RemovePreTargetHandler(
	- quit_instruction_bubble_controller_.get());
	-@@ -2499,7 +2499,7 @@ void BrowserView::InitViews() {
	- GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
	- browser_->profile());
	-
	--#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	-+#if defined(OS_WIN) \|\| (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
	- quit_instruction_bubble_controller_ =
	- QuitInstructionBubbleController::GetInstance();
	+ bool must_regenerate_frame;
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // GTK and user theme changes can both change frame buttons, so the frame
	+ // always needs to be regenerated on Linux.
	+ must_regenerate_frame = true;
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-09-09 21:55:11 UTC
	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
	-@@ -49,7 +49,7 @@
	+@@ -47,7 +47,7 @@
	#include "ui/views/window/vector_icons/vector_icons.h"
	#include "ui/views/window/window_shape.h"

	@@ -9,16 +9,16 @@
	#include "ui/views/controls/menu/menu_runner.h"
	#endif

	-@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
	- void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
	+@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
	+ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source,
	const gfx::Point& point,
	const ui::Event* event) {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
	views::MenuRunner::HAS_MNEMONICS);
	- menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
	-@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT
	+ menu_runner.RunMenuAt(
	+@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT

	OpaqueBrowserFrameView::FrameButtonStyle
	OpaqueBrowserFrameView::GetFrameButtonStyle() const {
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
	@@ -1,11 +1,11 @@
	---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-04-30 22:22:36 UTC
	+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
	-@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy
	- return false;
	- }
	+@@ -6,7 +6,7 @@

	+ #include "build/build_config.h"
	+
	-#if !defined(OS_LINUX)
	+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)

	// static
	- OpaqueBrowserFrameViewPlatformSpecific*
	+ std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific>
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
	-@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM
	+@@ -80,7 +80,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM

	void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow(
	ui::SimpleMenuModel* model) {
	@@ -9,7 +9,7 @@
	model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
	model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
	model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
	-@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
	+@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
	model->AddSeparator(ui::NORMAL_SEPARATOR);
	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
	}
	@@ -18,7 +18,7 @@
	model->AddSeparator(ui::NORMAL_SEPARATOR);
	model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
	IDS_SHOW_WINDOW_DECORATIONS_MENU);
	-@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
	+@@ -131,7 +131,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
	model->AddSeparator(ui::NORMAL_SEPARATOR);
	model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
	}
	Index: www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
	@@ -1,4 +1,4 @@
	---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
	@@ -15,7 +15,7 @@
	#include "components/sessions/core/tab_restore_service.h"
	@@ -18,3 +18,12 @@
	if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
	PrefService* prefs = browser_->profile()->GetPrefs();
	return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
	+@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
	+ }
	+
	+ bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ bool is_maximized = browser_->window()->IsMaximized();
	+ switch (command_id) {
	+ case IDC_MAXIMIZE_WINDOW:
	Index: www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC
	+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-06-04 18:55:18 UTC
	+++ chrome/browser/ui/views/hung_renderer_view.cc
	-@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() {
	+@@ -390,7 +390,7 @@ bool HungRendererDialogView::Cancel() {
	content::RenderProcessHost* rph =
	hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
	if (rph) {
	Index: www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/tabs/new_tab_button.cc
	-@@ -63,7 +63,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
	+@@ -69,7 +69,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28};
	NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener)
	: views::ImageButton(listener), tab_strip_(tab_strip) {
	set_animate_on_state_change(true);
	Index: www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
	@@ -0,0 +1,20 @@
	+--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-10-21 19:06:24 UTC
	++++ chrome/browser/ui/views/tabs/tab.cc
	+@@ -512,7 +512,7 @@ void Tab::OnMouseCaptureLost() {
	+ void Tab::OnMouseMoved(const ui::MouseEvent& event) {
	+ tab_style_->SetHoverLocation(event.location());
	+ controller_->OnMouseEventInTab(this, event);
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ MaybeUpdateHoverStatus(event);
	+ #endif
	+ }
	+@@ -522,7 +522,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event)
	+ }
	+
	+ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& event) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Move the hit test area for hovering up so that it is not overlapped by tab
	+ // hover cards when they are shown.
	+ // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove
	Index: www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
	+++ www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
	-@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
	+@@ -443,7 +443,7 @@ void TabDragController::Init(TabDragContext* source_co
	// synchronous on desktop Linux, so use that.
	// - Chrome OS
	// Releasing capture on Ash cancels gestures so avoid it.
	@@ -9,16 +9,16 @@
	can_release_capture_ = false;
	#endif
	start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
	-@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
	+@@ -865,7 +865,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
	else
	- target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
	+ SetCapture(target_context);

	--#if !defined(OS_LINUX)
	-+#if !defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if !defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_LINUX) \|\| defined(OS_CHROMEOS)) && !defined(OS_BSD)
	// EndMoveLoop is going to snap the window back to its original location.
	// Hide it so users don't see this. Hiding a window in Linux aura causes
	// it to lose capture so skip it.
	-@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca
	+@@ -2003,7 +2003,7 @@ TabDragController::Liveness TabDragController::GetLoca
	if (dragged_window)
	exclude.insert(dragged_window);
	}
	Index: www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
	+++ www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/webui/about_ui.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/webui/about_ui.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/webui/about_ui.cc
	-@@ -552,7 +552,7 @@ std::string ChromeURLs() {
	+@@ -562,7 +562,7 @@ std::string ChromeURLs() {
	return html;
	}

	@@ -9,7 +9,7 @@
	std::string AboutLinuxProxyConfig() {
	std::string data;
	AppendHeader(&data, 0,
	-@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest(
	+@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest(
	.GetRawDataResource(idr)
	.as_string();
	}
	Index: www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
	+++ www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
	@@ -1,7 +1,7 @@
	---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
	-@@ -192,11 +192,11 @@
	- #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h"
	+@@ -212,11 +212,11 @@
	+ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
	#endif

	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	@@ -14,7 +14,7 @@
	#include "chrome/browser/ui/webui/sandbox_internals_ui.h"
	#endif

	-@@ -314,7 +314,7 @@ bool IsAboutUI(const GURL& url) {
	+@@ -338,7 +338,7 @@ bool IsAboutUI(const GURL& url) {
	#if !defined(OS_ANDROID)
	\|\| url.host_piece() == chrome::kChromeUITermsHost
	#endif
	@@ -23,7 +23,7 @@
	\|\| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
	#endif
	#if defined(OS_CHROMEOS)
	-@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
	+@@ -654,7 +654,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
	if (url.host_piece() == chrome::kChromeUINaClHost)
	return &NewWebUI<NaClUI>;
	#endif
	@@ -32,7 +32,7 @@
	if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
	return &NewWebUI<ConstrainedWebDialogUI>;
	#endif
	-@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
	+@@ -702,17 +702,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
	return &NewWebUI<CastUI>;
	}
	#endif
	@@ -46,4 +46,10 @@
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	if (url.host_piece() == chrome::kChromeUIDiscardsHost)
	return &NewWebUI<DiscardsUI>;
	+ #endif
	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
	+ return &NewWebUI<BrowserSwitchUI>;
	#endif
	Index: www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
	+++ www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-10-21 19:06:24 UTC
	+++ chrome/browser/ui/webui/settings/appearance_handler.cc
	-@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() {
	+@@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() {
	"useDefaultTheme",
	base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
	base::Unretained(this)));
	@@ -9,7 +9,7 @@
	web_ui()->RegisterMessageCallback(
	"useSystemTheme",
	base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
	-@@ -59,7 +59,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
	+@@ -39,7 +39,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
	ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
	}

	Index: www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
	+++ www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
	@@ -1,20 +0,0 @@
	---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-03-11 22:00:54 UTC
	-+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
	-@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
	- {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
	- {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
	- {"themes", IDS_SETTINGS_THEMES},
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	- {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
	- {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
	- {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
	-@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
	- {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
	- {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
	- #endif
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	- {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
	- #endif
	- #if defined(OS_MACOSX)
	Index: www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
	+++ www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
	@@ -0,0 +1,20 @@
	+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-10-21 19:06:24 UTC
	++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
	+@@ -702,7 +702,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
	+ {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
	+ {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
	+ {"themes", IDS_SETTINGS_THEMES},
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
	+ {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
	+ {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
	+@@ -722,7 +722,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
	+ {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP},
	+ {"setWallpaper", IDS_OS_SETTINGS_SET_WALLPAPER},
	+ #endif
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
	+ #endif
	+ #if defined(OS_MACOSX)
	Index: www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
	+++ www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc
	@@ -0,0 +1,11 @@
	+--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2019-10-30 15:54:13 UTC
	++++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc
	+@@ -15,7 +15,7 @@ namespace {
	+
	+ #if !defined(OS_CHROMEOS)
	+ bool CanOsAddDesktopShortcuts() {
	+-#if defined(OS_LINUX) \|\| defined(OS_WIN)
	++#if defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ return true;
	+ #else
	+ return false;
	Index: www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
	===================================================================
	--- www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
	+++ www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
	@@ -1,6 +1,6 @@
	---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-04-30 22:22:37 UTC
	+++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
	-@@ -46,7 +46,7 @@ namespace {
	+@@ -50,7 +50,7 @@ namespace {
	#if defined(OS_MACOSX)
	const int kDesiredSizes[] = {16, 32, 128, 256, 512};
	const size_t kNumDesiredSizes = base::size(kDesiredSizes);
	Index: www/iridium/files/patch-chrome_common_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-chrome_common_BUILD.gn
	+++ www/iridium/files/patch-chrome_common_BUILD.gn
	@@ -1,6 +1,6 @@
	---- chrome/common/BUILD.gn.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/BUILD.gn.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/BUILD.gn
	-@@ -300,6 +300,10 @@ static_library("common") {
	+@@ -293,6 +293,10 @@ static_library("common") {
	public_deps += [ "//ppapi/shared_impl" ]
	}

	Index: www/iridium/files/patch-chrome_common_chrome__features.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__features.h
	+++ www/iridium/files/patch-chrome_common_chrome__features.h
	@@ -1,8 +1,8 @@
	---- chrome/common/chrome_features.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/chrome_features.h.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_features.h
	-@@ -61,10 +61,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
	- extern const base::Feature kAutomaticTabDiscarding;
	- #endif // defined(OS_WIN) \|\| defined(OS_MACOSX)
	+@@ -64,10 +64,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
	+ extern const base::Feature kAutoFetchOnNetErrorPage;
	+ #endif

	-#if defined(OS_WIN) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	@@ -13,9 +13,9 @@

	COMPONENT_EXPORT(CHROME_FEATURES)
	extern const base::Feature kBlockPromptsIfDismissedOften;
	-@@ -81,7 +81,7 @@ extern const base::Feature kBrowserHangFixesExperiment
	+@@ -86,7 +86,7 @@ extern const base::Feature kBundledConnectionHelpFeatu
	COMPONENT_EXPORT(CHROME_FEATURES)
	- extern const base::Feature kBundledConnectionHelpFeature;
	+ extern const base::Feature kCaptionSettings;

	-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-chrome_common_chrome__features.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__features.cc
	+++ www/iridium/files/patch-chrome_common_chrome__features.cc
	@@ -1,8 +1,8 @@
	---- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/chrome_features.cc.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_features.cc
	-@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
	- base::FEATURE_ENABLED_BY_DEFAULT};
	- #endif // defined(OS_WIN) \|\| defined(OS_MACOSX)
	+@@ -84,13 +84,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+ #endif // defined(OS_ANDROID)

	-#if defined(OS_WIN) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	@@ -16,7 +16,7 @@

	// Enables or disables whether permission prompts are automatically blocked
	// after the user has explicitly dismissed them too many times.
	-@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{
	+@@ -140,7 +140,7 @@ const base::Feature kThirdPartyModulesBlocking{
	"ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
	#endif

	@@ -25,12 +25,3 @@
	// Enables the dual certificate verification trial feature.
	// https://crbug.com/649026
	const base::Feature kCertDualVerificationTrialFeature{
	-@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
	- const base::Feature kDesktopPWAWindowing {
	- "DesktopPWAWindowing",
	- #if defined(OS_CHROMEOS) \|\| defined(OS_WIN) \|\| defined(OS_LINUX) \|\| \
	-- defined(OS_MACOSX)
	-+ defined(OS_MACOSX) \|\| defined(OS_BSD)
	- base::FEATURE_ENABLED_BY_DEFAULT
	- #else
	- base::FEATURE_DISABLED_BY_DEFAULT
	Index: www/iridium/files/patch-chrome_common_chrome__paths.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__paths.h
	+++ www/iridium/files/patch-chrome_common_chrome__paths.h
	@@ -1,15 +1,15 @@
	---- chrome/common/chrome_paths.h.orig 2019-04-05 00:49:06 UTC
	+--- chrome/common/chrome_paths.h.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_paths.h
	-@@ -51,7 +51,7 @@ enum {
	- // to set policies for chrome. This directory
	- // contains subdirectories.
	+@@ -53,7 +53,7 @@ enum {
	+ // contains subdirectories.
	#endif
	--#if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) \|\| \
	-+#if defined(OS_CHROMEOS) \|\| ((defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(CHROMIUM_BUILD)) \|\| \
	- defined(OS_MACOSX)
	+ #if defined(OS_CHROMEOS) \|\| \
	+- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) \|\| defined(OS_MACOSX)
	++ ((defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) \|\| defined(OS_MACOSX)
	DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
	// on Chrome Mac and Chromium Linux.
	-@@ -60,7 +60,7 @@ enum {
	+ // On Chrome OS, this path is used for OEM
	+@@ -61,7 +61,7 @@ enum {
	// create it.
	#endif

	@@ -18,23 +18,23 @@
	DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
	// definition manifest files that
	// describe extensions which are to be
	-@@ -107,7 +107,7 @@ enum {
	+@@ -119,7 +119,7 @@ enum {
	DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
	// supervised user whitelists are
	// installed.
	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(OS_MACOSX)
	- DIR_NATIVE_MESSAGING, // System directory where native messaging host
	- // manifest files are stored.
	- DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
	-@@ -122,10 +122,10 @@ enum {
	- DIR_GEN_TEST_DATA, // Directory where generated test data resides.
	- DIR_TEST_DATA, // Directory where unit test data resides.
	- DIR_TEST_TOOLS, // Directory where unit test tools reside.
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ DIR_NATIVE_MESSAGING, // System directory where native messaging host
	+ // manifest files are stored.
	+ DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
	+@@ -134,10 +134,10 @@ enum {
	+ DIR_GEN_TEST_DATA, // Directory where generated test data resides.
	+ DIR_TEST_DATA, // Directory where unit test data resides.
	+ DIR_TEST_TOOLS, // Directory where unit test tools reside.
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
	- // the component updated flash plugin.
	+ FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
	+ // the component updated flash plugin.
	-#endif // defined(OS_LINUX)
	+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	#if defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-chrome_common_chrome__paths.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__paths.cc
	+++ www/iridium/files/patch-chrome_common_chrome__paths.cc
	@@ -1,4 +1,4 @@
	---- chrome/common/chrome_paths.cc.orig 2019-04-05 00:49:06 UTC
	+--- chrome/common/chrome_paths.cc.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_paths.cc
	@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
	FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
	@@ -9,12 +9,13 @@
	// The path to the external extension <id>.json files.
	// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
	const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
	- #if defined(GOOGLE_CHROME_BUILD)
	- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
	+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
	+- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
	++ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions");
	#else
	- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
	+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
	- #endif // defined(GOOGLE_CHROME_BUILD)
	+ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)

	// The path to the hint file that tells the pepper plugin loader
	// where it can find the latest component updated flash.
	@@ -34,30 +35,16 @@
	if (!GetUserDownloadsDirectorySafe(&cur))
	return false;
	break;
	-@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) {
	- if (!base::PathExists(cur)) // We don't want to create this
	- return false;
	- break;
	--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
	-+#if defined(OS_POSIX) && !defined(OS_MACOSX)
	- case chrome::DIR_POLICY_FILES: {
	- #if defined(GOOGLE_CHROME_BUILD)
	- cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
	-+#elif defined(OS_BSD)
	-+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
	- #else
	- cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
	- #endif
	-@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -489,7 +489,7 @@ bool PathProvider(int key, base::FilePath* result) {
	}
	#endif
	- #if defined(OS_CHROMEOS) \|\| (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) \|\| \
	-- defined(OS_MACOSX)
	-+ defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ #if defined(OS_CHROMEOS) \|\| \
	+- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) \|\| defined(OS_MACOSX)
	++ ((defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) \|\| defined(OS_MACOSX)
	case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
	return false;
	-@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -497,7 +497,7 @@ bool PathProvider(int key, base::FilePath* result) {
	break;
	}
	#endif
	@@ -66,7 +53,7 @@
	case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
	cur = base::FilePath(kFilepathSinglePrefExtensions);
	break;
	-@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -532,7 +532,7 @@ bool PathProvider(int key, base::FilePath* result) {
	#endif
	break;

	@@ -74,9 +61,9 @@
	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	case chrome::DIR_NATIVE_MESSAGING:
	#if defined(OS_MACOSX)
	- #if defined(GOOGLE_CHROME_BUILD)
	-@@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) {
	- #if defined(GOOGLE_CHROME_BUILD)
	+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
	+@@ -546,6 +546,9 @@ bool PathProvider(int key, base::FilePath* result) {
	+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
	cur = base::FilePath(FILE_PATH_LITERAL(
	"/etc/opt/chrome/native-messaging-hosts"));
	+#elif defined(OS_BSD)
	@@ -85,7 +72,7 @@
	#else
	cur = base::FilePath(FILE_PATH_LITERAL(
	"/etc/chromium/native-messaging-hosts"));
	-@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -558,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) {
	return false;
	cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
	break;
	@@ -94,7 +81,7 @@
	#if !defined(OS_ANDROID)
	case chrome::DIR_GLOBAL_GCM_STORE:
	if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
	-@@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -566,7 +569,7 @@ bool PathProvider(int key, base::FilePath* result) {
	cur = cur.Append(kGCMStoreDirname);
	break;
	#endif // !defined(OS_ANDROID)
	@@ -103,7 +90,7 @@
	case chrome::FILE_COMPONENT_FLASH_HINT:
	if (!base::PathService::Get(
	chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
	-@@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) {
	+@@ -574,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
	}
	cur = cur.Append(kComponentUpdatedFlashHint);
	break;
	Index: www/iridium/files/patch-chrome_common_chrome__paths__internal.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__paths__internal.h
	+++ www/iridium/files/patch-chrome_common_chrome__paths__internal.h
	@@ -1,4 +1,4 @@
	---- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC
	+++ chrome/common/chrome_paths_internal.h
	@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
	// Get the path to the user's documents directory.
	Index: www/iridium/files/patch-chrome_common_chrome__switches.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__switches.h
	+++ www/iridium/files/patch-chrome_common_chrome__switches.h
	@@ -1,17 +1,11 @@
	---- chrome/common/chrome_switches.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/chrome_switches.h.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_switches.h
	-@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[];
	+@@ -264,7 +264,7 @@ extern const char kAllowNaClFileHandleAPI[];
	extern const char kAllowNaClSocketAPI[];
	#endif

	--#if defined(OS_WIN) \|\| defined(OS_LINUX)
	-+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- extern const char kDisableInputImeAPI[];
	- extern const char kEnableInputImeAPI[];
	- #endif
	-
	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	extern const char kEnableNewAppMenuIcon[];
	+ extern const char kGuest[];
	#endif
	-
	Index: www/iridium/files/patch-chrome_common_chrome__switches.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_chrome__switches.cc
	+++ www/iridium/files/patch-chrome_common_chrome__switches.cc
	@@ -1,17 +1,11 @@
	---- chrome/common/chrome_switches.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/chrome_switches.cc.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/chrome_switches.cc
	-@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
	+@@ -853,7 +853,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
	const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
	#endif

	--#if defined(OS_WIN) \|\| defined(OS_LINUX)
	-+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- const char kDisableInputImeAPI[] = "disable-input-ime-api";
	- const char kEnableInputImeAPI[] = "enable-input-ime-api";
	- #endif
	-
	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
	- #endif

	+ // Causes the browser to launch directly in guest mode.
	Index: www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni
	===================================================================
	--- www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni
	+++ www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni
	@@ -1,4 +1,4 @@
	---- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/extensions/api/api_sources.gni.orig 2019-10-21 19:06:25 UTC
	+++ chrome/common/extensions/api/api_sources.gni
	@@ -109,7 +109,7 @@ if (is_chromeos) {
	"wallpaper.json",
	Index: www/iridium/files/patch-chrome_common_extensions_command.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_extensions_command.cc
	+++ www/iridium/files/patch-chrome_common_extensions_command.cc
	@@ -1,6 +1,6 @@
	---- chrome/common/extensions/command.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/extensions/command.cc.orig 2019-04-30 22:22:37 UTC
	+++ chrome/common/extensions/command.cc
	-@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() {
	+@@ -300,7 +300,7 @@ std::string Command::CommandPlatform() {
	return values::kKeybindingPlatformMac;
	#elif defined(OS_CHROMEOS)
	return values::kKeybindingPlatformChromeOs;
	Index: www/iridium/files/patch-chrome_common_features.gni
	===================================================================
	--- www/iridium/files/patch-chrome_common_features.gni
	+++ www/iridium/files/patch-chrome_common_features.gni
	@@ -1,14 +1,14 @@
	---- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/features.gni.orig 2019-10-21 19:06:26 UTC
	+++ chrome/common/features.gni
	-@@ -41,9 +41,9 @@ declare_args() {
	+@@ -42,9 +42,9 @@ declare_args() {
	(is_desktop_linux && use_dbus) \|\| is_chromeos

	enable_one_click_signin =
	- is_win \|\| is_mac \|\| (is_linux && !is_chromeos && !is_chromecast)
	+ is_win \|\| is_mac \|\| is_bsd \|\| (is_linux && !is_chromeos && !is_chromecast)

	-- enable_service_discovery = (enable_mdns && !is_android && !is_ios) \|\| is_mac
	-+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) \|\| is_mac \|\| is_bsd
	+- enable_service_discovery = (enable_mdns && !is_android) \|\| is_mac
	++ enable_service_discovery = (enable_mdns && !is_android) \|\| is_mac \|\| is_bsd

	# Enables use of the session service, which is enabled by default.
	# Android stores them separately on the Java side.
	Index: www/iridium/files/patch-chrome_common_pref__names.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_pref__names.h
	+++ www/iridium/files/patch-chrome_common_pref__names.h
	@@ -1,6 +1,6 @@
	---- chrome/common/pref_names.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/pref_names.h.orig 2019-10-21 19:06:26 UTC
	+++ chrome/common/pref_names.h
	-@@ -300,7 +300,7 @@ extern const char kMdHistoryMenuPromoShown[];
	+@@ -326,7 +326,7 @@ extern const char kHistoryMenuPromoShown[];
	extern const char kForceGoogleSafeSearch[];
	extern const char kForceYouTubeRestrict[];
	extern const char kAllowedDomainsForApps[];
	@@ -9,7 +9,7 @@
	extern const char kUsesSystemTheme[];
	#endif
	extern const char kCurrentThemePackFilename[];
	-@@ -333,7 +333,7 @@ extern const char kDefaultBrowserSettingEnabled[];
	+@@ -357,7 +357,7 @@ extern const char kDefaultBrowserSettingEnabled[];
	#if defined(OS_MACOSX)
	extern const char kShowUpdatePromotionInfoBar[];
	#endif
	@@ -18,7 +18,7 @@
	extern const char kUseCustomChromeFrame[];
	#endif
	#if BUILDFLAG(ENABLE_PLUGINS)
	-@@ -487,7 +487,7 @@ extern const char kAppWindowPlacement[];
	+@@ -511,7 +511,7 @@ extern const char kAppWindowPlacement[];
	extern const char kDownloadDefaultDirectory[];
	extern const char kDownloadExtensionsToOpen[];
	extern const char kDownloadDirUpgraded[];
	@@ -27,3 +27,15 @@
	extern const char kOpenPdfDownloadInSystemReader[];
	#endif
	#if defined(OS_ANDROID)
	+@@ -708,9 +708,9 @@ extern const char kGSSAPILibraryName[];
	+ extern const char kAuthAndroidNegotiateAccountType[];
	+ extern const char kAllowCrossOriginAuthPrompt[];
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	+ extern const char 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)
	+ extern const char kNtlmV2Enabled[];
	Index: www/iridium/files/patch-chrome_common_pref__names.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_pref__names.cc
	+++ www/iridium/files/patch-chrome_common_pref__names.cc
	@@ -1,6 +1,6 @@
	---- chrome/common/pref_names.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/pref_names.cc.orig 2019-10-21 19:06:26 UTC
	+++ chrome/common/pref_names.cc
	-@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
	+@@ -1026,7 +1026,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
	// only using an account that belongs to one of the domains from this pref.
	const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";

	@@ -9,7 +9,7 @@
	// Linux specific preference on whether we should match the system theme.
	const char kUsesSystemTheme[] = "extensions.theme.use_system";
	#endif
	-@@ -1038,7 +1038,7 @@ const char kShowUpdatePromotionInfoBar[] =
	+@@ -1153,7 +1153,7 @@ const char kShowUpdatePromotionInfoBar[] =
	"browser.show_update_promotion_info_bar";
	#endif

	@@ -18,7 +18,7 @@
	// Boolean that is false if we should show window manager decorations. If
	// true, we draw a custom chrome frame (thicker title bar and blue border).
	const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
	-@@ -1419,7 +1419,7 @@ const char kDownloadDefaultDirectory[] = "download.def
	+@@ -1540,7 +1540,7 @@ const char kDownloadDefaultDirectory[] = "download.def
	// upgrade a unsafe location to a safe location.
	const char kDownloadDirUpgraded[] = "download.directory_upgrade";

	@@ -27,3 +27,18 @@
	const char kOpenPdfDownloadInSystemReader[] =
	"download.open_pdf_in_system_reader";
	#endif
	+@@ -1791,12 +1791,12 @@ const char kAuthAndroidNegotiateAccountType[] =
	+ // domain sub-content requests.
	+ const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	+ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
	+ // along with kAuthNegotiateDelegateWhitelist.
	+ const char kAuthNegotiateDelegateByKdcPolicy[] =
	+ "auth.negotiate_delegate_by_kdc_policy";
	+-#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)
	+ // Boolean that specifies whether NTLMv2 is enabled.
	Index: www/iridium/files/patch-chrome_common_webui__url__constants.h
	===================================================================
	--- www/iridium/files/patch-chrome_common_webui__url__constants.h
	+++ www/iridium/files/patch-chrome_common_webui__url__constants.h
	@@ -1,6 +1,6 @@
	---- chrome/common/webui_url_constants.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/webui_url_constants.h.orig 2019-10-21 19:06:26 UTC
	+++ chrome/common/webui_url_constants.h
	-@@ -241,7 +241,7 @@ extern const char kChromeUIMetroFlowURL[];
	+@@ -270,7 +270,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
	extern const char kChromeUICastHost[];
	#endif

	@@ -9,13 +9,20 @@
	extern const char kChromeUIDiscardsHost[];
	extern const char kChromeUIDiscardsURL[];
	extern const char kChromeUIHatsHost[];
	-@@ -253,11 +253,11 @@ extern const char kChromeUIHatsURL[];
	+@@ -282,17 +282,17 @@ extern const char kChromeUIHatsURL[];
	extern const char kChromeUILinuxProxyConfigHost[];
	#endif

	-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	extern const char kChromeUISandboxHost[];
	+ #endif
	+
	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ extern const char kChromeUIBrowserSwitchHost[];
	+ extern const char kChromeUIBrowserSwitchURL[];
	#endif

	-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) \|\| defined(USE_AURA)
	Index: www/iridium/files/patch-chrome_common_webui__url__constants.cc
	===================================================================
	--- www/iridium/files/patch-chrome_common_webui__url__constants.cc
	+++ www/iridium/files/patch-chrome_common_webui__url__constants.cc
	@@ -1,6 +1,6 @@
	---- chrome/common/webui_url_constants.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/common/webui_url_constants.cc.orig 2019-10-21 19:06:26 UTC
	+++ chrome/common/webui_url_constants.cc
	-@@ -246,7 +246,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
	+@@ -311,7 +311,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
	const char kChromeUICastHost[] = "cast";
	#endif

	@@ -9,7 +9,7 @@
	const char kChromeUIDiscardsHost[] = "discards";
	const char kChromeUIDiscardsURL[] = "chrome://discards/";
	const char kChromeUIHatsHost[] = "hats";
	-@@ -257,11 +257,11 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
	+@@ -322,17 +322,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
	const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
	#endif

	@@ -18,12 +18,19 @@
	const char kChromeUISandboxHost[] = "sandbox";
	#endif

	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ const char kChromeUIBrowserSwitchHost[] = "browser-switch";
	+ const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
	+ #endif
	+
	-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) \|\| defined(USE_AURA)
	+#if ((defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) \|\| defined(USE_AURA)
	const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
	#endif

	-@@ -415,13 +415,13 @@ const char* const kChromeHostURLs[] = {
	+@@ -586,13 +586,13 @@ const char* const kChromeHostURLs[] = {
	kChromeUIInternetDetailDialogHost,
	kChromeUIAssistantOptInHost,
	#endif
	Index: www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
	===================================================================
	--- www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
	+++ www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
	@@ -1,11 +1,45 @@
	---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-03-17 20:22:37 UTC
	+--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-10-21 19:06:26 UTC
	+++ chrome/renderer/chrome_content_renderer_client.cc
	-@@ -1012,7 +1012,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
	+@@ -154,13 +154,13 @@
	+ #include "chrome/renderer/searchbox/searchbox_extension.h"
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "base/allocator/buildflags.h"
	+ #if BUILDFLAG(USE_TCMALLOC)
	+ #include "chrome/common/performance_manager/mojom/tcmalloc.mojom.h"
	+ #include "chrome/renderer/performance_manager/mechanisms/tcmalloc_tunables_impl.h"
	+ #endif // BUILDFLAG(USE_TCMALLOC)
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_WIN)
	+ #endif
	+@@ -1040,7 +1040,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
	}

	case chrome::mojom::PluginStatus::kRestartRequired: {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- placeholder = create_blocked_plugin(
	- IDR_BLOCKED_PLUGIN_HTML,
	- l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED,
	+ placeholder =
	+ create_blocked_plugin(IDR_BLOCKED_PLUGIN_HTML,
	+ l10n_util::GetStringFUTF16(
	+@@ -1636,7 +1636,7 @@ void ChromeContentRendererClient::BindReceiverOnMainTh
	+ }
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #if BUILDFLAG(USE_TCMALLOC)
	+ if (auto setter_receiver = receiver.As<tcmalloc::mojom::TcmallocTunables>()) {
	+ performance_manager::mechanism::TcmallocTunablesImpl::Create(
	+@@ -1644,7 +1644,7 @@ void ChromeContentRendererClient::BindReceiverOnMainTh
	+ return;
	+ }
	+ #endif // BUILDFLAG(USE_TCMALLOC)
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ // TODO(crbug.com/977637): Get rid of the use of BinderRegistry here. This was
	+ // done only to avoid churning spellcheck code while eliminting the "chrome"
	Index: www/iridium/files/patch-chrome_test_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-chrome_test_BUILD.gn
	+++ www/iridium/files/patch-chrome_test_BUILD.gn
	@@ -1,8 +1,8 @@
	---- chrome/test/BUILD.gn.orig 2019-04-05 00:49:07 UTC
	+--- chrome/test/BUILD.gn.orig 2019-10-21 19:06:26 UTC
	+++ chrome/test/BUILD.gn
	-@@ -5232,7 +5232,7 @@ test("chrome_app_unittests") {
	- "//components/crash/core/common",
	- "//components/flags_ui:switches",
	+@@ -5797,7 +5797,7 @@ test("chrome_app_unittests") {
	+ "//components/safe_browsing:buildflags",
	+ "//components/tracing",
	]
	- if (!is_fuchsia) {
	+ if (!is_fuchsia && !is_bsd) {
	Index: www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc
	===================================================================
	--- www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc
	+++ www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc
	@@ -1,6 +1,6 @@
	---- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC
	+--- chrome/test/base/in_process_browser_test.cc.orig 2019-09-09 21:55:11 UTC
	+++ chrome/test/base/in_process_browser_test.cc
	-@@ -74,6 +74,10 @@
	+@@ -76,6 +76,10 @@
	#include "chrome/test/base/scoped_bundle_swizzler_mac.h"
	#endif

	@@ -11,7 +11,7 @@
	#if defined(OS_WIN)
	#include "base/win/scoped_com_initializer.h"
	#include "base/win/windows_version.h"
	-@@ -102,7 +106,7 @@
	+@@ -103,7 +107,7 @@
	#include "ui/events/test/event_generator.h"
	#endif // defined(OS_CHROMEOS)

	Index: www/iridium/files/patch-chrome_test_base_testing__browser__process.h
	===================================================================
	--- www/iridium/files/patch-chrome_test_base_testing__browser__process.h
	+++ www/iridium/files/patch-chrome_test_base_testing__browser__process.h
	@@ -1,8 +1,8 @@
	---- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC
	+--- chrome/test/base/testing_browser_process.h.orig 2019-09-09 21:55:11 UTC
	+++ chrome/test/base/testing_browser_process.h
	-@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess {
	- DownloadStatusUpdater* download_status_updater() override;
	+@@ -116,8 +116,8 @@ class TestingBrowserProcess : public BrowserProcess {
	DownloadRequestLimiter* download_request_limiter() override;
	+ StartupData* startup_data() override;

	-#if (defined(OS_WIN) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	- void StartAutoupdateTimer() override {}
	@@ -10,4 +10,4 @@
	+ void StartAutoupdateTimer() /override/ {}
	#endif

	- net_log::ChromeNetLog* net_log() override;
	+ component_updater::ComponentUpdateService* component_updater() override;
	Index: www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
	===================================================================
	--- www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
	+++ www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
	@@ -0,0 +1,13 @@
	+--- chrome/test/chromedriver/chrome_launcher.cc.orig 2019-09-09 21:55:12 UTC
	++++ chrome/test/chromedriver/chrome_launcher.cc
	+@@ -67,6 +67,10 @@
	+ #include "chrome/test/chromedriver/keycode_text_conversion.h"
	+ #endif
	+
	++#if defined(OS_BSD)
	++#include <sys/wait.h>
	++#endif
	++
	+ namespace {
	+
	+ // TODO(eseckler): Remove --ignore-certificate-errors for newer Chrome versions
	Index: www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
	===================================================================
	--- www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
	+++ www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
	@@ -1,7 +1,7 @@
	---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-03-11 22:00:56 UTC
	+--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-10-21 19:06:28 UTC
	+++ chromecast/browser/cast_browser_main_parts.cc
	-@@ -66,7 +66,7 @@
	- #include "ui/compositor/compositor_switches.h"
	+@@ -71,7 +71,7 @@
	+ #include "ui/base/ui_base_switches.h"
	#include "ui/gl/gl_switches.h"

	-#if defined(OS_LINUX)
	@@ -9,7 +9,7 @@
	#include <fontconfig/fontconfig.h>
	#include <signal.h>
	#include <sys/prctl.h>
	-@@ -244,7 +244,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
	+@@ -283,7 +283,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
	{cc::switches::kDisableThreadedAnimation, ""},
	#endif // defined(OS_ANDROID)
	#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
	@@ -18,10 +18,19 @@
	#if defined(ARCH_CPU_X86_FAMILY)
	// This is needed for now to enable the x11 Ozone platform to work with
	// current Linux/NVidia OpenGL drivers.
	-@@ -393,7 +393,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart()
	- }
	+@@ -293,7 +293,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
	+ {switches::kEnableHardwareOverlays, "cast"},
	+ #endif
	+ #endif
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // It's better to start GPU process on demand. For example, for TV platforms
	+ // cast starts in background and can't render until TV switches to cast
	+ // input.
	+@@ -433,7 +433,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
	+ views_delegate_ = std::make_unique<CastViewsDelegate>();
	+ #endif // defined(USE_AURA)

	- void CastBrowserMainParts::ToolkitInitialized() {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// Without this call, the FontConfig library gets implicitly initialized
	Index: www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
	===================================================================
	--- www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
	+++ www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
	@@ -1,6 +1,6 @@
	---- chromecast/browser/cast_content_browser_client.cc.orig 2019-03-11 22:00:56 UTC
	+--- chromecast/browser/cast_content_browser_client.cc.orig 2019-10-21 19:06:28 UTC
	+++ chromecast/browser/cast_content_browser_client.cc
	-@@ -524,7 +524,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
	+@@ -534,7 +534,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
	switches::kAudioOutputChannels));
	}
	} else if (process_type == switches::kGpuProcess) {
	Index: www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn
	+++ www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn
	@@ -0,0 +1,11 @@
	+--- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC
	++++ chromecast/browser/metrics/BUILD.gn
	+@@ -32,7 +32,7 @@ cast_source_set("metrics") {
	+ "//third_party/metrics_proto",
	+ ]
	+
	+- if (is_linux) {
	++ if (is_linux \|\| is_bsd) {
	+ sources += [
	+ "external_metrics.cc",
	+ "external_metrics.h",
	Index: www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc
	===================================================================
	--- www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc
	+++ www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc
	@@ -0,0 +1,23 @@
	+--- chromecast/media/base/monotonic_clock.cc.orig 2019-10-30 15:55:35 UTC
	++++ chromecast/media/base/monotonic_clock.cc
	+@@ -9,9 +9,9 @@
	+ #include "base/time/time.h"
	+ #include "build/build_config.h"
	+
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "chromecast/media/base/buildflags.h"
	+-#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_FUCHSIA)
	+ #include <zircon/syscalls.h>
	+@@ -20,7 +20,7 @@
	+ namespace chromecast {
	+ namespace media {
	+
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int64_t MonotonicClockNow() {
	+ timespec now = {0, 0};
	+ #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
	Index: www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
	===================================================================
	--- www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
	+++ www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
	@@ -1,23 +0,0 @@
	---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-03-17 18:44:55 UTC
	-+++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc
	-@@ -14,9 +14,9 @@
	- #include "chromecast/media/cma/backend/av_sync.h"
	- #include "chromecast/media/cma/backend/video_decoder_for_mixer.h"
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "chromecast/media/cma/backend/audio_buildflags.h"
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	-
	- #if defined(OS_FUCHSIA)
	- #include <zircon/syscalls.h>
	-@@ -226,7 +226,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
	- return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner();
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const {
	- timespec now = {0, 0};
	- #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
	Index: www/iridium/files/patch-components_autofill__strings.grdp
	===================================================================
	--- www/iridium/files/patch-components_autofill__strings.grdp
	+++ www/iridium/files/patch-components_autofill__strings.grdp
	@@ -1,11 +0,0 @@
	---- components/autofill_strings.grdp.orig 2019-03-11 22:00:56 UTC
	-+++ components/autofill_strings.grdp
	-@@ -217,7 +217,7 @@
	- <message name="IDS_AUTOFILL_NAME_FIX_FLOW_PROMPT_SAVE_CARD" desc="Text to show for the Autofill save credit card prompt card holder name fix flow button." formatter_data="android_java">
	- Save card
	- </message>
	-- <if expr="is_linux and not chromeos">
	-+ <if expr="is_posix and not chromeos">
	- <then>
	- <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
	- Do you want to save this card to your Google Account?
	Index: www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
	===================================================================
	--- www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
	+++ www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
	@@ -1,6 +1,6 @@
	---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-10-21 19:06:28 UTC
	+++ components/autofill/content/renderer/password_form_conversion_utils.cc
	-@@ -37,7 +37,11 @@
	+@@ -36,7 +36,11 @@
	#include "third_party/blink/public/web/web_form_control_element.h"
	#include "third_party/blink/public/web/web_input_element.h"
	#include "third_party/blink/public/web/web_local_frame.h"
	@@ -11,4 +11,4 @@
	+#endif
	#include "url/gurl.h"

	- using blink::WebFormControlElement;
	+ using blink::WebElement;
	Index: www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h
	===================================================================
	--- www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h
	+++ www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h
	@@ -1,36 +0,0 @@
	---- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC
	-+++ components/autofill/core/browser/autofill_experiments.h
	-@@ -23,13 +23,13 @@ class SyncService;
	- namespace autofill {
	-
	- // Parameterized Features (grouped with parameter name and options)
	--#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	- extern const base::Feature kAutofillDropdownLayoutExperiment;
	- extern const char kAutofillDropdownLayoutParameterName[];
	- extern const char kAutofillDropdownLayoutParameterLeadingIcon[];
	- extern const char kAutofillDropdownLayoutParameterTrailingIcon[];
	- extern const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[];
	--#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	-
	- // Returns true if uploading credit cards to Wallet servers is enabled. This
	- // requires the appropriate flags and user settings to be true and the user to
	-@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record);
	- // Returns whether the account of the active signed-in user should be used.
	- bool ShouldUseActiveSignedInAccount();
	-
	--#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	- enum class ForcedPopupLayoutState {
	- kDefault, // No popup layout forced by experiment.
	- kLeadingIcon, // Experiment forces leading (left in LTR) icon layout.
	-@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState {
	- // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon
	- // or kAutofillDropdownLayoutParameterTrailingIcon, respectively.
	- ForcedPopupLayoutState GetForcedPopupLayoutState();
	--#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	-
	- } // namespace autofill
	-
	Index: www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
	===================================================================
	--- www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
	+++ www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
	@@ -1,24 +1,6 @@
	---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-10-21 19:06:28 UTC
	+++ components/autofill/core/browser/autofill_experiments.cc
	-@@ -28,7 +28,7 @@
	-
	- namespace autofill {
	-
	--#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	- const base::Feature kAutofillDropdownLayoutExperiment{
	- "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT};
	- const char kAutofillDropdownLayoutParameterName[] = "variant";
	-@@ -36,7 +36,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
	- const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon";
	- const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] =
	- "two-lines-leading-icon";
	--#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	-
	- bool IsCreditCardUploadEnabled(const PrefService* pref_service,
	- const syncer::SyncService* sync_service,
	-@@ -143,7 +143,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
	+@@ -234,7 +234,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
	}

	bool OfferStoreUnmaskedCards(bool is_off_the_record) {
	@@ -27,20 +9,3 @@
	// The checkbox can be forced on with a flag, but by default we don't store
	// on Linux due to lack of system keychain integration. See crbug.com/162735
	return base::CommandLine::ForCurrentProcess()->HasSwitch(
	-@@ -181,7 +181,7 @@ bool ShouldUseActiveSignedInAccount() {
	- features::kAutofillGetPaymentsIdentityFromSync);
	- }
	-
	--#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	- ForcedPopupLayoutState GetForcedPopupLayoutState() {
	- if (!base::FeatureList::IsEnabled(
	- autofill::kAutofillDropdownLayoutExperiment))
	-@@ -205,6 +205,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() {
	- NOTREACHED();
	- return ForcedPopupLayoutState::kDefault;
	- }
	--#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	-
	- } // namespace autofill
	Index: www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc
	===================================================================
	--- www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc
	+++ www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc
	@@ -0,0 +1,15 @@
	+--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-10-21 19:06:28 UTC
	++++ components/autofill/core/browser/personal_data_manager.cc
	+@@ -1925,10 +1925,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar
	+
	+ bool PersonalDataManager::ShouldShowCardsFromAccountOption() const {
	+ // The feature is only for Linux, Windows and Mac.
	+-#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) \|\| \
	++#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) \|\| \
	+ defined(OS_CHROMEOS)
	+ return false;
	+-#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) \|\|
	++#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) \|\|
	+ // defined(OS_CHROMEOS)
	+
	+ // This option should only be shown for users that have not enabled the Sync
	Index: www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
	===================================================================
	--- www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
	+++ www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc
	@@ -0,0 +1,11 @@
	+--- components/autofill/core/common/autofill_payments_features.cc.orig 2019-10-21 19:06:28 UTC
	++++ components/autofill/core/common/autofill_payments_features.cc
	+@@ -159,7 +159,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio
	+
	+ bool ShouldShowImprovedUserConsentForCreditCardSave() {
	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // The new user consent UI is fully launched on MacOS, Windows and Linux.
	+ return true;
	+ #endif
	Index: www/iridium/files/patch-components_autofill_core_common_autofill__util.cc
	===================================================================
	--- www/iridium/files/patch-components_autofill_core_common_autofill__util.cc
	+++ www/iridium/files/patch-components_autofill_core_common_autofill__util.cc
	@@ -1,6 +1,6 @@
	---- components/autofill/core/common/autofill_util.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/autofill/core/common/autofill_util.cc.orig 2019-09-09 21:55:14 UTC
	+++ components/autofill/core/common/autofill_util.cc
	-@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
	+@@ -213,7 +213,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value
	}

	bool ShouldAutoselectFirstSuggestionOnArrowDown() {
	Index: www/iridium/files/patch-components_crash_content_app_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-components_crash_content_app_BUILD.gn
	+++ www/iridium/files/patch-components_crash_content_app_BUILD.gn
	@@ -1,29 +1,20 @@
	---- components/crash/content/app/BUILD.gn.orig 2019-03-11 22:00:56 UTC
	+--- components/crash/content/app/BUILD.gn.orig 2019-10-21 19:06:28 UTC
	+++ components/crash/content/app/BUILD.gn
	-@@ -36,12 +36,12 @@ static_library("app") {
	+@@ -54,7 +54,7 @@ static_library("app") {
	sources += [ "crashpad.cc" ]
	}

	-- if (is_android \|\| (is_linux && !is_chromeos)) {
	-+ if (is_android \|\| (is_linux && !is_chromeos && !is_bsd)) {
	- set_sources_assignment_filter([])
	- sources += [ "crashpad_linux.cc" ]
	- }
	-
	- if (is_linux) {
	+ if (is_linux && !is_bsd) {
	sources += [
	"breakpad_linux.cc",
	"breakpad_linux.h",
	-@@ -79,7 +79,10 @@ static_library("app") {
	- "//third_party/crashpad/crashpad/snapshot",
	+@@ -98,7 +98,7 @@ static_library("app") {
	]
	+ }

	-- if (is_linux) {
	-+ if (is_bsd) {
	-+ deps -= [ "//third_party/crashpad/crashpad/snapshot" ]
	-+ }
	-+ if (is_linux && !is_bsd) {
	- deps += [ "//third_party/breakpad:client" ]
	- }
	+- if (is_linux) {
	++ if (is_linux && !is_bsd) {
	+ deps += [ "//third_party/breakpad:client" ]
	}
	+
	Index: www/iridium/files/patch-components_crash_content_app_crashpad.cc
	===================================================================
	--- www/iridium/files/patch-components_crash_content_app_crashpad.cc
	+++ www/iridium/files/patch-components_crash_content_app_crashpad.cc
	@@ -1,6 +1,6 @@
	---- components/crash/content/app/crashpad.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/crash/content/app/crashpad.cc.orig 2019-04-30 22:22:41 UTC
	+++ components/crash/content/app/crashpad.cc
	-@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client,
	+@@ -104,6 +104,12 @@ void InitializeCrashpadImpl(bool initial_client,
	const base::FilePath& exe_path,
	const std::vector<std::string>& initial_arguments,
	bool embedded_handler) {
	@@ -13,7 +13,7 @@
	static bool initialized = false;
	DCHECK(!initialized);
	initialized = true;
	-@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client,
	+@@ -124,7 +130,7 @@ void InitializeCrashpadImpl(bool initial_client,
	DCHECK(browser_process \|\| process_type == "Chrome Installer" \|\|
	process_type == "notification-helper" \|\|
	process_type == "GCPW Installer" \|\| process_type == "GCPW DLL");
	@@ -22,7 +22,7 @@
	DCHECK(browser_process);
	#else
	#error Port.
	-@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client,
	+@@ -192,7 +198,7 @@ void InitializeCrashpadImpl(bool initial_client,
	// other "main, first process" to initialize things. There is no "relauncher"
	// on Windows, so this is synonymous with initial_client.
	const bool should_initialize_database_and_set_upload_policy = initial_client;
	@@ -31,7 +31,7 @@
	const bool should_initialize_database_and_set_upload_policy = browser_process;
	#endif
	if (should_initialize_database_and_set_upload_policy) {
	-@@ -267,7 +273,9 @@ bool GetUploadsEnabled() {
	+@@ -272,7 +278,9 @@ bool GetUploadsEnabled() {

	#if !defined(OS_ANDROID)
	void DumpWithoutCrashing() {
	Index: www/iridium/files/patch-components_crash_core_common_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-components_crash_core_common_BUILD.gn
	+++ www/iridium/files/patch-components_crash_core_common_BUILD.gn
	@@ -1,6 +1,6 @@
	---- components/crash/core/common/BUILD.gn.orig 2019-03-11 22:00:56 UTC
	+--- components/crash/core/common/BUILD.gn.orig 2019-09-09 21:55:14 UTC
	+++ components/crash/core/common/BUILD.gn
	-@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni")
	+@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn

	declare_args() {
	# If set to true, this will stub out and disable the entire crash key system.
	@@ -9,7 +9,7 @@
	}

	group("common") {
	-@@ -89,7 +89,6 @@ target(crash_key_target_type, "crash_key") {
	+@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") {
	]
	}

	@@ -17,12 +17,12 @@
	}
	}

	-@@ -144,7 +143,7 @@ source_set("unit_tests") {
	+@@ -153,7 +152,7 @@ source_set("unit_tests") {
	sources += [ "objc_zombie_unittest.mm" ]
	}

	-- if (!is_mac && !is_win && !is_fuchsia && !is_android) {
	-+ if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) {
	+- if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android) {
	++ if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android && !is_bsd) {
	include_dirs = [ "//third_party/breakpad/breakpad/src/" ]
	sources += [ "crash_key_breakpad_unittest.cc" ]
	}
	Index: www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
	===================================================================
	--- www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
	+++ www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
	@@ -0,0 +1,20 @@
	+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2019-10-21 19:06:28 UTC
	++++ components/discardable_memory/service/discardable_shared_memory_manager.cc
	+@@ -32,7 +32,7 @@
	+ #include "components/discardable_memory/common/discardable_shared_memory_heap.h"
	+ #include "mojo/public/cpp/bindings/strong_binding.h"
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "base/files/file_path.h"
	+ #include "base/files/file_util.h"
	+ #include "base/metrics/histogram_macros.h"
	+@@ -176,7 +176,7 @@ int64_t GetDefaultMemoryLimit() {
	+ max_default_memory_limit /= 8;
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ base::FilePath shmem_dir;
	+ if (base::GetShmemTempDir(false, &shmem_dir)) {
	+ int64_t shmem_dir_amount_of_free_space =
	Index: www/iridium/files/patch-components_download_internal_common_base__file.cc
	===================================================================
	--- www/iridium/files/patch-components_download_internal_common_base__file.cc
	+++ www/iridium/files/patch-components_download_internal_common_base__file.cc
	@@ -1,11 +1,20 @@
	---- components/download/internal/common/base_file.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/download/internal/common/base_file.cc.orig 2019-10-21 19:06:28 UTC
	+++ components/download/internal/common/base_file.cc
	-@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason(
	- return reason;
	- }
	+@@ -593,7 +593,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url,

	+ } // namespace
	+
	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)

	- namespace {
	+ DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync(
	+ const std::string& client_guid,
	+@@ -611,7 +611,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn

	+ return QuarantineFileResultToReason(result);
	+ }
	+-#else // !OS_WIN && !OS_MACOSX && !OS_LINUX
	++#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD
	+ DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync(
	+ const std::string& client_guid,
	+ const GURL& source_url,
	Index: www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc
	===================================================================
	--- www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc
	+++ www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc
	@@ -1,36 +0,0 @@
	---- components/download/quarantine/quarantine_linux.cc.orig 2019-03-11 22:00:56 UTC
	-+++ components/download/quarantine/quarantine_linux.cc
	-@@ -2,11 +2,15 @@
	- // Use of this source code is governed by a BSD-style license that can be
	- // found in the LICENSE file.
	-
	-+#include "build/build_config.h"
	-+
	- #include "components/download/quarantine/quarantine.h"
	-
	- #include <stddef.h>
	- #include <sys/types.h>
	-+#if !defined(OS_BSD)
	- #include <sys/xattr.h>
	-+#endif
	-
	- #include "base/files/file_path.h"
	- #include "base/logging.h"
	-@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path,
	- int flags) {
	- // On Chrome OS, there is no component that can validate these extended
	- // attributes so there is no need to set them.
	--#if !defined(OS_CHROMEOS)
	-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
	- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
	- int result = setxattr(path, name, value, value_size, flags);
	- if (result) {
	-@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path,
	- << path;
	- return false;
	- }
	--#endif // !defined(OS_CHROMEOS)
	-+#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD)
	- return true;
	- }
	-
	Index: www/iridium/files/patch-components_download_quarantine_test__support__linux.cc
	===================================================================
	--- www/iridium/files/patch-components_download_quarantine_test__support__linux.cc
	+++ www/iridium/files/patch-components_download_quarantine_test__support__linux.cc
	@@ -1,20 +0,0 @@
	---- components/download/quarantine/test_support_linux.cc.orig 2019-03-11 22:00:56 UTC
	-+++ components/download/quarantine/test_support_linux.cc
	-@@ -21,6 +21,7 @@ namespace download {
	- namespace {
	-
	- std::string GetExtendedFileAttribute(const char* path, const char* name) {
	-+#if !defined(OS_BSD)
	- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
	- ssize_t len = getxattr(path, name, nullptr, 0);
	- if (len <= 0)
	-@@ -31,6 +32,9 @@ std::string GetExtendedFileAttribute(const char* path,
	- if (len < static_cast<ssize_t>(buffer.size()))
	- return std::string();
	- return std::string(buffer.begin(), buffer.end());
	-+#else
	-+ return std::string();
	-+#endif // !defined(OS_BSD)
	- }
	-
	- } // namespace
	Index: www/iridium/files/patch-components_feature__engagement_public_event__constants.h
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_event__constants.h
	+++ www/iridium/files/patch-components_feature__engagement_public_event__constants.h
	@@ -1,20 +1,30 @@
	---- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC
	+--- components/feature_engagement/public/event_constants.h.orig 2019-10-21 19:06:29 UTC
	+++ components/feature_engagement/public/event_constants.h
	-@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[];
	- extern const char kTabReopened[];
	- #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
	+@@ -14,15 +14,15 @@ namespace events {

	--#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS)
	-+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS) \|\| defined(OS_BSD)
	- // This event is included in the deferred onboarding events for the New Tab
	- // described above, but it is also used on iOS, so it must be compiled
	- // separately.
	-@@ -57,7 +57,7 @@ extern const char kTabReopened[];
	+ // Desktop and IOS.
	+ #if defined(OS_IOS) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	++ defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	// The user has explicitly opened a new tab via an entry point from inside of
	// Chrome.
	extern const char kNewTabOpened[];
	--#endif // defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS)
	-+#endif // defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS) \|\| defined(OS_BSD)
	+ #endif // defined(OS_IOS) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\|
	+- // defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	++ // defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)

	+ // Desktop
	+-#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)
	+ // All conditions for reopen closed tab IPH were met. Since this IPH needs to
	+ // track user events (opening/closing tabs, focusing the omnibox, etc) on the
	+@@ -75,7 +75,7 @@ extern const char kIncognitoWindowOpened[];
	+ extern const char kIncognitoWindowSessionTimeMet[];
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+
	+-#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_IOS)
	- // The user has opened Chrome (cold start or from background).
	Index: www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
	+++ www/iridium/files/patch-components_feature__engagement_public_event__constants.cc
	@@ -1,14 +1,27 @@
	---- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/feature_engagement/public/event_constants.cc.orig 2019-10-21 19:06:29 UTC
	+++ components/feature_engagement/public/event_constants.cc
	-@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con
	- const char kTabReopened[] = "tab_reopened";
	- #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
	+@@ -12,12 +12,12 @@ namespace feature_engagement {
	+ namespace events {

	--#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS)
	-+#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS) \|\| defined(OS_BSD)
	+ #if defined(OS_IOS) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	++ defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	const char kNewTabOpened[] = "new_tab_opened";
	--#endif // defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS)
	-+#endif // defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_IOS) \|\| defined(OS_BSD)
	+ #endif // defined(OS_IOS) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX) \|\|
	+- // defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	++ // defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)

	+-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	++#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_CHROMEOS)
	+ const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met";
	+ const char kTabReopened[] = "tab_reopened";
	+@@ -39,7 +39,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo
	+ const char kIncognitoWindowSessionTimeMet[] =
	+ "incognito_window_session_time_met";
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+-#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_IOS)
	- const char kChromeOpened[] = "chrome_opened";
	Index: www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
	+++ www/iridium/files/patch-components_feature__engagement_public_feature__constants.h
	@@ -0,0 +1,20 @@
	+--- components/feature_engagement/public/feature_constants.h.orig 2019-10-21 19:06:29 UTC
	++++ components/feature_engagement/public/feature_constants.h
	+@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode;
	+ // A feature to ensure all arrays can contain at least one feature.
	+ extern const base::Feature kIPHDummyFeature;
	+
	+-#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)
	+ extern const base::Feature kIPHFocusModeFeature;
	+ extern const base::Feature kIPHGlobalMediaControlsFeature;
	+@@ -28,7 +28,7 @@ extern const base::Feature kIPHBookmarkFeature;
	+ extern const base::Feature kIPHIncognitoWindowFeature;
	+ extern const base::Feature kIPHNewTabFeature;
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH)
	+-#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)
	+
	+ // All the features declared for Android below that are also used in Java,
	Index: www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
	+++ www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc
	@@ -0,0 +1,20 @@
	+--- components/feature_engagement/public/feature_constants.cc.orig 2019-10-21 19:06:29 UTC
	++++ components/feature_engagement/public/feature_constants.cc
	+@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode",
	+ const base::Feature kIPHDummyFeature{"IPH_Dummy",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+
	+-#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)
	+ const base::Feature kIPHFocusModeFeature{"IPH_FocusMode",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+@@ -31,7 +31,7 @@ const base::Feature kIPHIncognitoWindowFeature{
	+ const base::Feature kIPHNewTabFeature{"IPH_NewTab",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+-#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_ANDROID)
	Index: www/iridium/files/patch-components_feature__engagement_public_feature__list.h
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_feature__list.h
	+++ www/iridium/files/patch-components_feature__engagement_public_feature__list.h
	@@ -0,0 +1,38 @@
	+--- components/feature_engagement/public/feature_list.h.orig 2019-10-21 19:06:29 UTC
	++++ components/feature_engagement/public/feature_list.h
	+@@ -107,7 +107,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge
	+ "IPH_BadgedTranslateManualTrigger");
	+ #endif // defined(OS_IOS)
	+
	+-#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)
	+ DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
	+ DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls");
	+@@ -117,7 +117,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm
	+ DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow");
	+ DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab");
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+-#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)
	+
	+ } // namespace
	+@@ -166,7 +166,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
	+ VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature),
	+ VARIATION_ENTRY(kIPHBadgedReadingListFeature),
	+ VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature),
	+-#elif defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	++#elif defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_CHROMEOS)
	+ VARIATION_ENTRY(kIPHFocusModeFeature),
	+ VARIATION_ENTRY(kIPHGlobalMediaControls),
	+@@ -176,7 +176,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
	+ VARIATION_ENTRY(kIPHIncognitoWindowFeature),
	+ VARIATION_ENTRY(kIPHNewTabFeature),
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+-#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)
	+ };
	+
	Index: www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
	===================================================================
	--- www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
	+++ www/iridium/files/patch-components_feature__engagement_public_feature__list.cc
	@@ -0,0 +1,20 @@
	+--- components/feature_engagement/public/feature_list.cc.orig 2019-10-21 19:06:29 UTC
	++++ components/feature_engagement/public/feature_list.cc
	+@@ -57,7 +57,7 @@ const base::Feature* const kAllFeatures[] = {
	+ &kIPHBadgedReadingListFeature,
	+ &kIPHBadgedTranslateManualTriggerFeature,
	+ #endif // defined(OS_IOS)
	+-#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)
	+ &kIPHFocusModeFeature,
	+ &kIPHGlobalMediaControlsFeature,
	+@@ -67,7 +67,7 @@ const base::Feature* const kAllFeatures[] = {
	+ &kIPHIncognitoWindowFeature,
	+ &kIPHNewTabFeature,
	+ #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
	+-#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)
	+ };
	+ } // namespace
	Index: www/iridium/files/patch-components_feedback_anonymizer__tool.cc
	===================================================================
	--- www/iridium/files/patch-components_feedback_anonymizer__tool.cc
	+++ www/iridium/files/patch-components_feedback_anonymizer__tool.cc
	@@ -1,6 +1,6 @@
	---- components/feedback/anonymizer_tool.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/feedback/anonymizer_tool.cc.orig 2019-10-21 19:06:29 UTC
	+++ components/feedback/anonymizer_tool.cc
	-@@ -13,7 +13,11 @@
	+@@ -14,7 +14,11 @@
	#include "base/strings/stringprintf.h"
	#include "content/public/browser/browser_thread.h"
	#include "net/base/ip_address.h"
	Index: www/iridium/files/patch-components_flags__ui_flags__state.cc
	===================================================================
	--- www/iridium/files/patch-components_flags__ui_flags__state.cc
	+++ www/iridium/files/patch-components_flags__ui_flags__state.cc
	@@ -1,6 +1,6 @@
	---- components/flags_ui/flags_state.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/flags_ui/flags_state.cc.orig 2019-10-21 19:06:29 UTC
	+++ components/flags_ui/flags_state.cc
	-@@ -618,7 +618,7 @@ int FlagsState::GetCurrentPlatform() {
	+@@ -690,7 +690,7 @@ int FlagsState::GetCurrentPlatform() {
	return kOsWin;
	#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
	return kOsCrOS;
	Index: www/iridium/files/patch-components_gcm__driver_gcm__client.h
	===================================================================
	--- www/iridium/files/patch-components_gcm__driver_gcm__client.h
	+++ www/iridium/files/patch-components_gcm__driver_gcm__client.h
	@@ -1,6 +1,6 @@
	---- components/gcm_driver/gcm_client.h.orig 2019-03-11 22:00:56 UTC
	+--- components/gcm_driver/gcm_client.h.orig 2019-10-21 19:06:29 UTC
	+++ components/gcm_driver/gcm_client.h
	-@@ -85,6 +85,7 @@ class GCMClient {
	+@@ -86,6 +86,7 @@ class GCMClient {
	PLATFORM_CROS,
	PLATFORM_IOS,
	PLATFORM_ANDROID,
	Index: www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
	===================================================================
	--- www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
	+++ www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
	@@ -1,6 +1,6 @@
	---- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/gcm_driver/gcm_client_impl.cc.orig 2019-09-09 21:55:14 UTC
	+++ components/gcm_driver/gcm_client_impl.cc
	-@@ -150,6 +150,9 @@ void ToCheckinProtoVersion(
	+@@ -134,6 +134,9 @@ void ToCheckinProtoVersion(
	case GCMClient::PLATFORM_CROS:
	platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;
	break;
	Index: www/iridium/files/patch-components_metrics_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-components_metrics_BUILD.gn
	+++ www/iridium/files/patch-components_metrics_BUILD.gn
	@@ -1,6 +1,6 @@
	---- components/metrics/BUILD.gn.orig 2019-03-11 22:00:56 UTC
	+--- components/metrics/BUILD.gn.orig 2019-10-21 19:06:29 UTC
	+++ components/metrics/BUILD.gn
	-@@ -143,6 +143,11 @@ jumbo_static_library("metrics") {
	+@@ -164,6 +164,11 @@ jumbo_static_library("metrics") {
	if (is_fuchsia) {
	sources += [ "drive_metrics_provider_fuchsia.cc" ]
	}
	Index: www/iridium/files/patch-components_metrics_metrics__log.cc
	===================================================================
	--- www/iridium/files/patch-components_metrics_metrics__log.cc
	+++ www/iridium/files/patch-components_metrics_metrics__log.cc
	@@ -1,6 +1,6 @@
	---- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC
	+--- components/metrics/metrics_log.cc.orig 2019-10-21 19:06:29 UTC
	+++ components/metrics/metrics_log.cc
	-@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic
	+@@ -202,7 +202,7 @@ void MetricsLog::RecordCoreSystemProfile(
	// OperatingSystemVersion refers to the ChromeOS release version.
	#if defined(OS_CHROMEOS)
	os->set_kernel_version(base::SysInfo::KernelVersion());
	Index: www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
	===================================================================
	--- www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
	+++ www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
	@@ -1,4 +1,4 @@
	---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-09-09 21:55:14 UTC
	+++ components/metrics/system_memory_stats_recorder_linux.cc
	@@ -30,6 +30,7 @@ namespace metrics {
	UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
	@@ -8,7 +8,7 @@
	base::SystemMemoryInfoKB memory;
	if (!base::GetSystemMemoryInfo(&memory))
	return;
	-@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
	+@@ -81,6 +82,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
	break;
	}
	}
	Index: www/iridium/files/patch-components_neterror_resources_neterror.js
	===================================================================
	--- www/iridium/files/patch-components_neterror_resources_neterror.js
	+++ www/iridium/files/patch-components_neterror_resources_neterror.js
	@@ -1,6 +1,6 @@
	---- components/neterror/resources/neterror.js.orig 2019-03-11 22:00:56 UTC
	+--- components/neterror/resources/neterror.js.orig 2019-04-30 22:22:42 UTC
	+++ components/neterror/resources/neterror.js
	-@@ -166,7 +166,7 @@ function setUpCachedButton(buttonStrings) {
	+@@ -160,7 +160,7 @@ function setUpCachedButton(buttonStrings) {
	}

	var primaryControlOnLeft = true;
	Index: www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
	===================================================================
	--- www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
	+++ www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
	@@ -1,6 +1,6 @@
	---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-03-11 22:00:56 UTC
	+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-10-21 19:06:29 UTC
	+++ components/network_session_configurator/browser/network_session_configurator.cc
	-@@ -662,7 +662,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
	+@@ -763,7 +763,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
	}
	#endif // #if !defined(OS_ANDROID)

	Index: www/iridium/files/patch-components_new__or__sad__tab__strings.grdp
	===================================================================
	--- www/iridium/files/patch-components_new__or__sad__tab__strings.grdp
	+++ www/iridium/files/patch-components_new__or__sad__tab__strings.grdp
	@@ -1,4 +1,4 @@
	---- components/new_or_sad_tab_strings.grdp.orig 2019-03-11 22:00:56 UTC
	+--- components/new_or_sad_tab_strings.grdp.orig 2019-09-09 21:55:14 UTC
	+++ components/new_or_sad_tab_strings.grdp
	@@ -51,7 +51,7 @@
	Open page in a new Incognito window (⇧⌘N)
	@@ -9,7 +9,7 @@
	<message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode.">
	Open page in a new Incognito window (Ctrl-Shift-N)
	</message>
	-@@ -69,7 +69,7 @@
	+@@ -66,7 +66,7 @@
	Close other tabs or apps
	</message>
	</if>
	@@ -18,7 +18,7 @@
	<message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
	Close other tabs or programs
	</message>
	-@@ -79,7 +79,7 @@
	+@@ -76,7 +76,7 @@
	Close other apps
	</message>
	</if>
	@@ -27,7 +27,7 @@
	<message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
	Close other programs
	</message>
	-@@ -94,7 +94,7 @@
	+@@ -91,7 +91,7 @@
	Restart Chromium
	</message>
	</if>
	Index: www/iridium/files/patch-components_policy_resources_policy__templates.json
	===================================================================
	--- www/iridium/files/patch-components_policy_resources_policy__templates.json
	+++ www/iridium/files/patch-components_policy_resources_policy__templates.json
	@@ -1,7 +1,7 @@
	---- components/policy/resources/policy_templates.json.orig 2019-03-11 22:00:56 UTC
	+--- components/policy/resources/policy_templates.json.orig 2019-10-21 19:06:29 UTC
	+++ components/policy/resources/policy_templates.json
	-@@ -956,7 +956,7 @@
	- 'name': 'HomepageLocation',
	+@@ -1038,7 +1038,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'string',
	'schema': { 'type': 'string' },
	- 'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
	@@ -9,8 +9,8 @@
	'features': {
	'can_be_recommended': True,
	'dynamic_refresh': True,
	-@@ -983,7 +983,7 @@
	- 'name': 'HomepageIsNewTabPage',
	+@@ -1068,7 +1068,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
	@@ -18,8 +18,8 @@
	'features': {
	'can_be_recommended': True,
	'dynamic_refresh': True,
	-@@ -1009,7 +1009,7 @@
	- 'name': 'NewTabPageLocation',
	+@@ -1095,7 +1095,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'string',
	'schema': { 'type': 'string' },
	- 'supported_on': ['chrome.*:58-', 'chrome_os:58-'],
	@@ -27,8 +27,8 @@
	'features': {
	'can_be_recommended': True,
	'dynamic_refresh': True,
	-@@ -1702,7 +1702,7 @@
	- 'name': 'RemoteAccessHostMatchUsername',
	+@@ -1821,7 +1821,7 @@
	+ 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'],
	@@ -36,8 +36,8 @@
	'features': {
	'dynamic_refresh': True,
	'per_profile': False,
	-@@ -3192,7 +3192,7 @@
	- 'name': 'GSSAPILibraryName',
	+@@ -3536,7 +3536,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'string',
	'schema': { 'type': 'string' },
	- 'supported_on': ['chrome.linux:9-'],
	@@ -45,8 +45,8 @@
	'features': {
	'dynamic_refresh': False,
	'per_profile': False,
	-@@ -3244,7 +3244,7 @@
	- 'name': 'NtlmV2Enabled',
	+@@ -3590,7 +3590,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'],
	@@ -54,8 +54,8 @@
	'features': {
	'dynamic_refresh': True,
	'per_profile': False,
	-@@ -6303,7 +6303,7 @@
	- 'name': 'RequireOnlineRevocationChecksForLocalAnchors',
	+@@ -6919,7 +6919,7 @@
	+ 'owners': ['file://src/net/cert/OWNERS'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
	@@ -63,8 +63,8 @@
	'features': {
	'dynamic_refresh': True,
	'per_profile': False,
	-@@ -7433,7 +7433,7 @@
	- 'name': 'BackgroundModeEnabled',
	+@@ -8119,7 +8119,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
	@@ -72,8 +72,8 @@
	'features': {
	'can_be_recommended': True,
	'dynamic_refresh': True,
	-@@ -7948,7 +7948,7 @@
	- 'name': 'FullscreenAllowed',
	+@@ -8713,7 +8713,7 @@
	+ 'owners': ['file://components/policy/resources/OWNERS'],
	'type': 'main',
	'schema': { 'type': 'boolean' },
	- 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'],
	Index: www/iridium/files/patch-components_policy_tools_generate__policy__source.py
	===================================================================
	--- www/iridium/files/patch-components_policy_tools_generate__policy__source.py
	+++ www/iridium/files/patch-components_policy_tools_generate__policy__source.py
	@@ -1,20 +1,19 @@
	---- components/policy/tools/generate_policy_source.py.orig 2019-03-11 22:00:57 UTC
	+--- components/policy/tools/generate_policy_source.py.orig 2019-10-21 19:06:30 UTC
	+++ components/policy/tools/generate_policy_source.py
	-@@ -86,7 +86,7 @@ class PolicyDetails:
	- if platform not in [
	- 'chrome_frame', 'chrome_os', 'android', 'webview_android',
	- 'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.fuchsia',
	-- 'chrome.*'
	-+ 'chrome.freebsd', 'chrome.*'
	+@@ -92,6 +92,7 @@ class PolicyDetails:
	+ 'chrome.linux',
	+ 'chrome.mac',
	+ 'chrome.fuchsia',
	++ 'chrome.freebsd',
	+ 'chrome.*',
	+ 'chrome.win7',
	]:
	- raise RuntimeError('Platform "%s" is not supported' % platform)
	-
	-@@ -105,7 +105,7 @@ class PolicyDetails:
	+@@ -114,7 +115,7 @@ class PolicyDetails:
	if platform.startswith('chrome.'):
	platform_sub = platform[7:]
	if platform_sub == '*':
	- self.platforms.extend(['win', 'mac', 'linux', 'fuchsia'])
	+ self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'freebsd'])
	+ elif platform_sub == 'win7':
	+ self.platforms.append('win')
	else:
	- self.platforms.append(platform_sub)
	- else:
	Index: www/iridium/files/patch-components_services_filesystem_file__system__app.cc
	===================================================================
	--- www/iridium/files/patch-components_services_filesystem_file__system__app.cc
	+++ www/iridium/files/patch-components_services_filesystem_file__system__app.cc
	@@ -1,20 +0,0 @@
	---- components/services/filesystem/file_system_app.cc.orig 2019-03-11 22:00:57 UTC
	-+++ components/services/filesystem/file_system_app.cc
	-@@ -19,7 +19,7 @@
	- #elif defined(OS_ANDROID)
	- #include "base/base_paths_android.h"
	- #include "base/path_service.h"
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "base/environment.h"
	- #include "base/nix/xdg_util.h"
	- #elif defined(OS_MACOSX)
	-@@ -73,7 +73,7 @@ base::FilePath FileSystemApp::GetUserDataDir() {
	- CHECK(base::PathService::Get(base::DIR_APP_DATA, &path));
	- #elif defined(OS_ANDROID)
	- CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- std::unique_ptr<base::Environment> env(base::Environment::Create());
	- path = base::nix::GetXDGDirectory(
	- env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
	Index: www/iridium/files/patch-components_services_font_font__service__app.cc
	===================================================================
	--- www/iridium/files/patch-components_services_font_font__service__app.cc
	+++ www/iridium/files/patch-components_services_font_font__service__app.cc
	@@ -1,11 +0,0 @@
	---- components/services/font/font_service_app.cc.orig 2019-03-11 22:00:57 UTC
	-+++ components/services/font/font_service_app.cc
	-@@ -20,7 +20,7 @@
	- #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck
	- #endif
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "base/test/fontconfig_util_linux.h"
	- #endif
	-
	Index: www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
	===================================================================
	--- www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
	+++ www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
	@@ -1,20 +0,0 @@
	---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2019-03-17 18:33:50 UTC
	-+++ components/startup_metric_utils/browser/startup_metric_utils.cc
	-@@ -456,7 +456,7 @@ void AddStartupEventsForTelemetry()
	- // RecordBrowserMainMessageLoopStart, the time since last startup is also logged
	- // to a histogram suffixed with the startup temperature.
	- void RecordTimeSinceLastStartup(PrefService* pref_service) {
	--#if defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX)
	-+#if defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- DCHECK(pref_service);
	-
	- // Get the timestamp of the current startup.
	-@@ -485,7 +485,7 @@ void RecordTimeSinceLastStartup(PrefService* pref_serv
	- // Write the timestamp of the current startup in \|pref_service\|.
	- pref_service->SetInt64(prefs::kLastStartupTimestamp,
	- process_start_time.ToInternalValue());
	--#endif // defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX)
	-+#endif // defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- }
	-
	- // Logs the Startup.SameVersionStartupCount histogram. Relies on \|pref_service\|
	Index: www/iridium/files/patch-components_storage__monitor_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-components_storage__monitor_BUILD.gn
	+++ www/iridium/files/patch-components_storage__monitor_BUILD.gn
	@@ -1,14 +1,10 @@
	---- components/storage_monitor/BUILD.gn.orig 2019-03-11 22:00:57 UTC
	+--- components/storage_monitor/BUILD.gn.orig 2019-10-21 19:06:30 UTC
	+++ components/storage_monitor/BUILD.gn
	-@@ -65,6 +65,17 @@ static_library("storage_monitor") {
	- ]
	+@@ -81,6 +81,13 @@ static_library("storage_monitor") {
	+ }
	}

	+ if (is_bsd) {
	-+ sources -= [
	-+ "mtab_watcher_linux.cc",
	-+ "mtab_watcher_linux.h",
	-+ ]
	+ sources += [
	+ "storage_monitor_freebsd.cc",
	+ "storage_monitor_freebsd.h",
	@@ -16,5 +12,5 @@
	+ }
	+
	if (use_udev) {
	- deps += [ "//device/udev_linux" ]
	- } else if (is_linux) {
	+ sources += [
	+ "udev_util_linux.cc",
	Index: www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
	===================================================================
	--- www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
	+++ www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc
	@@ -0,0 +1,26 @@
	+--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-07-29 16:01:57 UTC
	++++ components/sync_device_info/local_device_info_util_linux.cc
	+@@ -30,6 +30,23 @@ std::string GetSessionNameInternal() {
	+ break;
	+ }
	+ return "Chromebook";
	++#elif defined(OS_BSD)
	++ long len = sysconf(_SC_HOST_NAME_MAX);
	++
	++ if (len == -1)
	++ return "FreeBSD";
	++
	++ char *hostname = new (std::nothrow) char[len]();
	++
	++ if ((hostname == nullptr) \|\| (gethostname(hostname, len) == -1)) {
	++ delete[](hostname);
	++ return "FreeBSD";
	++ }
	++
	++ std::string res{hostname};
	++
	++ delete[](hostname);
	++ return res;
	+ #else
	+ char hostname[HOST_NAME_MAX];
	+ if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
	Index: www/iridium/files/patch-components_sync_base_get__session__name.cc
	===================================================================
	--- www/iridium/files/patch-components_sync_base_get__session__name.cc
	+++ www/iridium/files/patch-components_sync_base_get__session__name.cc
	@@ -1,20 +0,0 @@
	---- components/sync/base/get_session_name.cc.orig 2019-03-11 22:00:57 UTC
	-+++ components/sync/base/get_session_name.cc
	-@@ -17,7 +17,7 @@
	-
	- #if defined(OS_CHROMEOS)
	- #include "chromeos/constants/devicetype.h"
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "components/sync/base/get_session_name_linux.h"
	- #elif defined(OS_IOS)
	- #include "components/sync/base/get_session_name_ios.h"
	-@@ -52,7 +52,7 @@ std::string GetSessionNameBlocking() {
	- session_name = "Chromebook";
	- break;
	- }
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- session_name = internal::GetHostname();
	- #elif defined(OS_IOS)
	- session_name = internal::GetComputerName();
	Index: www/iridium/files/patch-components_sync_base_get__session__name__linux.cc
	===================================================================
	--- www/iridium/files/patch-components_sync_base_get__session__name__linux.cc
	+++ www/iridium/files/patch-components_sync_base_get__session__name__linux.cc
	@@ -1,14 +0,0 @@
	---- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC
	-+++ components/sync/base/get_session_name_linux.cc
	-@@ -13,8 +13,9 @@ namespace syncer {
	- namespace internal {
	-
	- std::string GetHostname() {
	-- char hostname[HOST_NAME_MAX];
	-- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
	-+ int len = sysconf(_SC_HOST_NAME_MAX);
	-+ char hostname[len];
	-+ if (gethostname(hostname, len) == 0) // Success.
	- return hostname;
	- return base::GetLinuxDistro();
	- }
	Index: www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
	===================================================================
	--- www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
	+++ www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
	@@ -1,11 +0,0 @@
	---- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC
	-+++ components/sync/device_info/local_device_info_provider_impl.cc
	-@@ -15,7 +15,7 @@ namespace {
	- sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) {
	- #if defined(OS_CHROMEOS)
	- return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
	- #elif defined(OS_ANDROID) \|\| defined(OS_IOS)
	- return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET
	Index: www/iridium/files/patch-components_update__client_update__query__params.cc
	===================================================================
	--- www/iridium/files/patch-components_update__client_update__query__params.cc
	+++ www/iridium/files/patch-components_update__client_update__query__params.cc
	@@ -1,6 +1,6 @@
	---- components/update_client/update_query_params.cc.orig 2019-03-11 22:00:57 UTC
	+--- components/update_client/update_query_params.cc.orig 2019-10-21 19:06:31 UTC
	+++ components/update_client/update_query_params.cc
	-@@ -38,6 +38,8 @@ const char kOs[] =
	+@@ -39,6 +39,8 @@ const char kOs[] =
	"fuchsia";
	#elif defined(OS_OPENBSD)
	"openbsd";
	Index: www/iridium/files/patch-content_app_content__main__runner__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_app_content__main__runner__impl.cc
	+++ www/iridium/files/patch-content_app_content__main__runner__impl.cc
	@@ -1,6 +1,6 @@
	---- content/app/content_main_runner_impl.cc.orig 2019-03-11 22:00:57 UTC
	+--- content/app/content_main_runner_impl.cc.orig 2019-10-21 19:06:31 UTC
	+++ content/app/content_main_runner_impl.cc
	-@@ -93,17 +93,17 @@
	+@@ -102,17 +102,17 @@
	#include "base/posix/global_descriptors.h"
	#include "content/public/common/content_descriptors.h"

	@@ -21,7 +21,7 @@
	#include "base/native_library.h"
	#include "base/rand_util.h"
	#include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
	-@@ -124,7 +124,7 @@
	+@@ -133,7 +133,7 @@
	#include "content/public/common/content_client.h"
	#endif

	@@ -30,7 +30,7 @@

	#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
	#include "content/child/field_trial.h"
	-@@ -309,7 +309,7 @@ void InitializeZygoteSandboxForBrowserProcess(
	+@@ -318,7 +318,7 @@ void InitializeZygoteSandboxForBrowserProcess(
	}
	#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)

	@@ -39,16 +39,16 @@

	#if BUILDFLAG(ENABLE_PLUGINS)
	// Loads the (native) libraries but does not initialize them (i.e., does not
	-@@ -406,7 +406,7 @@ void PreSandboxInit() {
	+@@ -415,7 +415,7 @@ void PreSandboxInit() {
	}
	#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)

	-#endif // OS_LINUX
	+#endif // OS_LINUX \|\| OS_BSD

	- } // namespace
	-
	-@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) {
	+ #if !defined(CHROME_MULTIPLE_DLL_CHILD)
	+ void InitializeBrowserClientProcessImpl() {
	+@@ -482,7 +482,7 @@ int RunZygote(ContentMainDelegate* delegate) {
	delegate->ZygoteStarting(&zygote_fork_delegates);
	media::InitializeMediaLibrary();

	@@ -57,7 +57,7 @@
	PreSandboxInit();
	#endif

	-@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
	+@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai
	base::GlobalDescriptors::kBaseDescriptor);
	#endif // !OS_ANDROID

	Index: www/iridium/files/patch-content_browser_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-content_browser_BUILD.gn
	+++ www/iridium/files/patch-content_browser_BUILD.gn
	@@ -1,14 +0,0 @@
	---- content/browser/BUILD.gn.orig 2019-03-11 22:00:57 UTC
	-+++ content/browser/BUILD.gn
	-@@ -1939,11 +1939,6 @@ jumbo_source_set("browser") {
	- "tracing/cros_tracing_agent.h",
	- ]
	- deps += [ "//chromeos/resources" ]
	-- } else {
	-- sources += [
	-- "memory/memory_monitor_linux.cc",
	-- "memory/memory_monitor_linux.h",
	-- ]
	- }
	-
	- if (is_chromeos \|\| is_android \|\| is_chromecast) {
	Index: www/iridium/files/patch-content_browser_browser__main__loop.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_browser__main__loop.cc
	+++ www/iridium/files/patch-content_browser_browser__main__loop.cc
	@@ -1,6 +1,6 @@
	---- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC
	+--- content/browser/browser_main_loop.cc.orig 2019-10-21 19:06:31 UTC
	+++ content/browser/browser_main_loop.cc
	-@@ -250,6 +250,13 @@
	+@@ -244,6 +244,13 @@
	#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
	#endif

	@@ -14,7 +14,7 @@
	// One of the linux specific headers defines this as a macro.
	#ifdef DestroyAll
	#undef DestroyAll
	-@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() {
	+@@ -573,6 +580,11 @@ int BrowserMainLoop::EarlyInitialization() {
	// by now since a thread to start the ServiceManager has been created
	// before the browser main loop starts.
	DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
	@@ -26,21 +26,21 @@
	#endif

	#if defined(USE_X11)
	-@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() {
	- #endif // defined(OS_ANDROID) \|\| defined(OS_CHROMEOS)
	+@@ -618,7 +630,7 @@ int BrowserMainLoop::EarlyInitialization() {
	+ }
	+ #endif // !defined(OS_MACOSX)

	- #if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| \
	-- defined(OS_ANDROID)
	-+ defined(OS_ANDROID) \|\| defined(OS_BSD)
	+-#if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| \
	++#if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_ANDROID)
	// We use quite a few file descriptors for our IPC as well as disk the disk
	// cache,and the default limit on the Mac is low (256), so bump it up.
	-
	-@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() {
	+@@ -628,7 +640,7 @@ int BrowserMainLoop::EarlyInitialization() {
	+ // users can easily hit this limit with many open tabs. Bump up the limit to
	// an arbitrarily high number. See https://crbug.com/539567
	base::IncreaseFdLimitTo(8192);
	- #endif // defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\|
	-- // defined(OS_ANDROID)
	-+ // defined(OS_ANDROID) \|\| defined(OS_BSD)
	+-#endif // defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\|
	++#endif // defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD) \|\|
	+ // defined(OS_ANDROID)

	#if defined(OS_WIN)
	- net::EnsureWinsockInit();
	Index: www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
	+++ www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
	@@ -0,0 +1,11 @@
	+--- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-09-09 21:55:16 UTC
	++++ content/browser/devtools/protocol/system_info_handler.cc
	+@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
	+ // Give the GPU process a few seconds to provide GPU info.
	+ // Linux Debug builds need more time -- see Issue 796437.
	+ // Windows builds need more time -- see Issue 873112.
	+-#if (defined(OS_LINUX) && !defined(NDEBUG)) \|\| defined(OS_WIN)
	++#if ((defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(NDEBUG)) \|\| defined(OS_WIN)
	+ const int kGPUInfoWatchdogTimeoutMs = 20000;
	+ #else
	+ const int kGPUInfoWatchdogTimeoutMs = 5000;
	Index: www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
	+++ www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
	@@ -0,0 +1,11 @@
	+--- content/browser/gpu/gpu_process_host.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/gpu/gpu_process_host.cc
	+@@ -1094,7 +1094,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
	+ std::unique_ptr<base::CommandLine> cmd_line =
	+ std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
	+ #else
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
	+ : ChildProcessHost::CHILD_NORMAL;
	+ #elif defined(OS_MACOSX)
	Index: www/iridium/files/patch-content_browser_media_media__internals.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_media_media__internals.cc
	+++ www/iridium/files/patch-content_browser_media_media__internals.cc
	@@ -1,11 +1,11 @@
	---- content/browser/media/media_internals.cc.orig 2019-03-11 22:00:57 UTC
	+--- content/browser/media/media_internals.cc.orig 2019-09-09 21:55:16 UTC
	+++ content/browser/media/media_internals.cc
	-@@ -763,7 +763,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
	+@@ -505,7 +505,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
	+ device_dict->SetString("id", descriptor.device_id);
	device_dict->SetString("name", descriptor.GetNameAndModel());
	device_dict->Set("formats", std::move(format_list));
	- #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	-- defined(OS_ANDROID)
	-+ defined(OS_ANDROID) \|\| 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)
	device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString());
	#endif
	- video_capture_capabilities_cached_data_.Append(std::move(device_dict));
	Index: www/iridium/files/patch-content_browser_memory_memory__monitor.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_memory_memory__monitor.cc
	+++ www/iridium/files/patch-content_browser_memory_memory__monitor.cc
	@@ -1,11 +0,0 @@
	---- content/browser/memory/memory_monitor.cc.orig 2019-03-11 22:00:57 UTC
	-+++ content/browser/memory/memory_monitor.cc
	-@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo(
	- base::GetSystemMemoryInfo(mem_info);
	- }
	-
	--#if defined(OS_MACOSX)
	-+#if defined(OS_MACOSX) \|\| defined(OS_BSD)
	- // TODO(bashi,bcwhite): Remove when memory monitor for mac is available.
	- std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
	- NOTREACHED();
	Index: www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc
	+++ www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc
	@@ -0,0 +1,11 @@
	+--- content/browser/ppapi_plugin_process_host.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/ppapi_plugin_process_host.cc
	+@@ -370,7 +370,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn
	+ base::CommandLine::StringType plugin_launcher =
	+ browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
	+ ChildProcessHost::CHILD_NORMAL;
	+ #elif defined(OS_MACOSX)
	Index: www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
	@@ -1,4 +1,4 @@
	---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-09-09 21:55:16 UTC
	+++ content/browser/renderer_host/input/input_device_change_observer.cc
	@@ -10,7 +10,7 @@

	@@ -6,7 +6,7 @@
	#include "ui/events/devices/input_device_observer_win.h"
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "ui/events/devices/input_device_manager.h"
	+ #include "ui/events/devices/device_data_manager.h"
	#elif defined(OS_ANDROID)
	#include "ui/events/devices/input_device_observer_android.h"
	@@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R
	@@ -15,7 +15,7 @@
	ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- ui::InputDeviceManager::GetInstance()->AddObserver(this);
	+ ui::DeviceDataManager::GetInstance()->AddObserver(this);
	#elif defined(OS_ANDROID)
	ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
	@@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R
	@@ -24,6 +24,6 @@
	ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
	+ ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
	#elif defined(OS_ANDROID)
	ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this);
	Index: www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc
	@@ -0,0 +1,20 @@
	+--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/renderer_host/pepper/pepper_file_io_host.cc
	+@@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened(
	+ ppapi::host::ReplyMessageContext reply_context,
	+ const base::FilePath& path,
	+ base::File::Error error_code) {
	+-#if defined(OS_WIN) \|\| defined(OS_LINUX)
	++#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Quarantining a file before its contents are available is only supported on
	+ // Windows and Linux.
	+ if (!FileOpenForWrite(open_flags_) \|\| error_code != base::File::FILE_OK) {
	+@@ -453,7 +453,7 @@ void PepperFileIOHost::OnLocalFileOpened(
	+ #endif
	+ }
	+
	+-#if defined(OS_WIN) \|\| defined(OS_LINUX)
	++#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ void PepperFileIOHost::OnLocalFileQuarantined(
	+ ppapi::host::ReplyMessageContext reply_context,
	+ const base::FilePath& path,
	Index: www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
	+++ www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_message_filter.h.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_message_filter.h.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_message_filter.h
	-@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter
	+@@ -86,14 +86,14 @@ class CONTENT_EXPORT RenderMessageFilter
	mojom::WidgetPtr widget,
	CreateFullscreenWidgetCallback callback) override;
	void HasGpuProcess(HasGpuProcessCallback callback) override;
	Index: www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_message_filter.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_message_filter.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_message_filter.cc
	-@@ -71,7 +71,7 @@
	+@@ -70,7 +70,7 @@
	#if defined(OS_MACOSX)
	#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
	#endif
	@@ -9,7 +9,7 @@
	#include "base/linux_util.h"
	#include "base/threading/platform_thread.h"
	#endif
	-@@ -151,7 +151,7 @@ void RenderMessageFilter::CreateFullscreenWidget(
	+@@ -148,7 +148,7 @@ void RenderMessageFilter::CreateFullscreenWidget(
	std::move(callback).Run(route_id);
	}

	@@ -18,7 +18,7 @@
	void RenderMessageFilter::SetThreadPriorityOnFileThread(
	base::PlatformThreadId ns_tid,
	base::ThreadPriority priority) {
	-@@ -172,7 +172,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
	+@@ -169,7 +169,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
	}
	#endif

	Index: www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
	+++ www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_process_host_impl.h
	-@@ -407,10 +407,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
	+@@ -423,10 +423,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
	is_for_guests_only_ = is_for_guests_only;
	}

	Index: www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
	@@ -0,0 +1,47 @@
	+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/renderer_host/render_process_host_impl.cc
	+@@ -230,7 +230,7 @@
	+ #include "content/browser/gpu/gpu_data_manager_impl.h"
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include <sys/resource.h>
	+ #include <sys/time.h>
	+
	+@@ -1194,7 +1194,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
	+ // to indicate failure and std::numeric_limits<size_t>::max() to indicate
	+ // unlimited.
	+ size_t GetPlatformProcessLimit() {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ struct rlimit limit;
	+ if (getrlimit(RLIMIT_NPROC, &limit) != 0)
	+ return kUnknownPlatformProcessLimit;
	+@@ -1205,7 +1205,7 @@ size_t GetPlatformProcessLimit() {
	+ #else
	+ // TODO(https://crbug.com/104689): Implement on other platforms.
	+ return kUnknownPlatformProcessLimit;
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+ }
	+ #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
	+
	+@@ -1239,7 +1239,7 @@ class RenderProcessHostImpl::IOThreadHostImpl
	+
	+ // mojom::ChildProcessHost implementation:
	+ void BindHostReceiver(mojo::GenericPendingReceiver receiver) override {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
	+ ConnectToFontService(std::move(font_receiver));
	+ return;
	+@@ -1593,7 +1593,7 @@ bool RenderProcessHostImpl::Init() {
	+ renderer_prefix =
	+ browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
	+ : ChildProcessHost::CHILD_NORMAL;
	+ #elif defined(OS_MACOSX)
	Index: www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_view_host_impl.cc
	-@@ -161,7 +161,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
	+@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr
	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
	prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
	display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
	Index: www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_widget_host_view_aura.cc
	-@@ -121,7 +121,7 @@
	+@@ -116,7 +116,7 @@
	#include "content/browser/accessibility/browser_accessibility_auralinux.h"
	#endif

	@@ -9,7 +9,7 @@
	#include "ui/base/ime/linux/text_edit_command_auralinux.h"
	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
	#endif
	-@@ -2192,7 +2192,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
	+@@ -2203,7 +2203,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
	}

	bool RenderWidgetHostViewAura::NeedsMouseCapture() {
	@@ -18,7 +18,7 @@
	return NeedsInputGrab();
	#endif
	return false;
	-@@ -2390,7 +2390,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
	+@@ -2388,7 +2388,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
	if (!target_host)
	return;

	Index: www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
	+++ www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
	@@ -1,6 +1,6 @@
	---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
	-@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
	+@@ -620,7 +620,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
	if (event->type() == ui::ET_MOUSE_EXITED) {
	if (mouse_locked \|\| selection_popup)
	return false;
	Index: www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
	+++ www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc
	@@ -0,0 +1,11 @@
	+--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/scheduler/responsiveness/jank_monitor.cc
	+@@ -293,7 +293,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv
	+ // in context menus, among others). Simply ignore the mismatches for now.
	+ // See https://crbug.com/929813 for the details of why the mismatch
	+ // happens.
	+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
	++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(USE_OZONE)
	+ task_execution_metadata_.clear();
	+ #endif
	+ return;
	Index: www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
	+++ www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
	@@ -0,0 +1,20 @@
	+--- content/browser/scheduler/responsiveness/watcher.cc.orig 2019-09-16 09:41:14 UTC
	++++ content/browser/scheduler/responsiveness/watcher.cc
	+@@ -96,7 +96,7 @@ void Watcher::DidRunTask(const base::PendingTask* task
	+ // in context menus, among others). Simply ignore the mismatches for now.
	+ // See https://crbug.com/929813 for the details of why the mismatch
	+ // happens.
	+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
	++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(USE_OZONE)
	+ return currently_running_metadata_ui_.clear();
	+ #endif
	+ DCHECK_LE(*mismatched_task_identifiers, 1);
	+@@ -156,7 +156,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque
	+ mismatched_event_identifiers_ui_ += 1;
	+ // See comment in DidRunTask() for why \|currently_running_metadata_ui_\| may
	+ // be reset.
	+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
	++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(USE_OZONE)
	+ return currently_running_metadata_ui_.clear();
	+ #endif
	+ DCHECK_LE(mismatched_event_identifiers_ui_, 1);
	Index: www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc
	+++ www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc
	@@ -1,35 +0,0 @@
	---- content/browser/service_manager/service_manager_context.cc.orig 2019-03-11 22:00:58 UTC
	-+++ content/browser/service_manager/service_manager_context.cc
	-@@ -99,7 +99,7 @@
	- #include "jni/ContentNfcDelegate_jni.h"
	- #endif
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "components/services/font/font_service_app.h"
	- #include "components/services/font/public/interfaces/constants.mojom.h"
	- #endif
	-@@ -378,12 +378,12 @@ void CreateInProcessAudioService(
	- BrowserMainLoop::GetAudioManager(), std::move(request)));
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- std::unique_ptr<service_manager::Service> CreateFontService(
	- service_manager::mojom::ServiceRequest request) {
	- return std::make_unique<font_service::FontServiceApp>(std::move(request));
	- }
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	-
	- std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
	- service_manager::mojom::ServiceRequest request) {
	-@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext(
	- base::BindRepeating(&CreateVideoCaptureService));
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- RegisterInProcessService(
	- packaged_services_connection_.get(), font_service::mojom::kServiceName,
	- base::CreateSequencedTaskRunnerWithTraits(
	Index: www/iridium/files/patch-content_browser_storage__partition__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_storage__partition__impl.cc
	+++ www/iridium/files/patch-content_browser_storage__partition__impl.cc
	@@ -1,11 +0,0 @@
	---- content/browser/storage_partition_impl.cc.orig 2019-03-17 17:48:03 UTC
	-+++ content/browser/storage_partition_impl.cc
	-@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
	- // TODO(jam): enable for all, still used on WebView.
	- // See copy of this ifdef in:
	- // StoragePartitionImplMap::Get
	--#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	-+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- if (base::FeatureList::IsEnabled(network::features::kNetworkService))
	- NOTREACHED();
	- #endif
	Index: www/iridium/files/patch-content_browser_storage__partition__impl__map.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_storage__partition__impl__map.cc
	+++ www/iridium/files/patch-content_browser_storage__partition__impl__map.cc
	@@ -1,11 +0,0 @@
	---- content/browser/storage_partition_impl_map.cc.orig 2019-03-17 17:40:34 UTC
	-+++ content/browser/storage_partition_impl_map.cc
	-@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
	- bool create_request_context = true;
	- if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
	- // These ifdefs should match StoragePartitionImpl::GetURLRequestContext.
	--#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	-+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- create_request_context = false;
	- #elif defined(OS_ANDROID)
	- create_request_context =
	Index: www/iridium/files/patch-content_browser_utility__process__host.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_utility__process__host.cc
	+++ www/iridium/files/patch-content_browser_utility__process__host.cc
	@@ -0,0 +1,29 @@
	+--- content/browser/utility_process_host.cc.orig 2019-10-21 19:06:32 UTC
	++++ content/browser/utility_process_host.cc
	+@@ -55,7 +55,7 @@
	+ #include "services/network/network_sandbox_win.h"
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
	+ #include "content/browser/font_service.h" // nogncheck
	+ #endif
	+@@ -216,7 +216,7 @@ UtilityProcessHost::UtilityProcessHost()
	+
	+ UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
	+ : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
	+ #else
	+ child_flags_(ChildProcessHost::CHILD_NORMAL),
	+@@ -515,7 +515,7 @@ void UtilityProcessHost::OnProcessCrashed(int exit_cod
	+
	+ void UtilityProcessHost::BindHostReceiver(
	+ mojo::GenericPendingReceiver receiver) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
	+ ConnectToFontService(std::move(font_receiver));
	+ return;
	Index: www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc
	===================================================================
	--- www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc
	+++ www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc
	@@ -1,12 +1,15 @@
	---- content/browser/webui/shared_resources_data_source.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/browser/webui/shared_resources_data_source.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/browser/webui/shared_resources_data_source.cc
	-@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
	- return std::map<int, std::string> {
	- {IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"},
	- {IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_lite.js"},
	+@@ -123,12 +123,12 @@ const std::map<int, std::string> CreateMojoResourceIdT
	+ "mojo/mojo/public/mojom/base/string16.mojom.html"},
	+ {IDR_MOJO_STRING16_MOJOM_LITE_JS,
	+ "mojo/mojo/public/mojom/base/string16.mojom-lite.js"},
	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- {IDR_MOJO_TIME_MOJOM_JS, "js/time.mojom.js"},
	+ {IDR_MOJO_TIME_MOJOM_HTML,
	+ "mojo/mojo/public/mojom/base/time.mojom.html"},
	+ {IDR_MOJO_TIME_MOJOM_LITE_JS,
	+ "mojo/mojo/public/mojom/base/time.mojom-lite.js"},
	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	};
	Index: www/iridium/files/patch-content_common_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-content_common_BUILD.gn
	+++ www/iridium/files/patch-content_common_BUILD.gn
	@@ -1,6 +1,6 @@
	---- content/common/BUILD.gn.orig 2019-03-11 22:00:58 UTC
	+--- content/common/BUILD.gn.orig 2019-10-21 19:06:32 UTC
	+++ content/common/BUILD.gn
	-@@ -382,6 +382,12 @@ source_set("common") {
	+@@ -367,6 +367,12 @@ source_set("common") {
	libs += [ "android" ]
	}

	Index: www/iridium/files/patch-content_common_user__agent.cc
	===================================================================
	--- www/iridium/files/patch-content_common_user__agent.cc
	+++ www/iridium/files/patch-content_common_user__agent.cc
	@@ -1,8 +1,8 @@
	---- content/common/user_agent.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/common/user_agent.cc.orig 2019-09-09 21:55:16 UTC
	+++ content/common/user_agent.cc
	-@@ -131,6 +131,14 @@ std::string BuildOSCpuInfo(bool include_android_build_
	+@@ -124,6 +124,14 @@ std::string BuildOSCpuInfo(bool include_android_build_
	#endif
	- ); // NOLINT
	+ );

	+#if defined(OS_BSD)
	+#if defined(__x86_64__)
	Index: www/iridium/files/patch-content_gpu_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-content_gpu_BUILD.gn
	+++ www/iridium/files/patch-content_gpu_BUILD.gn
	@@ -1,6 +1,6 @@
	---- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC
	+--- content/gpu/BUILD.gn.orig 2019-09-09 21:55:16 UTC
	+++ content/gpu/BUILD.gn
	-@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") {
	+@@ -125,7 +125,7 @@ target(link_target_type, "gpu_sources") {

	# Use DRI on desktop Linux builds.
	if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
	Index: www/iridium/files/patch-content_gpu_gpu__main.cc
	===================================================================
	--- www/iridium/files/patch-content_gpu_gpu__main.cc
	+++ www/iridium/files/patch-content_gpu_gpu__main.cc
	@@ -1,6 +1,6 @@
	---- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/gpu/gpu_main.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/gpu/gpu_main.cc
	-@@ -78,7 +78,7 @@
	+@@ -82,7 +82,7 @@
	#include "ui/gfx/x/x11_switches.h" // nogncheck
	#endif

	@@ -27,7 +27,16 @@
	return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
	#elif defined(OS_WIN)
	return StartSandboxWindows(sandbox_info_);
	-@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) {
	+@@ -276,7 +276,7 @@ int GpuMain(const MainFunctionParams& parameters) {
	+ main_thread_task_executor =
	+ std::make_unique<base::SingleThreadTaskExecutor>(
	+ gpu_preferences.message_pump_type);
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #error "Unsupported Linux platform."
	+ #elif defined(OS_MACOSX)
	+ // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
	+@@ -383,7 +383,7 @@ int GpuMain(const MainFunctionParams& parameters) {

	namespace {

	@@ -36,7 +45,7 @@
	bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
	const gpu::GPUInfo* gpu_info,
	const gpu::GpuPreferences& gpu_prefs) {
	-@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
	+@@ -418,7 +418,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo

	return res;
	}
	Index: www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
	===================================================================
	--- www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
	+++ www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
	@@ -1,6 +1,6 @@
	---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/gpu/gpu_sandbox_hook_linux.cc
	-@@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] =
	+@@ -96,8 +96,9 @@ static const char kLibV4lEncPluginPath[] =
	"/usr/lib/libv4l/plugins/libv4l-encplugin.so";
	#endif

	@@ -11,7 +11,7 @@
	void AddV4L2GpuWhitelist(
	std::vector<BrokerFilePermission>* permissions,
	const service_manager::SandboxSeccompBPF::Options& options) {
	-@@ -277,8 +278,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
	+@@ -299,8 +300,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
	AddStandardGpuWhiteList(&permissions);
	return permissions;
	}
	@@ -22,7 +22,7 @@
	// Preload the Mali library.
	if (UseChromecastSandboxWhitelist()) {
	for (const char* path : kWhitelistedChromecastPaths) {
	-@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() {
	+@@ -315,6 +318,7 @@ void LoadArmGpuLibraries() {
	// Preload the Tegra V4L2 (video decode acceleration) library.
	dlopen(kLibTegraPath, dlopen_flag);
	}
	@@ -30,7 +30,7 @@
	}

	bool LoadAmdGpuLibraries() {
	-@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu(
	+@@ -370,6 +374,7 @@ bool LoadLibrariesForGpu(
	return true;
	}

	@@ -38,7 +38,7 @@
	sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
	const service_manager::SandboxLinux::Options& options) {
	sandbox::syscall_broker::BrokerCommandSet command_set;
	-@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook(
	+@@ -390,13 +395,17 @@ bool BrokerProcessPreSandboxHook(
	service_manager::SetProcessTitleFromCommandLine(nullptr);
	return true;
	}
	Index: www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
	===================================================================
	--- www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
	+++ www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
	@@ -1,4 +1,4 @@
	---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC
	+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-10-21 19:06:32 UTC
	+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
	@@ -13,7 +13,7 @@
	#include "build/build_config.h"
	@@ -9,8 +9,8 @@
	#include "components/services/font/public/cpp/font_loader.h"
	#include "third_party/skia/include/core/SkRefCnt.h"
	#endif
	-@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
	- bool sync_dir) override;
	+@@ -36,11 +36,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
	+ blink::WebThemeEngine* ThemeEngine() override;

	private:
	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	Index: www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
	+++ www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
	@@ -1,24 +1,24 @@
	---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
	-@@ -20,7 +20,7 @@
	+@@ -19,7 +19,7 @@

	#if defined(OS_MACOSX)
	#include "content/child/child_process_sandbox_support_impl_mac.h"
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	#include "content/child/child_process_sandbox_support_impl_linux.h"
	+ #include "mojo/public/cpp/bindings/pending_remote.h"
	#endif
	-
	@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
	namespace content {

	PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- font_loader_ =
	- sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector());
	- SkFontConfigInterface::SetGlobal(font_loader_);
	-@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
	+ mojo::PendingRemote<font_service::mojom::FontService> font_service;
	+ ChildThread::Get()->BindHostReceiver(
	+ font_service.InitWithNewPipeAndPassReceiver());
	+@@ -51,7 +51,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
	}

	void PpapiBlinkPlatformImpl::Shutdown() {
	@@ -27,7 +27,7 @@
	// SandboxSupport contains a map of OutOfProcessFont objects, which hold
	// WebStrings and WebVectors, which become invalidated when blink is shut
	// down. Hence, we need to clear that map now, just before blink::shutdown()
	-@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
	+@@ -61,7 +61,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
	}

	blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
	Index: www/iridium/files/patch-content_public_app_content__main__delegate.h
	===================================================================
	--- www/iridium/files/patch-content_public_app_content__main__delegate.h
	+++ www/iridium/files/patch-content_public_app_content__main__delegate.h
	@@ -0,0 +1,20 @@
	+--- content/public/app/content_main_delegate.h.orig 2019-09-16 14:44:25 UTC
	++++ content/public/app/content_main_delegate.h
	+@@ -71,7 +71,7 @@ class CONTENT_EXPORT ContentMainDelegate {
	+ // want it at all.
	+ virtual bool DelaySandboxInitialization(const std::string& process_type);
	+
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Tells the embedder that the zygote process is starting, and allows it to
	+ // specify one or more zygote delegates if it wishes by storing them in
	+ // \|*delegates\|.
	+@@ -81,7 +81,7 @@ class CONTENT_EXPORT ContentMainDelegate {
	+
	+ // Called every time the zygote process forks.
	+ virtual void ZygoteForked() {}
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ // Allows the embedder to prevent locking the scheme registry. The scheme
	+ // registry is the list of URL schemes we recognize, with some additional
	Index: www/iridium/files/patch-content_public_app_content__main__delegate.cc
	===================================================================
	--- www/iridium/files/patch-content_public_app_content__main__delegate.cc
	+++ www/iridium/files/patch-content_public_app_content__main__delegate.cc
	@@ -0,0 +1,18 @@
	+--- content/public/app/content_main_delegate.cc.orig 2019-09-16 15:21:10 UTC
	++++ content/public/app/content_main_delegate.cc
	+@@ -38,13 +38,13 @@ bool ContentMainDelegate::DelaySandboxInitialization(
	+ return false;
	+ }
	+
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ void ContentMainDelegate::ZygoteStarting(
	+ std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>*
	+ delegates) {}
	+
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ int ContentMainDelegate::TerminateForFatalInitializationError() {
	+ CHECK(false);
	Index: www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc
	===================================================================
	--- www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc
	+++ www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc
	@@ -1,20 +0,0 @@
	---- content/public/app/content_packaged_services_manifest.cc.orig 2019-03-11 22:00:58 UTC
	-+++ content/public/app/content_packaged_services_manifest.cc
	-@@ -23,7 +23,7 @@
	- #include "services/video_capture/manifest.h"
	- #include "services/viz/manifest.h"
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "components/services/font/manifest.h"
	- #endif
	-
	-@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer
	- .PackageService(tracing::GetManifest())
	- .PackageService(video_capture::GetManifest())
	- .PackageService(viz::GetManifest())
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- .PackageService(font_service::GetManifest())
	- #endif
	- #if defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
	===================================================================
	--- www/iridium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
	+++ www/iridium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
	@@ -1,4 +1,4 @@
	---- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-04-05 00:49:17 UTC
	+--- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-04-30 22:22:47 UTC
	+++ content/public/app/v8_snapshot_overlay_manifest.cc
	@@ -15,7 +15,7 @@ namespace content {
	const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
	Index: www/iridium/files/patch-content_public_common_child__process__host.h
	===================================================================
	--- www/iridium/files/patch-content_public_common_child__process__host.h
	+++ www/iridium/files/patch-content_public_common_child__process__host.h
	@@ -1,6 +1,6 @@
	---- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC
	+--- content/public/common/child_process_host.h.orig 2019-10-21 19:06:32 UTC
	+++ content/public/common/child_process_host.h
	-@@ -47,7 +47,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
	+@@ -52,7 +52,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
	// No special behavior requested.
	CHILD_NORMAL = 0,

	@@ -9,12 +9,3 @@
	// Indicates that the child execed after forking may be execced from
	// /proc/self/exe rather than using the "real" app path. This prevents
	// autoupdate from confusing us if it changes the file out from under us.
	-@@ -56,7 +56,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
	- // gdb). In this case, you'd use GetChildPath to get the real executable
	- // file name, and then prepend the GDB command to the command line.
	- CHILD_ALLOW_SELF = 1 << 0,
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	- };
	-
	- // Returns the pathname to be used for a child process. If a subprocess
	Index: www/iridium/files/patch-content_public_common_common__param__traits__macros.h
	===================================================================
	--- www/iridium/files/patch-content_public_common_common__param__traits__macros.h
	+++ www/iridium/files/patch-content_public_common_common__param__traits__macros.h
	@@ -1,6 +1,6 @@
	---- content/public/common/common_param_traits_macros.h.orig 2019-03-11 22:00:58 UTC
	+--- content/public/common/common_param_traits_macros.h.orig 2019-09-09 21:55:16 UTC
	+++ content/public/common/common_param_traits_macros.h
	-@@ -325,7 +325,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
	+@@ -337,7 +337,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
	IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
	IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
	IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
	Index: www/iridium/files/patch-content_public_common_content__features.cc
	===================================================================
	--- www/iridium/files/patch-content_public_common_content__features.cc
	+++ www/iridium/files/patch-content_public_common_content__features.cc
	@@ -1,11 +1,29 @@
	---- content/public/common/content_features.cc.orig 2019-04-05 00:49:17 UTC
	+--- content/public/common/content_features.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/public/common/content_features.cc
	-@@ -493,7 +493,7 @@ const base::Feature kWebAssemblyThreads{"WebAssemblyTh
	- base::FEATURE_DISABLED_BY_DEFAULT};
	+@@ -47,7 +47,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
	+ const base::Feature kAudioServiceOutOfProcess{
	+ "AudioServiceOutOfProcess",
	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| \
	+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ base::FEATURE_ENABLED_BY_DEFAULT
	+ #else
	+ base::FEATURE_DISABLED_BY_DEFAULT
	+@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads {
	+ };

	// Enable WebAssembly trap handler.
	--#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && defined(ARCH_CPU_X86_64)
	+-#if (defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)) && \
	++#if (defined(OS_BSD) \|\| defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_MACOSX)) && \
	+ defined(ARCH_CPU_X86_64)
	const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
	base::FEATURE_ENABLED_BY_DEFAULT};
	+@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
	+ // https://w3c.github.io/webauthn
	+ const base::Feature kWebAuthCable {
	+ "WebAuthenticationCable",
	+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX)
	++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) \|\| defined(OS_BSD)
	+ base::FEATURE_DISABLED_BY_DEFAULT
	#else
	+ base::FEATURE_ENABLED_BY_DEFAULT
	Index: www/iridium/files/patch-content_public_common_content__switches.h
	===================================================================
	--- www/iridium/files/patch-content_public_common_content__switches.h
	+++ www/iridium/files/patch-content_public_common_content__switches.h
	@@ -1,7 +1,7 @@
	---- content/public/common/content_switches.h.orig 2019-03-11 22:00:58 UTC
	+--- content/public/common/content_switches.h.orig 2019-10-21 19:06:32 UTC
	+++ content/public/common/content_switches.h
	-@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
	- CONTENT_EXPORT extern const char kDisablePanelFitting[];
	+@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke
	+ CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[];
	#endif

	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-content_public_common_content__switches.cc
	===================================================================
	--- www/iridium/files/patch-content_public_common_content__switches.cc
	+++ www/iridium/files/patch-content_public_common_content__switches.cc
	@@ -1,8 +1,8 @@
	---- content/public/common/content_switches.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/public/common/content_switches.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/public/common/content_switches.cc
	-@@ -968,7 +968,7 @@ const char kDisableAudioSupportForDesktopShare[] =
	- const char kDisablePanelFitting[] = "disable-panel-fitting";
	- #endif
	+@@ -980,7 +980,7 @@ const char kEnableAggressiveDOMStorageFlushing[] =
	+ // Enable indication that browser is controlled by automation.
	+ const char kEnableAutomation[] = "enable-automation";

	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_FREEBSD)
	Index: www/iridium/files/patch-content_public_common_renderer__preferences.h
	===================================================================
	--- www/iridium/files/patch-content_public_common_renderer__preferences.h
	+++ www/iridium/files/patch-content_public_common_renderer__preferences.h
	@@ -1,11 +0,0 @@
	---- content/public/common/renderer_preferences.h.orig 2019-03-11 22:00:58 UTC
	-+++ content/public/common/renderer_preferences.h
	-@@ -120,7 +120,7 @@ struct CONTENT_EXPORT RendererPreferences {
	- // Country iso of the mobile network for content detection purpose.
	- std::string network_contry_iso;
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- std::string system_font_family_name;
	- #endif
	-
	Index: www/iridium/files/patch-content_public_test_browser__test__base.cc
	===================================================================
	--- www/iridium/files/patch-content_public_test_browser__test__base.cc
	+++ www/iridium/files/patch-content_public_test_browser__test__base.cc
	@@ -1,6 +1,6 @@
	---- content/public/test/browser_test_base.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/public/test/browser_test_base.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/public/test/browser_test_base.cc
	-@@ -62,6 +62,10 @@
	+@@ -96,6 +96,10 @@
	#include "ui/views/test/event_generator_delegate_mac.h"
	#endif

	Index: www/iridium/files/patch-content_public_test_mock__render__thread.cc
	===================================================================
	--- www/iridium/files/patch-content_public_test_mock__render__thread.cc
	+++ www/iridium/files/patch-content_public_test_mock__render__thread.cc
	@@ -1,6 +1,6 @@
	---- content/public/test/mock_render_thread.cc.orig 2019-03-17 17:24:56 UTC
	+--- content/public/test/mock_render_thread.cc.orig 2019-04-30 22:22:47 UTC
	+++ content/public/test/mock_render_thread.cc
	-@@ -69,7 +69,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
	+@@ -74,7 +74,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
	std::move(callback).Run(false);
	}

	Index: www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc
	+++ www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc
	@@ -1,11 +1,11 @@
	---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-06-04 18:55:23 UTC
	+++ content/renderer/media/audio/audio_device_factory.cc
	-@@ -33,7 +33,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
	-
	+@@ -35,7 +35,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
	namespace {

	--#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)
	// Due to driver deadlock issues on Windows (http://crbug/422522) there is a
	// chance device authorization response is never received from the browser side.
	+ // In this case we will time out, to avoid renderer hang forever waiting for
	Index: www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
	+++ www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
	@@ -1,20 +0,0 @@
	---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-03-11 22:00:58 UTC
	-+++ content/renderer/media/stream/processed_local_audio_source.cc
	-@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier =
	- const_cast<void**>(&kProcessedLocalAudioSourceIdentifier);
	-
	- bool ApmInAudioServiceEnabled() {
	--#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	-+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
	- #else
	- return false;
	-@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
	- bool key_pressed) {
	- #if defined(OS_WIN) \|\| defined(OS_MACOSX)
	- DCHECK_LE(volume, 1.0);
	--#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_OPENBSD)
	-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- // We have a special situation on Linux where the microphone volume can be
	- // "higher than maximum". The input volume slider in the sound preference
	- // allows the user to set a scaling that is higher than 100%. It means that
	Index: www/iridium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
	+++ www/iridium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
	@@ -1,6 +1,6 @@
	---- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-03-17 17:29:28 UTC
	+--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-10-21 19:06:32 UTC
	+++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc
	-@@ -203,7 +203,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
	+@@ -244,7 +244,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
	TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) {
	SetupRenderer(kDefaultOutputDeviceId);
	renderer_proxy_->Start();
	Index: www/iridium/files/patch-content_renderer_render__process__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_render__process__impl.cc
	+++ www/iridium/files/patch-content_renderer_render__process__impl.cc
	@@ -0,0 +1,20 @@
	+--- content/renderer/render_process_impl.cc.orig 2019-10-21 19:06:33 UTC
	++++ content/renderer/render_process_impl.cc
	+@@ -43,7 +43,7 @@
	+ #if defined(OS_WIN)
	+ #include "base/win/win_util.h"
	+ #endif
	+-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
	+ #include "v8/include/v8-wasm-trap-handler-posix.h"
	+ #endif
	+ namespace {
	+@@ -158,7 +158,7 @@ RenderProcessImpl::RenderProcessImpl()
	+
	+ SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler,
	+ "--no-wasm-trap-handler");
	+-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
	+ if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) {
	+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
	+ if (!command_line->HasSwitch(
	Index: www/iridium/files/patch-content_renderer_render__thread__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_render__thread__impl.cc
	+++ www/iridium/files/patch-content_renderer_render__thread__impl.cc
	@@ -1,6 +1,6 @@
	---- content/renderer/render_thread_impl.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/renderer/render_thread_impl.cc.orig 2019-10-21 19:06:33 UTC
	+++ content/renderer/render_thread_impl.cc
	-@@ -191,12 +191,21 @@
	+@@ -185,12 +185,21 @@
	#include "mojo/public/cpp/bindings/message_dumper.h"
	#endif

	@@ -22,7 +22,7 @@
	using base::ThreadRestrictions;
	using blink::WebDocument;
	using blink::WebFrame;
	-@@ -926,7 +935,7 @@ void RenderThreadImpl::Init() {
	+@@ -901,7 +910,7 @@ void RenderThreadImpl::Init() {
	DCHECK(parsed_num_raster_threads) << string_value;
	DCHECK_GT(num_raster_threads, 0);

	@@ -31,21 +31,16 @@
	categorized_worker_pool_->SetBackgroundingCallback(
	main_thread_scheduler_->DefaultTaskRunner(),
	base::BindOnce(
	-@@ -967,7 +976,7 @@ void RenderThreadImpl::Init() {
	- GetConnector()->BindInterface(mojom::kBrowserServiceName,
	- mojo::MakeRequest(&storage_partition_service_));
	+@@ -930,7 +939,7 @@ void RenderThreadImpl::Init() {
	+ base::DiscardableMemoryAllocator::SetInstance(
	+ discardable_shared_memory_manager_.get());

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- render_message_filter()->SetThreadPriority(
	- ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
	- #endif
	-@@ -1337,11 +1346,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
	- gpu::kGpuFeatureStatusEnabled);
	- const bool enable_gpu_memory_buffers =
	- !is_gpu_compositing_disabled_ &&
	--#if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_WIN)
	-+#if defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	+ if (base::FeatureList::IsEnabled(
	+ blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
	+ render_message_filter()->SetThreadPriority(
	+@@ -1309,7 +1318,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
	!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
	#else
	cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
	Index: www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
	===================================================================
	--- www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
	+++ www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
	@@ -1,16 +1,16 @@
	---- content/renderer/renderer_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC
	+--- content/renderer/renderer_blink_platform_impl.h.orig 2019-10-21 19:06:33 UTC
	+++ content/renderer/renderer_blink_platform_impl.h
	-@@ -29,7 +29,7 @@
	+@@ -30,7 +30,7 @@
	+ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
	#include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
	- #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h"

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	#include "components/services/font/public/cpp/font_loader.h" // nogncheck
	#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
	#endif
	-@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
	- std::unique_ptr<service_manager::Connector> connector_;
	+@@ -225,7 +225,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
	+
	scoped_refptr<base::SingleThreadTaskRunner> io_runner_;

	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	@@ -18,9 +18,9 @@
	std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
	#endif

	-@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
	- blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
	- scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
	+@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
	+ std::unique_ptr<blink::WebTransmissionEncodingInfoHandler>
	+ web_transmission_encoding_info_handler_;

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
	+++ www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
	@@ -1,6 +1,6 @@
	---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-10-21 19:06:33 UTC
	+++ content/renderer/renderer_blink_platform_impl.cc
	-@@ -109,7 +109,7 @@
	+@@ -102,7 +102,7 @@

	#if defined(OS_MACOSX)
	#include "content/child/child_process_sandbox_support_impl_mac.h"
	@@ -9,25 +9,25 @@
	#include "content/child/child_process_sandbox_support_impl_linux.h"
	#endif

	-@@ -202,7 +202,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
	- ->Clone();
	+@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
	+ if (RenderThreadImpl::current()) {
	+ io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
	thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
	- blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
	- SkFontConfigInterface::SetGlobal(font_loader_);
	+ mojo::PendingRemote<font_service::mojom::FontService> font_service;
	+ RenderThreadImpl::current()->BindHostReceiver(
	+ font_service.InitWithNewPipeAndPassReceiver());
	+@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
	#endif
	-@@ -211,7 +211,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
	- connector_ = service_manager::Connector::Create(&request);
	}

	-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	+#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	- if (g_sandbox_enabled && sandboxEnabled()) {
	+ if (sandboxEnabled()) {
	#if defined(OS_MACOSX)
	- sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
	-@@ -239,7 +239,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
	+ std::unique_ptr<service_manager::Connector> sandbox_connector;
	+@@ -224,7 +224,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
	}

	void RendererBlinkPlatformImpl::Shutdown() {
	@@ -36,7 +36,7 @@
	// SandboxSupport contains a map of OutOfProcessFont objects, which hold
	// WebStrings and WebVectors, which become invalidated when blink is shut
	// down. Hence, we need to clear that map now, just before blink::shutdown()
	-@@ -320,7 +320,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
	+@@ -289,7 +289,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto

	void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
	base::PlatformThreadId thread_id) {
	@@ -45,7 +45,7 @@
	if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
	render_thread->render_message_filter()->SetThreadPriority(
	thread_id, base::ThreadPriority::DISPLAY);
	-@@ -333,7 +333,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
	+@@ -302,7 +302,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
	}

	blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
	Index: www/iridium/files/patch-content_shell_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-content_shell_BUILD.gn
	+++ www/iridium/files/patch-content_shell_BUILD.gn
	@@ -1,11 +1,11 @@
	---- content/shell/BUILD.gn.orig 2019-04-05 00:49:17 UTC
	+--- content/shell/BUILD.gn.orig 2019-10-21 19:06:33 UTC
	+++ content/shell/BUILD.gn
	-@@ -942,7 +942,7 @@ group("content_shell_crash_test") {
	+@@ -962,7 +962,7 @@ group("content_shell_crash_test") {
	if (is_win) {
	data_deps += [ "//build/win:copy_cdb_to_output" ]
	}
	-- if (is_posix && !is_android) {
	-+ if (is_posix && !is_android && !is_bsd) {
	+- if (is_posix) {
	++ if (is_posix && !is_bsd) {
	data_deps += [
	- "//third_party/breakpad:dump_syms($host_toolchain)",
	- "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
	+ "//third_party/breakpad:dump_syms",
	+ "//third_party/breakpad:minidump_stackwalk",
	Index: www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
	+++ www/iridium/files/patch-content_shell_app_shell__main__delegate.cc
	@@ -0,0 +1,20 @@
	+--- content/shell/app/shell_main_delegate.cc.orig 2019-10-21 19:06:33 UTC
	++++ content/shell/app/shell_main_delegate.cc
	+@@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit
	+
	+ v8_crashpad_support::SetUp();
	+ #endif
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
	+ #endif
	+ #if defined(OS_MACOSX)
	+@@ -317,7 +317,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit
	+ }
	+
	+ void ShellMainDelegate::PreSandboxStartup() {
	+-#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;
	Index: www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
	+++ www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
	@@ -1,6 +1,6 @@
	---- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/shell/browser/shell_browser_context.cc.orig 2019-10-21 19:06:33 UTC
	+++ content/shell/browser/shell_browser_context.cc
	-@@ -28,7 +28,7 @@
	+@@ -32,7 +32,7 @@

	#if defined(OS_WIN)
	#include "base/base_paths_win.h"
	@@ -9,7 +9,7 @@
	#include "base/nix/xdg_util.h"
	#elif defined(OS_MACOSX)
	#include "base/base_paths_mac.h"
	-@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
	+@@ -107,7 +107,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
	#if defined(OS_WIN)
	CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
	path_ = path_.Append(std::wstring(L"content_shell"));
	Index: www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
	+++ www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
	@@ -1,15 +1,15 @@
	---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC
	+++ content/shell/browser/shell_browser_main_parts.cc
	-@@ -48,7 +48,7 @@
	+@@ -47,7 +47,7 @@
	#if defined(USE_AURA) && defined(USE_X11)
	#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
	#endif
	-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
	-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) \|\| defined(OS_LINUX))
	- #include "ui/base/ime/input_method_initializer.h"
	++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ #include "ui/base/ime/init/input_method_initializer.h"
	#endif
	#if defined(OS_CHROMEOS)
	-@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
	+@@ -125,7 +125,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
	#if defined(USE_X11)
	ui::SetDefaultX11ErrorHandlers();
	#endif
	Index: www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
	+++ www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc
	@@ -0,0 +1,11 @@
	+--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2019-10-21 19:06:33 UTC
	++++ content/shell/browser/web_test/web_test_browser_context.cc
	+@@ -26,7 +26,7 @@
	+
	+ #if defined(OS_WIN)
	+ #include "base/base_paths_win.h"
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "base/nix/xdg_util.h"
	+ #elif defined(OS_MACOSX)
	+ #include "base/base_paths_mac.h"
	Index: www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
	+++ www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc
	@@ -0,0 +1,11 @@
	+--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC
	++++ content/shell/browser/web_test/web_test_browser_main_parts.cc
	+@@ -36,7 +36,7 @@
	+ #if defined(USE_AURA) && defined(USE_X11)
	+ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
	+ #endif
	+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
	++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ #include "ui/base/ime/init/input_method_initializer.h"
	+ #endif
	+
	Index: www/iridium/files/patch-content_shell_test__runner_test__runner.cc
	===================================================================
	--- www/iridium/files/patch-content_shell_test__runner_test__runner.cc
	+++ www/iridium/files/patch-content_shell_test__runner_test__runner.cc
	@@ -1,29 +1,29 @@
	---- content/shell/test_runner/test_runner.cc.orig 2019-03-17 17:19:52 UTC
	+--- content/shell/test_runner/test_runner.cc.orig 2019-10-21 19:06:33 UTC
	+++ content/shell/test_runner/test_runner.cc
	@@ -64,7 +64,7 @@
	#include "ui/gfx/geometry/size.h"
	#include "ui/gfx/skia_util.h"

	--#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	#include "third_party/blink/public/platform/web_font_render_style.h"
	#endif

	-@@ -1542,7 +1542,7 @@ void TestRunner::Reset() {
	+@@ -1533,7 +1533,7 @@ void TestRunner::Reset() {
	drag_image_.reset();

	blink::WebSecurityPolicy::ClearOriginAccessList();
	--#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	blink::WebFontRenderStyle::SetSubpixelPositioning(false);
	#endif

	-@@ -2091,7 +2091,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
	+@@ -2118,7 +2118,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
	}

	void TestRunner::SetTextSubpixelPositioning(bool value) {
	--#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	// Since FontConfig doesn't provide a variable to control subpixel
	// positioning, we'll fall back to setting it globally for all fonts.
	blink::WebFontRenderStyle::SetSubpixelPositioning(value);
	Index: www/iridium/files/patch-content_test_content__test__suite.cc
	===================================================================
	--- www/iridium/files/patch-content_test_content__test__suite.cc
	+++ www/iridium/files/patch-content_test_content__test__suite.cc
	@@ -1,6 +1,6 @@
	---- content/test/content_test_suite.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/test/content_test_suite.cc.orig 2019-04-30 22:22:48 UTC
	+++ content/test/content_test_suite.cc
	-@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() {
	+@@ -81,6 +81,7 @@ void ContentTestSuite::Initialize() {
	// to initialize GL, so don't do it here.
	base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
	bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess);
	@@ -8,7 +8,7 @@
	if (!is_child_process) {
	gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff();
	auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo();
	-@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() {
	+@@ -88,6 +89,7 @@ void ContentTestSuite::Initialize() {
	gpu_feature_info->disabled_extensions);
	gl::init::InitializeExtensionSettingsOneOffPlatform();
	}
	Index: www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
	===================================================================
	--- www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
	+++ www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
	@@ -1,6 +1,6 @@
	---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-03-11 22:00:58 UTC
	+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-10-21 19:06:33 UTC
	+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
	-@@ -8,7 +8,7 @@
	+@@ -9,7 +9,7 @@

	#if defined(OS_MACOSX)
	#include "content/child/child_process_sandbox_support_impl_mac.h"
	@@ -9,16 +9,16 @@
	#include "content/child/child_process_sandbox_support_impl_linux.h"
	#endif

	-@@ -17,7 +17,7 @@ namespace content {
	+@@ -18,7 +18,7 @@ namespace content {
	UtilityBlinkPlatformWithSandboxSupportImpl::
	UtilityBlinkPlatformWithSandboxSupportImpl(
	service_manager::Connector* connector) {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
	- SkFontConfigInterface::SetGlobal(font_loader_);
	- sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_);
	-@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
	+ mojo::PendingRemote<font_service::mojom::FontService> font_service;
	+ UtilityThread::Get()->BindHostReceiver(
	+ font_service.InitWithNewPipeAndPassReceiver());
	+@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::

	blink::WebSandboxSupport*
	UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
	Index: www/iridium/files/patch-device_bluetooth_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-device_bluetooth_BUILD.gn
	+++ www/iridium/files/patch-device_bluetooth_BUILD.gn
	@@ -1,4 +1,4 @@
	---- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC
	+--- device/bluetooth/BUILD.gn.orig 2019-09-09 21:55:17 UTC
	+++ device/bluetooth/BUILD.gn
	@@ -277,7 +277,7 @@ component("bluetooth") {
	]
	Index: www/iridium/files/patch-device_gamepad_gamepad__provider.cc
	===================================================================
	--- www/iridium/files/patch-device_gamepad_gamepad__provider.cc
	+++ www/iridium/files/patch-device_gamepad_gamepad__provider.cc
	@@ -1,11 +1,11 @@
	---- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC
	+--- device/gamepad/gamepad_provider.cc.orig 2019-10-21 19:06:34 UTC
	+++ device/gamepad/gamepad_provider.cc
	-@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
	- monitor->AddDevicesChangedObserver(this);
	+@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep

	- polling_thread_.reset(new base::Thread("Gamepad polling thread"));
	+ if (!polling_thread_)
	+ polling_thread_.reset(new base::Thread("Gamepad polling thread"));
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// On Linux, the data fetcher needs to watch file descriptors, so the message
	// loop needs to be a libevent loop.
	- const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO;
	+ const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO;
	Index: www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
	===================================================================
	--- www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
	+++ www/iridium/files/patch-device_gamepad_hid__writer__linux.cc
	@@ -0,0 +1,11 @@
	+--- device/gamepad/hid_writer_linux.cc.orig 2019-10-31 07:37:06 UTC
	++++ device/gamepad/hid_writer_linux.cc
	+@@ -4,6 +4,8 @@
	+
	+ #include "device/gamepad/hid_writer_linux.h"
	+
	++#include <unistd.h>
	++
	+ #include "base/posix/eintr_wrapper.h"
	+
	+ namespace device {
	Index: www/iridium/files/patch-device_usb_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-device_usb_BUILD.gn
	+++ www/iridium/files/patch-device_usb_BUILD.gn
	@@ -1,21 +0,0 @@
	---- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC
	-+++ device/usb/BUILD.gn
	-@@ -112,10 +112,17 @@ static_library("usb") {
	- ]
	- }
	-
	-- if (is_android \|\| is_chromeos \|\| is_linux) {
	-+ if (is_android \|\| is_chromeos \|\| (is_linux && !is_bsd)) {
	- sources += [
	- "usb_device_handle_usbfs.cc",
	- "usb_device_handle_usbfs.h",
	-+ ]
	-+ }
	-+
	-+ if (is_bsd) {
	-+ sources -= [
	-+ "usb_device_linux.cc",
	-+ "usb_device_linux.h",
	- ]
	- }
	-
	Index: www/iridium/files/patch-device_usb_usb__context.cc
	===================================================================
	--- www/iridium/files/patch-device_usb_usb__context.cc
	+++ www/iridium/files/patch-device_usb_usb__context.cc
	@@ -1,12 +0,0 @@
	---- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC
	-+++ device/usb/usb_context.cc
	-@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() {
	-
	- void UsbContext::UsbEventHandler::Stop() {
	- base::subtle::Release_Store(&running_, 0);
	-+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version
	- libusb_interrupt_handle_event(context_);
	-+#endif
	- }
	-
	- UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
	Index: www/iridium/files/patch-device_usb_usb__error.cc
	===================================================================
	--- www/iridium/files/patch-device_usb_usb__error.cc
	+++ www/iridium/files/patch-device_usb_usb__error.cc
	@@ -1,11 +0,0 @@
	---- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC
	-+++ device/usb/usb_error.cc
	-@@ -9,7 +9,7 @@
	- namespace device {
	-
	- std::string ConvertPlatformUsbErrorToString(int errcode) {
	-- return libusb_strerror(static_cast<libusb_error>(errcode));
	-+ return "";
	- }
	-
	- } // namespace device
	Index: www/iridium/files/patch-device_usb_usb__service__impl.h
	===================================================================
	--- www/iridium/files/patch-device_usb_usb__service__impl.h
	+++ www/iridium/files/patch-device_usb_usb__service__impl.h
	@@ -1,26 +0,0 @@
	---- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC
	-+++ device/usb/usb_service_impl.h
	-@@ -73,11 +73,13 @@ class UsbServiceImpl :
	- scoped_refptr<UsbDeviceImpl> device);
	- void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
	-
	-+#if !defined(OS_FREEBSD)
	- // Handle hotplug events from libusb.
	- static int LIBUSB_CALL HotplugCallback(libusb_context* context,
	- libusb_device* device,
	- libusb_hotplug_event event,
	- void* user_data);
	-+#endif
	- // These functions release a reference to the provided platform device.
	- void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device);
	- void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device);
	-@@ -97,7 +99,9 @@ class UsbServiceImpl :
	- // connected instead of only when a full enumeration is requested.
	- // TODO(reillyg): Support this on all platforms. crbug.com/411715
	- bool hotplug_enabled_ = false;
	-+#if !defined(OS_FREEBSD)
	- libusb_hotplug_callback_handle hotplug_handle_;
	-+#endif
	-
	- // Enumeration callbacks are queued until an enumeration completes.
	- bool enumeration_ready_ = false;
	Index: www/iridium/files/patch-device_usb_usb__service__impl.cc
	===================================================================
	--- www/iridium/files/patch-device_usb_usb__service__impl.cc
	+++ www/iridium/files/patch-device_usb_usb__service__impl.cc
	@@ -1,45 +0,0 @@
	---- device/usb/usb_service_impl.cc.orig 2019-03-11 22:00:58 UTC
	-+++ device/usb/usb_service_impl.cc
	-@@ -231,8 +231,10 @@ UsbServiceImpl::UsbServiceImpl()
	- }
	-
	- UsbServiceImpl::~UsbServiceImpl() {
	-+#if !defined(OS_FREEBSD)
	- if (hotplug_enabled_)
	- libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
	-+#endif // !defined(OS_FREEBSD)
	- }
	-
	- void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) {
	-@@ -287,6 +289,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
	-
	- context_ = std::move(context);
	-
	-+#if !defined(OS_FREEBSD)
	- int rv = libusb_hotplug_register_callback(
	- context_->context(),
	- static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED \|
	-@@ -299,6 +302,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
	-
	- // This will call any enumeration callbacks queued while initializing.
	- RefreshDevices();
	-+#endif // !defined(OS_FREEBSD)
	-
	- #if defined(OS_WIN)
	- DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
	-@@ -495,6 +499,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
	- device->OnDisconnect();
	- }
	-
	-+#if !defined(OS_FREEBSD)
	- // static
	- int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
	- libusb_device* device_raw,
	-@@ -528,6 +533,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
	-
	- return 0;
	- }
	-+#endif // !defined(OS_FREEBSD)
	-
	- void UsbServiceImpl::OnPlatformDeviceAdded(
	- ScopedLibusbDeviceRef platform_device) {
	Index: www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
	===================================================================
	--- www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
	+++ www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
	@@ -1,6 +1,6 @@
	---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-10-21 19:06:34 UTC
	+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
	-@@ -28,7 +28,11 @@
	+@@ -27,7 +27,11 @@
	#include "extensions/common/extension.h"
	#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
	#include "net/http/http_util.h"
	@@ -10,5 +10,5 @@
	#include "third_party/re2/src/re2/re2.h"
	+#endif

	- using content::ResourceRequestInfo;
	using extension_web_request_api_helpers::EventResponseDelta;
	+
	Index: www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
	===================================================================
	--- www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
	+++ www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc
	@@ -1,6 +1,6 @@
	---- extensions/browser/api/messaging/message_service.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/browser/api/messaging/message_service.cc.orig 2019-09-09 21:55:17 UTC
	+++ extensions/browser/api/messaging/message_service.cc
	-@@ -58,7 +58,7 @@ namespace {
	+@@ -61,7 +61,7 @@ namespace {

	const char kReceivingEndDoesntExistError[] =
	"Could not establish connection. Receiving end does not exist.";
	@@ -9,16 +9,16 @@
	const char kMissingPermissionError[] =
	"Access to native messaging requires nativeMessaging permission.";
	const char kProhibitedByPoliciesError[] =
	-@@ -318,7 +318,7 @@ void MessageService::OpenChannelToNativeApp(
	- if (!source)
	+@@ -382,7 +382,7 @@ void MessageService::OpenChannelToNativeApp(
	+ if (!opener_port->IsValidPort())
	return;

	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- content::WebContents* web_contents =
	- content::WebContents::FromRenderFrameHost(source);
	- ExtensionWebContentsObserver* extension_web_contents_observer =
	-@@ -378,12 +378,12 @@ void MessageService::OpenChannelToNativeApp(
	+ bool has_permission = extension->permissions_data()->HasAPIPermission(
	+ APIPermission::kNativeMessaging);
	+ if (!has_permission) {
	+@@ -432,11 +432,11 @@ void MessageService::OpenChannelToNativeApp(
	channel->opener->IncrementLazyKeepaliveCount();

	AddChannel(std::move(channel), receiver_port_id);
	@@ -26,10 +26,9 @@
	+#else // !(defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD))
	const char kNativeMessagingNotSupportedError[] =
	"Native Messaging is not supported on this platform.";
	- DispatchOnDisconnect(
	- source, receiver_port_id, kNativeMessagingNotSupportedError);
	+ opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError);
	-#endif // !(defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX))
	+#endif // !(defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD))
	}

	- void MessageService::OpenChannelToTab(int source_process_id,
	+ void MessageService::OpenChannelToTab(const ChannelEndpoint& source,
	Index: www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
	===================================================================
	--- www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
	+++ www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
	@@ -1,6 +1,6 @@
	---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-04-30 22:22:49 UTC
	+++ extensions/browser/browser_context_keyed_service_factories.cc
	-@@ -85,7 +85,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
	+@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
	#if defined(OS_CHROMEOS)
	NetworkingConfigServiceFactory::GetInstance();
	#endif
	Index: www/iridium/files/patch-extensions_common_api___permission__features.json
	===================================================================
	--- www/iridium/files/patch-extensions_common_api___permission__features.json
	+++ www/iridium/files/patch-extensions_common_api___permission__features.json
	@@ -1,4 +1,4 @@
	---- extensions/common/api/_permission_features.json.orig 2019-03-11 22:00:58 UTC
	+--- extensions/common/api/_permission_features.json.orig 2019-10-21 19:06:34 UTC
	+++ extensions/common/api/_permission_features.json
	@@ -135,7 +135,7 @@
	{
	@@ -9,7 +9,7 @@
	"whitelist": [
	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
	"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
	-@@ -470,7 +470,7 @@
	+@@ -461,7 +461,7 @@
	}, {
	"channel": "stable",
	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
	@@ -18,7 +18,7 @@
	"whitelist": [
	"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
	"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
	-@@ -501,7 +501,7 @@
	+@@ -492,7 +492,7 @@
	"networkingPrivate": {
	"channel": "stable",
	"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
	Index: www/iridium/files/patch-extensions_common_api_runtime.json
	===================================================================
	--- www/iridium/files/patch-extensions_common_api_runtime.json
	+++ www/iridium/files/patch-extensions_common_api_runtime.json
	@@ -1,6 +1,6 @@
	---- extensions/common/api/runtime.json.orig 2019-03-11 22:00:58 UTC
	+--- extensions/common/api/runtime.json.orig 2019-04-30 22:22:49 UTC
	+++ extensions/common/api/runtime.json
	-@@ -66,7 +66,7 @@
	+@@ -67,7 +67,7 @@
	"id": "PlatformOs",
	"type": "string",
	"description": "The operating system chrome is running on.",
	Index: www/iridium/files/patch-extensions_common_feature__switch.cc
	===================================================================
	--- www/iridium/files/patch-extensions_common_feature__switch.cc
	+++ www/iridium/files/patch-extensions_common_feature__switch.cc
	@@ -1,14 +1,16 @@
	---- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/common/feature_switch.cc.orig 2019-10-21 19:06:34 UTC
	+++ extensions/common/feature_switch.cc
	-@@ -44,11 +44,7 @@ class CommonSwitches {
	+@@ -42,11 +42,11 @@ class CommonSwitches {
	FeatureSwitch::DEFAULT_ENABLED),
	load_media_router_component_extension(
	kLoadMediaRouterComponentExtensionFlag,
	--#if defined(GOOGLE_CHROME_BUILD)
	+-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
	++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) \|\| defined(OS_BSD)
	FeatureSwitch::DEFAULT_ENABLED)
	--#else
	-- FeatureSwitch::DEFAULT_DISABLED)
	--#endif // defined(GOOGLE_CHROME_BUILD)
	+ #else
	+ FeatureSwitch::DEFAULT_DISABLED)
	+-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
	++#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) \|\| defined(OS_BSD)
	{
	}

	Index: www/iridium/files/patch-extensions_common_features_feature.cc
	===================================================================
	--- www/iridium/files/patch-extensions_common_features_feature.cc
	+++ www/iridium/files/patch-extensions_common_features_feature.cc
	@@ -1,11 +1,11 @@
	---- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC
	+++ extensions/common/features/feature.cc
	-@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() {
	+@@ -20,7 +20,7 @@ namespace extensions {
	+ Feature::Platform Feature::GetCurrentPlatform() {
	+ #if defined(OS_CHROMEOS)
	+ return CHROMEOS_PLATFORM;
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ return LINUX_PLATFORM;
	+ #elif defined(OS_MACOSX)
	return MACOSX_PLATFORM;
	- #elif defined(OS_WIN)
	- return WIN_PLATFORM;
	-+#elif defined(OS_BSD)
	-+ return LINUX_PLATFORM;
	- #else
	- return UNSPECIFIED_PLATFORM;
	- #endif
	Index: www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
	===================================================================
	--- www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
	+++ www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc
	@@ -1,4 +1,4 @@
	---- extensions/shell/app/shell_main_delegate.cc.orig 2019-03-11 22:00:58 UTC
	+--- extensions/shell/app/shell_main_delegate.cc.orig 2019-09-09 21:55:17 UTC
	+++ extensions/shell/app/shell_main_delegate.cc
	@@ -38,7 +38,7 @@

	@@ -9,15 +9,6 @@
	#include "base/nix/xdg_util.h"
	#elif defined(OS_MACOSX)
	#include "base/base_paths_mac.h"
	-@@ -52,7 +52,7 @@
	-
	- namespace {
	-
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	- extensions::ShellCrashReporterClient* GetCrashReporterClient() {
	- static base::NoDestructor<extensions::ShellCrashReporterClient> instance;
	- return instance.get();
	@@ -70,7 +70,7 @@ base::FilePath GetDataPath() {
	return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);

	Index: www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
	===================================================================
	--- www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
	+++ www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
	@@ -0,0 +1,11 @@
	+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2019-09-16 09:48:37 UTC
	++++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
	+@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
	+ bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
	+ #if defined(OS_CHROMEOS)
	+ info->os = api::runtime::PLATFORM_OS_CROS;
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ info->os = api::runtime::PLATFORM_OS_LINUX;
	+ #endif
	+ return true;
	Index: www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
	===================================================================
	--- www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
	+++ www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
	@@ -0,0 +1,19 @@
	+--- extensions/shell/browser/shell_extensions_api_client.h.orig 2019-09-09 21:55:17 UTC
	++++ extensions/shell/browser/shell_extensions_api_client.h
	+@@ -32,14 +32,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
	+ content::BrowserContext* browser_context) const override;
	+ std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider()
	+ const override;
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ FileSystemDelegate* GetFileSystemDelegate() override;
	+ #endif
	+ MessagingDelegate* GetMessagingDelegate() override;
	+ FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override;
	+
	+ private:
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ std::unique_ptr<FileSystemDelegate> file_system_delegate_;
	+ #endif
	+ std::unique_ptr<MessagingDelegate> messaging_delegate_;
	Index: www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
	===================================================================
	--- www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
	+++ www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
	@@ -0,0 +1,20 @@
	+--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2019-09-09 21:55:17 UTC
	++++ extensions/shell/browser/shell_extensions_api_client.cc
	+@@ -16,7 +16,7 @@
	+ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h"
	+ #include "extensions/shell/browser/shell_web_view_guest_delegate.h"
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h"
	+ #endif
	+
	+@@ -52,7 +52,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider()
	+ return std::make_unique<ShellDisplayInfoProvider>();
	+ }
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() {
	+ if (!file_system_delegate_)
	+ file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>();
	Index: www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
	===================================================================
	--- www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
	+++ www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
	@@ -0,0 +1,53 @@
	+--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-10-21 19:06:34 UTC
	++++ google_apis/gcm/engine/heartbeat_manager.cc
	+@@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
	+ // Minimum time spent sleeping before we force a new heartbeat.
	+ const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // The period at which to check if the heartbeat time has passed. Used to
	+ // protect against platforms where the timer is delayed by the system being
	+ // suspended. Only needed on linux because the other OSes provide a standard
	+ // way to be notified of system suspend and resume events.
	+ const int kHeartbeatMissedCheckMs = 1000 * 60 * 5; // 5 minutes.
	+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+
	+ } // namespace
	+
	+@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() {
	+ base::Bind(&HeartbeatManager::OnHeartbeatTriggered,
	+ weak_ptr_factory_.GetWeakPtr()));
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
	+ // when the system is suspending or resuming. The only one that does not is
	+ // Linux so we need to poll to check for missed heartbeats.
	+@@ -200,7 +200,7 @@ void HeartbeatManager::RestartTimer() {
	+ base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
	+ weak_ptr_factory_.GetWeakPtr()),
	+ base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
	+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ }
	+
	+ void HeartbeatManager::CheckForMissedHeartbeat() {
	+@@ -216,14 +216,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
	+ return;
	+ }
	+
	+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // Otherwise check again later.
	+ io_task_runner_->PostDelayedTask(
	+ FROM_HERE,
	+ base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat,
	+ weak_ptr_factory_.GetWeakPtr()),
	+ base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs));
	+-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ }
	+
	+ void HeartbeatManager::UpdateHeartbeatInterval() {
	Index: www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
	+++ www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
	@@ -1,11 +1,11 @@
	---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-10-21 19:06:34 UTC
	+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
	-@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
	+@@ -88,7 +88,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
	uint32_t GetPlatformSpecificTextureTarget() {
	#if defined(OS_MACOSX)
	return GL_TEXTURE_RECTANGLE_ARB;
	-#elif defined(OS_ANDROID) \|\| defined(OS_LINUX)
	+#elif defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	return GL_TEXTURE_EXTERNAL_OES;
	- #elif defined(OS_WIN)
	+ #elif defined(OS_WIN) \|\| defined(OS_FUCHSIA)
	return GL_TEXTURE_2D;
	Index: www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
	+++ www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h
	@@ -0,0 +1,11 @@
	+--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2019-10-21 19:06:34 UTC
	++++ gpu/command_buffer/service/external_vk_image_backing.h
	+@@ -133,7 +133,7 @@ class ExternalVkImageBacking : public SharedImageBacki
	+ base::Optional<DawnTextureFormat> dawn_format,
	+ base::Optional<uint32_t> memory_type_index);
	+
	+-#ifdef OS_LINUX
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Extract file descriptor from image
	+ int GetMemoryFd(const GrVkImageInfo& image_info);
	+ #endif
	Index: www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
	+++ www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
	@@ -0,0 +1,65 @@
	+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-10-21 19:06:34 UTC
	++++ gpu/command_buffer/service/external_vk_image_backing.cc
	+@@ -23,7 +23,7 @@
	+ #include "ui/gl/buildflags.h"
	+ #include "ui/gl/gl_context.h"
	+
	+-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
	+ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
	+ #endif
	+
	+@@ -31,7 +31,7 @@
	+ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
	+ #endif
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
	+ #endif
	+
	+@@ -504,7 +504,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
	+ ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
	+ MemoryTypeTracker* tracker,
	+ DawnDevice dawnDevice) {
	+-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
	+ if (!dawn_format_) {
	+ DLOG(ERROR) << "Format not supported for Dawn";
	+ return nullptr;
	+@@ -527,7 +527,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
	+ return std::make_unique<ExternalVkImageDawnRepresentation>(
	+ manager, this, tracker, dawnDevice, dawn_format_.value(), memory_fd,
	+ image_info.fAlloc.fSize, memory_type_index_.value());
	+-#else // !defined(OS_LINUX) \|\| !BUILDFLAG(USE_DAWN)
	++#else // !defined(OS_LINUX) \|\| !defined(OS_BSD) \|\| !BUILDFLAG(USE_DAWN)
	+ NOTIMPLEMENTED_LOG_ONCE();
	+ return nullptr;
	+ #endif
	+@@ -544,7 +544,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
	+ #if defined(OS_FUCHSIA)
	+ NOTIMPLEMENTED_LOG_ONCE();
	+ return nullptr;
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ GrVkImageInfo image_info;
	+ bool result = backend_texture_.getVkImageInfo(&image_info);
	+ DCHECK(result);
	+@@ -604,7 +604,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
	+ }
	+ return std::make_unique<ExternalVkImageGlRepresentation>(
	+ manager, this, tracker, texture_, texture_->service_id());
	+-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
	++#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
	+ #error Unsupported OS
	+ #endif
	+ }
	+@@ -630,7 +630,7 @@ ExternalVkImageBacking::ProduceSkia(
	+ tracker);
	+ }
	+
	+-#ifdef OS_LINUX
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) {
	+ VkMemoryGetFdInfoKHR get_fd_info;
	+ get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
	Index: www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
	+++ www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc
	@@ -0,0 +1,20 @@
	+--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-09-09 21:55:18 UTC
	++++ gpu/command_buffer/service/external_vk_image_gl_representation.cc
	+@@ -183,7 +183,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
	+ #if defined(OS_FUCHSIA)
	+ NOTIMPLEMENTED_LOG_ONCE();
	+ return 0;
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (handle.vk_handle_type() !=
	+ VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
	+ DLOG(ERROR) << "Importing semaphore handle of unexpected type:"
	+@@ -198,7 +198,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph
	+ fd.release());
	+
	+ return gl_semaphore;
	+-#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX)
	++#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD)
	+ #error Unsupported OS
	+ #endif
	+ }
	Index: www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
	+++ www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
	@@ -1,6 +1,6 @@
	---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-03-17 17:07:44 UTC
	+--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
	-@@ -562,7 +562,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText
	+@@ -638,7 +638,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText

	bool ShouldSkipNorm16() const {
	DCHECK(!ShouldSkipTest());
	Index: www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
	+++ www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
	@@ -1,6 +1,6 @@
	---- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-03-17 17:06:38 UTC
	+--- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-10-21 19:06:35 UTC
	+++ gpu/command_buffer/tests/gl_test_utils.h
	-@@ -112,7 +112,7 @@ class GpuCommandBufferTestEGL {
	+@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL {
	return gfx::HasExtension(gl_extensions_, extension);
	}

	Index: www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
	===================================================================
	--- www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
	+++ www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
	@@ -1,7 +1,7 @@
	---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC
	+--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/command_buffer/tests/gl_test_utils.cc
	-@@ -22,7 +22,7 @@
	- #include "ui/gfx/geometry/size.h"
	+@@ -23,7 +23,7 @@
	+ #include "ui/gl/gl_version_info.h"
	#include "ui/gl/init/gl_factory.h"

	-#if defined(OS_LINUX)
	@@ -9,7 +9,7 @@
	#include "ui/gl/gl_image_native_pixmap.h"
	#endif

	-@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
	+@@ -443,7 +443,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
	window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
	}

	Index: www/iridium/files/patch-gpu_config_gpu__control__list.cc
	===================================================================
	--- www/iridium/files/patch-gpu_config_gpu__control__list.cc
	+++ www/iridium/files/patch-gpu_config_gpu__control__list.cc
	@@ -1,4 +1,4 @@
	---- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/config/gpu_control_list.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/config/gpu_control_list.cc
	@@ -16,7 +16,11 @@
	#include "base/values.h"
	@@ -21,7 +21,7 @@
	return kGLTypeGL;
	#elif defined(OS_MACOSX)
	return kGLTypeGL;
	-@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
	+@@ -707,7 +711,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
	return kOsAndroid;
	#elif defined(OS_FUCHSIA)
	return kOsFuchsia;
	Index: www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
	===================================================================
	--- www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
	+++ www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
	@@ -1,4 +1,4 @@
	---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/ipc/common/gpu_memory_buffer_support.cc
	@@ -12,7 +12,7 @@
	#include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
	@@ -6,10 +6,19 @@

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
	#include "ui/gfx/client_native_pixmap_factory.h"
	#include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
	-@@ -37,7 +37,7 @@ namespace gpu {
	+ #endif
	+@@ -22,7 +22,7 @@
	+ #include "ui/ozone/public/ozone_platform.h"
	+ #endif
	+
	+-#if defined(USE_OZONE) \|\| defined(OS_LINUX)
	++#if defined(USE_OZONE) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
	+ #endif
	+
	+@@ -40,7 +40,7 @@ namespace gpu {
	GpuMemoryBufferSupport::GpuMemoryBufferSupport() {
	#if defined(USE_OZONE)
	client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
	@@ -18,16 +27,16 @@
	client_native_pixmap_factory_.reset(
	gfx::CreateClientNativePixmapFactoryDmabuf());
	#endif
	-@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
	+@@ -54,7 +54,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
	return gfx::IO_SURFACE_BUFFER;
	#elif defined(OS_ANDROID)
	return gfx::ANDROID_HARDWARE_BUFFER;
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#elif defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#elif defined(OS_LINUX) \|\| defined(USE_OZONE) \|\| defined(OS_BSD)
	return gfx::NATIVE_PIXMAP;
	#elif defined(OS_WIN)
	return gfx::DXGI_SHARED_HANDLE;
	-@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
	+@@ -110,7 +110,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
	#elif defined(USE_OZONE)
	return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
	format, usage);
	@@ -40,8 +49,8 @@
	return GpuMemoryBufferImplIOSurface::CreateFromHandle(
	std::move(handle), size, format, usage, std::move(callback));
	#endif
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#if defined(OS_LINUX) \|\| defined(USE_OZONE) \|\| defined(OS_BSD)
	case gfx::NATIVE_PIXMAP:
	return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
	client_native_pixmap_factory(), std::move(handle), size, format,
	Index: www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
	===================================================================
	--- www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
	+++ www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
	@@ -1,15 +1,24 @@
	---- gpu/ipc/service/gpu_init.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/ipc/service/gpu_init.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/ipc/service/gpu_init.cc
	-@@ -87,7 +87,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
	+@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
	+ #endif
	}
	- #endif // defined(OS_WIN)

	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) \|\| defined(OS_BSD)
	bool CanAccessNvidiaDeviceFile() {
	bool res = true;
	- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
	-@@ -129,7 +129,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
	+@@ -120,7 +120,7 @@ bool CanAccessNvidiaDeviceFile() {
	+ }
	+ return res;
	+ }
	+-#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
	++#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) \|\| OS_BSD
	+
	+ class GpuWatchdogInit {
	+ public:
	+@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	// crash during feature collection.
	gpu::SetKeysForCrashLogging(gpu_info_);

	@@ -18,7 +27,7 @@
	if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA
	gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
	return false;
	-@@ -199,7 +199,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	sandbox_helper_->PreSandboxStartup();

	bool attempted_startsandbox = false;
	@@ -27,3 +36,83 @@
	// On Chrome OS ARM Mali, GPU driver userspace creates threads when
	// initializing a GL context, so start the sandbox early.
	// TODO(zmo): Need to collect OS version before this.
	+@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
	+ attempted_startsandbox = true;
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) && !defined(OS_BSD)
	+
	+ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
	+
	+@@ -304,14 +304,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ }
	+ if (gl_initialized && use_swiftshader &&
	+ gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
	+ << "on Linux";
	+ return false;
	+ #else
	+ gl::init::ShutdownGL(true);
	+ gl_initialized = false;
	+-#endif // OS_LINUX
	++#endif // OS_LINUX \|\| OS_BSD
	+ }
	+ if (!gl_initialized)
	+ gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
	+@@ -337,7 +337,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ command_line, gpu_feature_info_,
	+ gpu_preferences_.disable_software_rasterizer, false);
	+ if (use_swiftshader) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
	+ << "on Linux";
	+ return false;
	+@@ -348,7 +348,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ << "failed";
	+ return false;
	+ }
	+-#endif // OS_LINUX
	++#endif // OS_LINUX \|\| OS_BSD
	+ }
	+ }
	+
	+@@ -377,7 +377,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+
	+ InitializePlatformOverlaySettings(&gpu_info_);
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Driver may create a compatibility profile context when collect graphics
	+ // information on Linux platform. Try to collect graphics information
	+ // based on core profile context after disabling platform extensions.
	+@@ -396,7 +396,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
	+ return false;
	+ }
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ if (use_swiftshader) {
	+ AdjustInfoToSwiftShader();
	+@@ -569,7 +569,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
	+
	+ InitializePlatformOverlaySettings(&gpu_info_);
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Driver may create a compatibility profile context when collect graphics
	+ // information on Linux platform. Try to collect graphics information
	+ // based on core profile context after disabling platform extensions.
	+@@ -589,7 +589,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
	+ }
	+ }
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ if (use_swiftshader) {
	+ AdjustInfoToSwiftShader();
	Index: www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
	===================================================================
	--- www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
	+++ www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
	@@ -1,20 +1,20 @@
	---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC
	+++ gpu/ipc/service/gpu_memory_buffer_factory.cc
	@@ -12,7 +12,7 @@
	#include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
	#endif

	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	#include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
	#endif

	-@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() {
	- return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
	+@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType(
	+ return std::make_unique<GpuMemoryBufferFactoryIOSurface>();
	#elif defined(OS_ANDROID)
	- return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer);
	--#elif defined(OS_LINUX)
	-+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	- return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap);
	+ return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>();
	+-#elif defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#elif defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+ return std::make_unique<GpuMemoryBufferFactoryNativePixmap>(
	+ vulkan_context_provider);
	#elif defined(OS_WIN)
	- return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);
	Index: www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
	===================================================================
	--- www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
	+++ www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
	@@ -1,6 +1,6 @@
	---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC
	+--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-10-21 19:06:35 UTC
	+++ gpu/ipc/service/gpu_watchdog_thread.h
	-@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
	+@@ -234,8 +234,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
	XDisplay* display_;
	gfx::AcceleratedWidget window_;
	XAtom atom_;
	@@ -10,4 +10,4 @@
	+#endif
	#endif

	- base::RepeatingClosure alternative_terminate_for_testing_;
	+ base::WeakPtrFactory<GpuWatchdogThreadImplV1> weak_factory_{this};
	Index: www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
	===================================================================
	--- www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
	+++ www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
	@@ -1,6 +1,6 @@
	---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC
	+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-10-21 19:06:35 UTC
	+++ gpu/ipc/service/gpu_watchdog_thread.cc
	-@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000;
	+@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000;
	#endif

	#if defined(USE_X11)
	@@ -11,18 +11,21 @@
	const unsigned char text[20] = "check";
	#endif

	-@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread()
	+@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
	+ ,
	display_(nullptr),
	window_(0),
	- atom_(x11::None),
	+- atom_(x11::None),
	++ atom_(x11::None)
	+#if !defined(OS_BSD)
	- host_tty_(-1),
	++ ,
	+ host_tty_(-1)
	#endif
	+#endif
	- weak_factory_(this) {
	+ {
	base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);

	-@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread()
	+@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
	#endif

	#if defined(USE_X11)
	@@ -32,8 +35,8 @@
	SetupXServer();
	#endif
	base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
	-@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() {
	- power_monitor->RemoveObserver(this);
	+@@ -231,8 +238,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
	+ base::PowerMonitor::RemoveObserver(this);

	#if defined(USE_X11)
	+#if !defined(OS_BSD)
	@@ -43,7 +46,7 @@
	if (display_) {
	DCHECK(window_);
	XDestroyWindow(display_, window_);
	-@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover
	+@@ -432,7 +441,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
	return;
	#endif

	@@ -52,7 +55,7 @@
	// Don't crash if we're not on the TTY of our host X11 server.
	int active_tty = GetActiveTTY();
	if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
	-@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() {
	+@@ -516,7 +525,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() {
	CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
	atom_ = XInternAtom(display_, "CHECK", x11::False);
	}
	@@ -61,13 +64,13 @@
	+#endif
	}

	- void GpuWatchdogThread::SetupXChangeProp() {
	-@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT
	+ void GpuWatchdogThreadImplV1::SetupXChangeProp() {
	+@@ -616,7 +627,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
	}
	#endif

	-#if defined(USE_X11)
	+#if defined(USE_X11) && !defined(OS_BSD)
	- int GpuWatchdogThread::GetActiveTTY() const {
	+ int GpuWatchdogThreadImplV1::GetActiveTTY() const {
	char tty_string[8] = {0};
	if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) &&
	Index: www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
	===================================================================
	--- www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
	+++ www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
	@@ -0,0 +1,42 @@
	+--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-10-21 19:06:35 UTC
	++++ gpu/vulkan/vulkan_function_pointers.h
	+@@ -170,14 +170,14 @@ struct VulkanFunctionPointers {
	+ vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
	+ #endif // defined(OS_ANDROID)
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr;
	+ PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr;
	+-#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_FUCHSIA)
	+ PFN_vkImportSemaphoreZirconHandleFUCHSIA
	+@@ -356,16 +356,16 @@ struct VulkanFunctionPointers {
	+ ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
	+ #endif // defined(OS_ANDROID)
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ #define vkGetSemaphoreFdKHR \
	+ gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn
	+ #define vkImportSemaphoreFdKHR \
	+ gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn
	+-#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_FUCHSIA)
	+ #define vkImportSemaphoreZirconHandleFUCHSIA \
	Index: www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
	===================================================================
	--- www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
	+++ www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
	@@ -0,0 +1,32 @@
	+--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-10-21 19:06:35 UTC
	++++ gpu/vulkan/vulkan_function_pointers.cc
	+@@ -731,7 +731,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
	+ }
	+ #endif // defined(OS_ANDROID)
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ if (gfx::HasExtension(enabled_extensions,
	+ VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) {
	+ vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(
	+@@ -750,9 +750,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
	+ return false;
	+ }
	+ }
	+-#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (gfx::HasExtension(enabled_extensions,
	+ VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) {
	+ vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>(
	+@@ -763,7 +763,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
	+ return false;
	+ }
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ #if defined(OS_FUCHSIA)
	+ if (gfx::HasExtension(enabled_extensions,
	Index: www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
	===================================================================
	--- www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
	+++ www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
	@@ -1,6 +1,6 @@
	---- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC
	+--- headless/lib/browser/headless_content_browser_client.h.orig 2019-10-21 19:06:35 UTC
	+++ headless/lib/browser/headless_content_browser_client.h
	-@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C
	+@@ -33,7 +33,7 @@ class HeadlessContentBrowserClient : public content::C
	::storage::OptionalQuotaSettingsCallback callback) override;
	content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings(
	content::BrowserContext* context) override;
	Index: www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
	===================================================================
	--- www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
	+++ www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
	@@ -1,6 +1,6 @@
	---- headless/lib/browser/headless_content_browser_client.cc.orig 2019-03-11 22:00:59 UTC
	+--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-10-21 19:06:35 UTC
	+++ headless/lib/browser/headless_content_browser_client.cc
	-@@ -187,7 +187,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
	+@@ -165,7 +165,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet
	return content::GeneratedCodeCacheSettings(true, 0, context->GetPath());
	}

	@@ -9,7 +9,7 @@
	void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
	const base::CommandLine& command_line,
	int child_process_id,
	-@@ -198,7 +198,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
	+@@ -176,7 +176,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
	mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd);
	#endif // defined(HEADLESS_USE_BREAKPAD)
	}
	Index: www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h
	===================================================================
	--- www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h
	+++ www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h
	@@ -1,11 +0,0 @@
	---- headless/lib/browser/headless_request_context_manager.h.orig 2019-03-17 18:56:16 UTC
	-+++ headless/lib/browser/headless_request_context_manager.h
	-@@ -69,7 +69,7 @@ class HeadlessRequestContextManager {
	- std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_;
	- bool is_system_context_;
	-
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- ::network::mojom::CryptConfigPtr crypt_config_;
	- #endif
	-
	Index: www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc
	===================================================================
	--- www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc
	+++ www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc
	@@ -1,6 +1,6 @@
	---- headless/lib/browser/headless_request_context_manager.cc.orig 2019-03-11 22:00:59 UTC
	+--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-10-21 19:06:35 UTC
	+++ headless/lib/browser/headless_request_context_manager.cc
	-@@ -35,7 +35,7 @@ namespace headless {
	+@@ -25,7 +25,7 @@ namespace headless {

	namespace {

	@@ -9,7 +9,7 @@
	static char kProductName[] = "HeadlessChrome";
	#endif

	-@@ -81,7 +81,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
	+@@ -55,7 +55,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
	return traffic_annotation;
	}

	@@ -18,21 +18,12 @@
	::network::mojom::CryptConfigPtr BuildCryptConfigOnce(
	const base::FilePath& user_data_path) {
	static bool done_once = false;
	-@@ -290,7 +290,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
	- proxy_config_monitor_ =
	- std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner);
	+@@ -195,7 +195,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
	+ proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>(
	+ base::ThreadTaskRunnerHandle::Get());
	}
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- crypt_config_ = BuildCryptConfigOnce(user_data_path_);
	- if (network_service_enabled_ && crypt_config_)
	- content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_));
	-@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() {
	- std::move(protocol_handler.second));
	- }
	- protocol_handlers_.clear();
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	- if (crypt_config_) {
	- content::GetNetworkServiceImpl()->SetCryptConfig(
	- std::move(crypt_config_));
	+ auto crypt_config = BuildCryptConfigOnce(user_data_path_);
	+ if (crypt_config)
	+ content::GetNetworkService()->SetCryptConfig(std::move(crypt_config));
	Index: www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
	===================================================================
	--- www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
	+++ www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
	@@ -0,0 +1,11 @@
	+--- headless/lib/headless_content_main_delegate.h.orig 2019-09-16 09:51:15 UTC
	++++ headless/lib/headless_content_main_delegate.h
	+@@ -58,7 +58,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate
	+
	+ HeadlessBrowserImpl* browser() const { return browser_.get(); }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ void ZygoteForked() override;
	+ #endif
	+
	Index: www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
	===================================================================
	--- www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
	+++ www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
	@@ -0,0 +1,20 @@
	+--- headless/lib/headless_content_main_delegate.cc.orig 2019-10-21 19:06:35 UTC
	++++ headless/lib/headless_content_main_delegate.cc
	+@@ -328,7 +328,7 @@ int HeadlessContentMainDelegate::RunProcess(
	+ }
	+ #endif // !defined(CHROME_MULTIPLE_DLL_CHILD)
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ void SIGTERMProfilingShutdown(int signal) {
	+ content::Profiling::Stop();
	+ struct sigaction sigact;
	+@@ -363,7 +363,7 @@ void HeadlessContentMainDelegate::ZygoteForked() {
	+ breakpad::InitCrashReporter(process_type);
	+ #endif
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ // static
	+ HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() {
	Index: www/iridium/files/patch-ipc_ipc__channel.h
	===================================================================
	--- www/iridium/files/patch-ipc_ipc__channel.h
	+++ www/iridium/files/patch-ipc_ipc__channel.h
	@@ -1,6 +1,6 @@
	---- ipc/ipc_channel.h.orig 2019-03-11 22:00:59 UTC
	+--- ipc/ipc_channel.h.orig 2019-09-09 21:55:20 UTC
	+++ ipc/ipc_channel.h
	-@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
	+@@ -256,7 +256,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
	static std::string GenerateUniqueRandomChannelID();
	#endif

	Index: www/iridium/files/patch-ipc_ipc__channel__common.cc
	===================================================================
	--- www/iridium/files/patch-ipc_ipc__channel__common.cc
	+++ www/iridium/files/patch-ipc_ipc__channel__common.cc
	@@ -1,4 +1,4 @@
	---- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC
	+--- ipc/ipc_channel_common.cc.orig 2019-06-04 18:55:25 UTC
	+++ ipc/ipc_channel_common.cc
	@@ -9,7 +9,7 @@

	@@ -9,3 +9,12 @@

	namespace {
	int g_global_pid = 0;
	+@@ -25,7 +25,7 @@ int Channel::GetGlobalPid() {
	+ return g_global_pid;
	+ }
	+
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ // static
	+ std::unique_ptr<Channel> Channel::CreateClient(
	Index: www/iridium/files/patch-ipc_ipc__channel__mojo.cc
	===================================================================
	--- www/iridium/files/patch-ipc_ipc__channel__mojo.cc
	+++ www/iridium/files/patch-ipc_ipc__channel__mojo.cc
	@@ -1,6 +1,6 @@
	---- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC
	+--- ipc/ipc_channel_mojo.cc.orig 2019-06-04 18:55:25 UTC
	+++ ipc/ipc_channel_mojo.cc
	-@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory {
	+@@ -64,10 +64,10 @@ class MojoChannelFactory : public ChannelFactory {
	};

	base::ProcessId GetSelfPID() {
	@@ -8,4 +8,8 @@
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	if (int global_pid = Channel::GetGlobalPid())
	return global_pid;
	- #endif // OS_LINUX
	+-#endif // OS_LINUX
	++#endif // OS_LINUX \|\| OS_BSD
	+ #if defined(OS_NACL)
	+ return -1;
	+ #else
	Index: www/iridium/files/patch-ipc_ipc__message__utils.h
	===================================================================
	--- www/iridium/files/patch-ipc_ipc__message__utils.h
	+++ www/iridium/files/patch-ipc_ipc__message__utils.h
	@@ -1,11 +1,11 @@
	---- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC
	+--- ipc/ipc_message_utils.h.orig 2019-10-21 19:06:36 UTC
	+++ ipc/ipc_message_utils.h
	-@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> {
	+@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {
	+ // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long.
	// Since we want to support Android 32<>64 bit IPC, as long as we don't have
	// these traits for 32 bit ARM then that'll catch any errors.
	- #if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| \
	-- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	-+ defined(OS_BSD) \|\| (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	+-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| \
	++#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD) \|\| \
	+ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	template <>
	struct ParamTraits<long> {
	- typedef long param_type;
	Index: www/iridium/files/patch-ipc_ipc__message__utils.cc
	===================================================================
	--- www/iridium/files/patch-ipc_ipc__message__utils.cc
	+++ www/iridium/files/patch-ipc_ipc__message__utils.cc
	@@ -1,11 +1,11 @@
	---- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC
	+--- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC
	+++ ipc/ipc_message_utils.cc
	-@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
	+@@ -355,7 +355,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
	+ l->append(base::NumberToString(p));
	}

	- #if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| \
	-- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	-+ defined(OS_BSD) \|\| (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	+-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| \
	++#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD) \|\| \
	+ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
	void ParamTraits<long>::Log(const param_type& p, std::string* l) {
	l->append(base::NumberToString(p));
	- }
	Index: www/iridium/files/patch-media_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-media_BUILD.gn
	+++ www/iridium/files/patch-media_BUILD.gn
	@@ -1,6 +1,6 @@
	---- media/BUILD.gn.orig 2019-03-11 22:00:59 UTC
	+--- media/BUILD.gn.orig 2019-10-21 19:06:36 UTC
	+++ media/BUILD.gn
	-@@ -59,6 +59,9 @@ config("media_config") {
	+@@ -62,6 +62,9 @@ config("media_config") {
	defines += [ "DLOPEN_PULSEAUDIO" ]
	}
	}
	Index: www/iridium/files/patch-media_audio_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-media_audio_BUILD.gn
	+++ www/iridium/files/patch-media_audio_BUILD.gn
	@@ -1,6 +1,6 @@
	---- media/audio/BUILD.gn.orig 2019-03-11 22:00:59 UTC
	+--- media/audio/BUILD.gn.orig 2019-09-09 21:55:20 UTC
	+++ media/audio/BUILD.gn
	-@@ -242,8 +242,18 @@ source_set("audio") {
	+@@ -234,8 +234,18 @@ source_set("audio") {
	deps += [ "//media/base/android:media_jni_headers" ]
	}

	Index: www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
	===================================================================
	--- www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
	+++ www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc
	@@ -1,4 +1,4 @@
	---- media/audio/alsa/audio_manager_alsa.cc.orig 2019-04-05 00:49:21 UTC
	+--- media/audio/alsa/audio_manager_alsa.cc.orig 2019-04-30 22:22:52 UTC
	+++ media/audio/alsa/audio_manager_alsa.cc
	@@ -92,7 +92,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType
	int card = -1;
	Index: www/iridium/files/patch-media_base_scopedfd__helper.h
	===================================================================
	--- www/iridium/files/patch-media_base_scopedfd__helper.h
	+++ www/iridium/files/patch-media_base_scopedfd__helper.h
	@@ -1,14 +1,18 @@
	---- media/base/scopedfd_helper.h.orig 2019-03-11 22:00:59 UTC
	+--- media/base/scopedfd_helper.h.orig 2019-09-09 21:55:20 UTC
	+++ media/base/scopedfd_helper.h
	-@@ -14,14 +14,14 @@ namespace media {
	- // since the only current user is V4L2 we are limiting the scope to OS_LINUX so
	+@@ -11,17 +11,17 @@
	+ namespace media {
	+
	+ // Theoretically, we can test on defined(OS_POSIX) \|\| defined(OS_FUCHSIA), but
	+-// since the only current user is V4L2 we are limiting the scope to OS_LINUX so
	++// since the only current user is V4L2 we are limiting the scope to OS_LINUX \|\| OS_BSD so
	// the binary size does not inflate on non-using systems. Feel free to adapt
	// this and BUILD.gn as our needs evolve.
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)

	- // Return a new vector containing duplicates of \|fds\|, or an empty vector in
	- // case of error.
	+ // Return a new vector containing duplicates of \|fds\|, or PCHECKs in case of an
	+ // error.
	MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs(
	const std::vector<base::ScopedFD>& fds);

	Index: www/iridium/files/patch-media_base_video__frame.h
	===================================================================
	--- www/iridium/files/patch-media_base_video__frame.h
	+++ www/iridium/files/patch-media_base_video__frame.h
	@@ -1,15 +1,27 @@
	---- media/base/video_frame.h.orig 2019-03-11 22:00:59 UTC
	+--- media/base/video_frame.h.orig 2019-10-21 19:06:36 UTC
	+++ media/base/video_frame.h
	-@@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	+@@ -39,9 +39,9 @@
	+ #include "base/mac/scoped_cftyperef.h"
	+ #endif // defined(OS_MACOSX)
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "base/files/scoped_file.h"
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ namespace media {
	+
	+@@ -76,7 +76,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers.
	STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer.
	- STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory.
	+ STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory.
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// TODO(mcasas): Consider turning this type into STORAGE_NATIVE
	// based on the idea of using this same enum value for both DMA
	// buffers on Linux and CVPixelBuffers on Mac (which currently use
	-@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	+@@ -229,7 +229,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	uint8_t* a_data,
	base::TimeDelta timestamp);

	@@ -18,21 +30,21 @@
	// Wraps provided dmabufs
	// (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
	// VideoFrame. The frame will take ownership of \|dmabuf_fds\|, and will
	-@@ -430,7 +430,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	- // Returns the offset into the shared memory where the frame data begins.
	- size_t shared_memory_offset() const;
	+@@ -444,7 +444,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	+ // mailbox, the caller must wait for the included sync point.
	+ const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// Returns a vector containing the backing DmaBufs for this frame. The number
	// of returned DmaBufs will be equal or less than the number of planes of
	// the frame. If there are less, this means that the last FD contains the
	-@@ -624,7 +624,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	- // memory.
	- size_t shared_memory_offset_;
	+@@ -630,7 +630,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
	+ base::UnsafeSharedMemoryRegion owned_shm_region_;
	+ base::WritableSharedMemoryMapping owned_shm_mapping_;

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ class DmabufHolder;
	+
	// Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either
	- // equal or less than the number of planes of the frame. If it is less, then
	- // the memory area represented by the last FD contains the remaining planes.
	Index: www/iridium/files/patch-media_base_video__frame.cc
	===================================================================
	--- www/iridium/files/patch-media_base_video__frame.cc
	+++ www/iridium/files/patch-media_base_video__frame.cc
	@@ -1,6 +1,6 @@
	---- media/base/video_frame.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/base/video_frame.cc.orig 2019-10-21 19:06:36 UTC
	+++ media/base/video_frame.cc
	-@@ -53,7 +53,7 @@ static std::string StorageTypeToString(
	+@@ -52,7 +52,7 @@ static std::string StorageTypeToString(
	return "OWNED_MEMORY";
	case VideoFrame::STORAGE_SHMEM:
	return "SHMEM";
	@@ -9,7 +9,7 @@
	case VideoFrame::STORAGE_DMABUFS:
	return "DMABUFS";
	#endif
	-@@ -68,7 +68,7 @@ static std::string StorageTypeToString(
	+@@ -67,7 +67,7 @@ static std::string StorageTypeToString(
	// static
	bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
	return
	@@ -18,7 +18,25 @@
	// This is not strictly needed but makes explicit that, at VideoFrame
	// level, DmaBufs are not mappable from userspace.
	storage_type != VideoFrame::STORAGE_DMABUFS &&
	-@@ -461,7 +461,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
	+@@ -185,7 +185,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
	+ return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
	+ }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
	+ // thus to have several VideoFrames share the same set of DMABUF FDs.
	+ class VideoFrame::DmabufHolder
	+@@ -203,7 +203,7 @@ class VideoFrame::DmabufHolder
	+ friend class base::RefCountedThreadSafe<DmabufHolder>;
	+ ~DmabufHolder() = default;
	+ };
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ // static
	+ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
	+@@ -468,7 +468,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
	return frame;
	}

	@@ -27,17 +45,17 @@
	// static
	scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
	const VideoFrameLayout& layout,
	-@@ -592,7 +592,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
	+@@ -604,7 +604,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
	}
	}

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- // If there are any \|dmabuf_fds_\| plugged in, we should duplicate them.
	- if (frame->storage_type() == STORAGE_DMABUFS) {
	- wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_);
	-@@ -917,7 +917,7 @@ size_t VideoFrame::shared_memory_offset() const {
	- return shared_memory_offset_;
	+ DCHECK(frame.dmabuf_fds_);
	+ // If there are any \|dmabuf_fds_\| plugged in, we should refer them too.
	+ wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_;
	+@@ -911,7 +911,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
	+ return mailbox_holders_[texture_index];
	}

	-#if defined(OS_LINUX)
	@@ -45,3 +63,12 @@
	const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
	DCHECK_EQ(storage_type_, STORAGE_DMABUFS);

	+@@ -986,7 +986,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
	+ storage_type_(storage_type),
	+ visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
	+ natural_size_(natural_size),
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()),
	+ #endif
	+ timestamp_(timestamp),
	Index: www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
	+++ www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc
	@@ -1,4 +1,4 @@
	---- media/capture/video/create_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/create_video_capture_device_factory.cc.orig 2019-10-21 19:06:36 UTC
	+++ media/capture/video/create_video_capture_device_factory.cc
	@@ -10,7 +10,7 @@
	#include "media/capture/video/fake_video_capture_device_factory.h"
	@@ -8,8 +8,8 @@
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	#include "media/capture/video/linux/video_capture_device_factory_linux.h"
	#elif defined(OS_CHROMEOS)
	- #include "media/capture/video/chromeos/public/cros_features.h"
	-@@ -33,7 +33,7 @@ namespace {
	+ #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h"
	+@@ -82,7 +82,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
	std::unique_ptr<VideoCaptureDeviceFactory>
	CreatePlatformSpecificVideoCaptureDeviceFactory(
	scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
	@@ -17,4 +17,4 @@
	+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
	#elif defined(OS_CHROMEOS)
	- // On Chrome OS we have to support two use cases:
	+ return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {});
	Index: www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
	+++ www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
	@@ -1,6 +1,6 @@
	---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-10-21 19:06:36 UTC
	+++ media/capture/video/fake_video_capture_device_factory.cc
	-@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
	+@@ -205,7 +205,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
	for (const auto& entry : devices_config_) {
	device_descriptors->emplace_back(
	base::StringPrintf("fake_device_%d", entry_index), entry.device_id,
	Index: www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
	+++ www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
	@@ -1,6 +1,6 @@
	---- media/capture/video/file_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/file_video_capture_device_factory.cc.orig 2019-04-30 22:22:52 UTC
	+++ media/capture/video/file_video_capture_device_factory.cc
	-@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
	+@@ -54,7 +54,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
	#elif defined(OS_MACOSX)
	command_line_file_path.value(), kFileVideoCaptureDeviceName,
	VideoCaptureApi::MACOSX_AVFOUNDATION
	Index: www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
	+++ www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
	@@ -1,4 +1,4 @@
	---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-09-09 21:55:20 UTC
	+++ media/capture/video/linux/video_capture_device_factory_linux.cc
	@@ -259,6 +259,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats(
	if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE))
	@@ -9,7 +9,7 @@
	VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false);
	v4l2_fmtdesc fmtdesc = {};
	@@ -267,6 +268,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats(
	- if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat))
	+ if (base::Contains(usable_fourccs, fmtdesc.pixelformat))
	return true;
	}
	+#endif
	Index: www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
	+++ www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
	@@ -1,4 +1,4 @@
	---- media/capture/video/linux/video_capture_device_linux.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/linux/video_capture_device_linux.cc.orig 2019-04-30 22:22:52 UTC
	+++ media/capture/video/linux/video_capture_device_linux.cc
	@@ -37,6 +37,7 @@ int TranslatePowerLineFrequencyToV4L2(PowerLineFrequen

	@@ -16,15 +16,15 @@

	VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
	scoped_refptr<V4L2CaptureDevice> v4l2,
	-@@ -68,6 +70,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() {
	- void VideoCaptureDeviceLinux::AllocateAndStart(
	+@@ -71,6 +73,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
	const VideoCaptureParams& params,
	std::unique_ptr<VideoCaptureDevice::Client> client) {
	+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
	+#if !defined(OS_FREEBSD)
	DCHECK(!capture_impl_);
	if (v4l2_thread_.IsRunning())
	return; // Wrong state.
	-@@ -95,9 +98,11 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
	+@@ -98,10 +101,12 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
	for (auto& request : photo_requests_queue_)
	v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request));
	photo_requests_queue_.clear();
	@@ -32,11 +32,12 @@
	}

	void VideoCaptureDeviceLinux::StopAndDeAllocate() {
	+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
	+#if !defined(OS_FREEBSD)
	if (!v4l2_thread_.IsRunning())
	return; // Wrong state.
	v4l2_thread_.task_runner()->PostTask(
	-@@ -107,6 +112,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
	+@@ -111,6 +116,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
	v4l2_thread_.Stop();

	capture_impl_ = nullptr;
	@@ -44,10 +45,10 @@
	}

	void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) {
	-@@ -149,11 +155,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
	- }
	-
	+@@ -158,11 +164,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
	void VideoCaptureDeviceLinux::SetRotation(int rotation) {
	+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
	+ rotation_ = rotation;
	+#if !defined(OS_FREEBSD)
	if (v4l2_thread_.IsRunning()) {
	v4l2_thread_.task_runner()->PostTask(
	Index: www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
	+++ www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
	@@ -1,6 +1,6 @@
	---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-06-04 18:55:25 UTC
	+++ media/capture/video/mock_gpu_memory_buffer_manager.cc
	-@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
	+@@ -115,7 +115,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
	gfx::GpuMemoryBufferHandle handle;
	handle.type = gfx::NATIVE_PIXMAP;
	handle.id = handle_.id;
	Index: www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h
	===================================================================
	--- www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h
	+++ www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h
	@@ -1,11 +0,0 @@
	---- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC
	-+++ media/capture/video/shared_memory_handle_provider.h
	-@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
	-
	- // This requires platforms where base::SharedMemoryHandle is backed by a
	- // file descriptor.
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
	- uint32_t memory_size_in_bytes);
	- #endif // defined(OS_LINUX)
	Index: www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc
	+++ www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc
	@@ -1,11 +0,0 @@
	---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC
	-+++ media/capture/video/shared_memory_handle_provider.cc
	-@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
	- return true;
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
	- mojo::ScopedHandle fd_handle,
	- uint32_t memory_size_in_bytes) {
	Index: www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
	+++ www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc
	@@ -0,0 +1,11 @@
	+--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-10-21 19:06:36 UTC
	++++ media/capture/video/video_capture_buffer_pool_impl.cc
	+@@ -57,7 +57,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi
	+ int buffer_id) {
	+ // This requires platforms where base::SharedMemoryHandle is backed by a
	+ // file descriptor.
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ base::AutoLock lock(lock_);
	+
	+ VideoCaptureBufferTracker* tracker = GetTracker(buffer_id);
	Index: www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
	===================================================================
	--- www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
	+++ www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
	@@ -1,11 +1,11 @@
	---- media/capture/video/video_capture_device_client.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/capture/video/video_capture_device_client.cc.orig 2019-10-21 19:06:36 UTC
	+++ media/capture/video/video_capture_device_client.cc
	-@@ -236,7 +236,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
	+@@ -301,7 +301,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
	// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
	// Windows RGB24 defines blue at lowest byte,
	// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- origin_colorspace = libyuv::FOURCC_RAW;
	+ fourcc_format = libyuv::FOURCC_RAW;
	#elif defined(OS_WIN)
	- origin_colorspace = libyuv::FOURCC_24BG;
	+ fourcc_format = libyuv::FOURCC_24BG;
	Index: www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
	===================================================================
	--- www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
	+++ www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
	@@ -1,6 +1,6 @@
	---- media/formats/mp2t/es_parser_adts.cc.orig 2019-03-11 22:00:59 UTC
	+--- media/formats/mp2t/es_parser_adts.cc.orig 2019-04-30 22:22:52 UTC
	+++ media/formats/mp2t/es_parser_adts.cc
	-@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
	+@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
	const uint8_t* es;
	es_queue_->Peek(&es, &es_size);

	@@ -15,7 +15,7 @@
	const uint8_t* cur_buf = &es[offset];
	if (!isAdtsSyncWord(cur_buf))
	continue;
	-@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
	+@@ -106,7 +106,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
	return true;
	}

	Index: www/iridium/files/patch-media_gpu_libyuv__image__processor.cc
	===================================================================
	--- www/iridium/files/patch-media_gpu_libyuv__image__processor.cc
	+++ www/iridium/files/patch-media_gpu_libyuv__image__processor.cc
	@@ -0,0 +1,38 @@
	+--- media/gpu/libyuv_image_processor.cc.orig 2019-07-29 19:24:17 UTC
	++++ media/gpu/libyuv_image_processor.cc
	+@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
	+ // LibYUVImageProcessor supports only memory-based video frame for input.
	+ VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
	+ for (auto input_type : input_config.preferred_storage_types) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (input_type == VideoFrame::STORAGE_DMABUFS) {
	+ video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
	+ input_config.layout.format(), true);
	+@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
	+ break;
	+ }
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ if (VideoFrame::IsStorageTypeMappable(input_type)) {
	+ input_storage_type = input_type;
	+@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
	+ FrameReadyCB cb) {
	+ DCHECK(process_thread_.task_runner()->BelongsToCurrentThread());
	+ DVLOGF(4);
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
	+ DCHECK_NE(video_frame_mapper_.get(), nullptr);
	+ input_frame = video_frame_mapper_->Map(std::move(input_frame));
	+@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
	+ return;
	+ }
	+ }
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ int res = DoConversion(input_frame.get(), output_frame.get());
	+ if (res != 0) {
	Index: www/iridium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
	===================================================================
	--- www/iridium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
	+++ www/iridium/files/patch-media_gpu_linux_platform__video__frame__utils.cc
	@@ -0,0 +1,20 @@
	+--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-09-09 21:55:20 UTC
	++++ media/gpu/linux/platform_video_frame_utils.cc
	+@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
	+ DCHECK(video_frame);
	+
	+ gfx::GpuMemoryBufferHandle handle;
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ handle.type = gfx::NATIVE_PIXMAP;
	+
	+ std::vector<base::ScopedFD> duped_fds =
	+@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle
	+ }
	+ #else
	+ NOTREACHED();
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+ return handle;
	+ }
	+
	Index: www/iridium/files/patch-media_media__options.gni
	===================================================================
	--- www/iridium/files/patch-media_media__options.gni
	+++ www/iridium/files/patch-media_media__options.gni
	@@ -1,6 +1,6 @@
	---- media/media_options.gni.orig 2019-03-11 22:00:59 UTC
	+--- media/media_options.gni.orig 2019-07-24 18:58:30 UTC
	+++ media/media_options.gni
	-@@ -100,6 +100,9 @@ declare_args() {
	+@@ -110,6 +110,9 @@ declare_args() {
	# Enables runtime selection of ALSA library for audio.
	use_alsa = false

	Index: www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
	===================================================================
	--- www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
	+++ www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc
	@@ -0,0 +1,11 @@
	+--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-09-16 09:54:00 UTC
	++++ media/mojo/clients/mojo_video_encode_accelerator.cc
	+@@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr<
	+ frame->layout().num_planes());
	+ DCHECK(vea_.is_bound());
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
	+ DCHECK(frame->HasDmaBufs());
	+ vea_->Encode(
	Index: www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
	===================================================================
	--- www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
	+++ www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc
	@@ -0,0 +1,20 @@
	+--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2019-10-30 16:06:07 UTC
	++++ media/mojo/mojom/video_frame_mojom_traits.cc
	+@@ -52,7 +52,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData(
	+ mojo_frame->PlaneOffset(media::VideoFrame::kVPlane)));
	+ }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) {
	+ std::vector<mojo::ScopedHandle> dmabuf_fds;
	+
	+@@ -145,7 +145,7 @@ bool StructTraits<media::mojom::VideoFrameDataView,
	+ shared_buffer_data.u_offset(), shared_buffer_data.v_offset(),
	+ shared_buffer_data.y_stride(), shared_buffer_data.u_stride(),
	+ shared_buffer_data.v_stride(), timestamp);
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ } else if (data.is_dmabuf_data()) {
	+ media::mojom::DmabufVideoFrameDataDataView dmabuf_data;
	+ data.GetDmabufDataDataView(&dmabuf_data);
	Index: www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
	===================================================================
	--- www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
	+++ www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
	@@ -1,20 +1,20 @@
	---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-03-17 21:51:56 UTC
	+--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-10-21 19:06:36 UTC
	+++ media/mojo/services/gpu_mojo_media_client.cc
	-@@ -55,7 +55,7 @@ namespace media {
	+@@ -65,7 +65,7 @@ namespace media {
	namespace {

	#if defined(OS_ANDROID) \|\| defined(OS_CHROMEOS) \|\| defined(OS_MACOSX) \|\| \
	- defined(OS_WIN) \|\| defined(OS_LINUX)
	+ defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	gpu::CommandBufferStub* GetCommandBufferStub(
	+ scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner,
	base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager,
	- base::UnguessableToken channel_token,
	-@@ -172,7 +172,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
	- std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_,
	- std::move(get_stub_cb)));
	- #elif defined(OS_CHROMEOS) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| \
	-- defined(OS_LINUX)
	-+ defined(OS_LINUX) \|\| defined(OS_BSD)
	- std::unique_ptr<VideoDecoder> vda_video_decoder = VdaVideoDecoder::Create(
	- task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
	- gpu_preferences_, gpu_workarounds_,
	+@@ -245,7 +245,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
	+ command_buffer_id->route_id));
	+ }
	+
	+-#elif defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX)
	++#elif defined(OS_MACOSX) \|\| defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ video_decoder = VdaVideoDecoder::Create(
	+ task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
	+ gpu_preferences_, gpu_workarounds_,
	Index: www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
	===================================================================
	--- www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
	+++ www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
	@@ -1,6 +1,6 @@
	---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-03-11 22:01:00 UTC
	+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-10-21 19:06:37 UTC
	+++ media/video/gpu_memory_buffer_video_frame_pool.cc
	-@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
	+@@ -555,7 +555,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
	}

	bool is_software_backed_video_frame = !video_frame->HasTextures();
	Index: www/iridium/files/patch-mojo_public_c_system_thunks.cc
	===================================================================
	--- www/iridium/files/patch-mojo_public_c_system_thunks.cc
	+++ www/iridium/files/patch-mojo_public_c_system_thunks.cc
	@@ -1,4 +1,4 @@
	---- mojo/public/c/system/thunks.cc.orig 2019-03-11 22:01:00 UTC
	+--- mojo/public/c/system/thunks.cc.orig 2019-04-30 22:22:53 UTC
	+++ mojo/public/c/system/thunks.cc
	@@ -16,7 +16,7 @@
	#include "build/build_config.h"
	@@ -36,7 +36,18 @@
	const base::FilePath::CharType kDefaultLibraryPathValue[] =
	FILE_PATH_LITERAL("./libmojo_core.so");
	#elif defined(OS_WIN)
	-@@ -147,7 +147,7 @@ class CoreLibraryInitializer {
	+@@ -138,16 +138,16 @@ class CoreLibraryInitializer {
	+
	+ CHECK_GT(g_thunks->size, 0u)
	+ << "Invalid mojo_core library: " << library_path->value();
	+-#else // defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
	++#else // defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ NOTREACHED()
	+ << "Dynamic mojo_core loading is not supported on this platform.";
	+-#endif // defined(OS_CHROMEOS) \|\| defined(OS_LINUX)
	++#endif // defined(OS_CHROMEOS) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ }
	+
	~CoreLibraryInitializer() = default;

	private:
	Index: www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd
	===================================================================
	--- www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd
	+++ www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd
	@@ -1,11 +1,11 @@
	---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-03-11 22:01:00 UTC
	+--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-07-24 18:58:31 UTC
	+++ mojo/public/js/mojo_bindings_resources.grd
	-@@ -23,7 +23,7 @@
	+@@ -60,7 +60,7 @@
	use_base_dir="false"
	type="BINDATA"
	compress="gzip" />
	- <if expr="is_win or is_macosx or is_linux">
	+ <if expr="is_win or is_macosx or is_posix">
	- <include name="IDR_MOJO_TIME_MOJOM_JS"
	- file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.js"
	+ <include name="IDR_MOJO_TIME_MOJOM_HTML"
	+ file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.html"
	use_base_dir="false"
	Index: www/iridium/files/patch-net_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-net_BUILD.gn
	+++ www/iridium/files/patch-net_BUILD.gn
	@@ -1,6 +1,6 @@
	---- net/BUILD.gn.orig 2019-03-11 22:01:00 UTC
	+--- net/BUILD.gn.orig 2019-10-21 19:06:38 UTC
	+++ net/BUILD.gn
	-@@ -97,7 +97,7 @@ net_configs = [
	+@@ -105,7 +105,7 @@ net_configs = [
	"//build/config/compiler:wexit_time_destructors",
	]

	@@ -9,16 +9,25 @@
	net_configs += [ "//build/config/linux:libresolv" ]
	}

	-@@ -1900,7 +1900,7 @@ component("net") {
	+@@ -1924,7 +1924,7 @@ component("net") {
	+ }
	}

	+- if (is_android \|\| is_chromeos) {
	++ if (is_android \|\| is_chromeos \|\| is_bsd) {
	+ sources += [
	+ "base/network_change_notifier_posix.cc",
	+ "base/network_change_notifier_posix.h",
	+@@ -1957,7 +1957,7 @@ component("net") {
	+ }
	+
	# Use getifaddrs() on POSIX platforms, except Linux and Android.
	- if (is_posix && !is_linux && !is_android) {
	+ if (is_posix && ((!is_linux && !is_android) \|\| (is_bsd))) {
	sources += [
	"base/network_interfaces_getifaddrs.cc",
	"base/network_interfaces_getifaddrs.h",
	-@@ -1993,6 +1993,16 @@ component("net") {
	+@@ -2051,6 +2051,16 @@ component("net") {
	]

	sources -= [ "disk_cache/blockfile/file_posix.cc" ]
	Index: www/iridium/files/patch-net_base_address__tracker__linux.cc
	===================================================================
	--- www/iridium/files/patch-net_base_address__tracker__linux.cc
	+++ www/iridium/files/patch-net_base_address__tracker__linux.cc
	@@ -1,4 +1,4 @@
	---- net/base/address_tracker_linux.cc.orig 2019-03-11 22:01:00 UTC
	+--- net/base/address_tracker_linux.cc.orig 2019-06-04 18:55:26 UTC
	+++ net/base/address_tracker_linux.cc
	@@ -21,96 +21,10 @@
	namespace net {
	@@ -99,233 +99,50 @@
	}

	AddressTrackerLinux::AddressTrackerLinux()
	-@@ -153,93 +67,8 @@ AddressTrackerLinux::~AddressTrackerLinux() {
	- }
	+@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux(
	+ AddressTrackerLinux::~AddressTrackerLinux() = default;

	void AddressTrackerLinux::Init() {
	-- netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
	-- if (netlink_fd_ < 0) {
	-- PLOG(ERROR) << "Could not create NETLINK socket";
	-- AbortAndForceOnline();
	-- return;
	-- }
	--
	-- int rv;
	--
	-- if (tracking_) {
	-- // Request notifications.
	-- struct sockaddr_nl addr = {};
	-- addr.nl_family = AF_NETLINK;
	-- addr.nl_pid = getpid();
	-- // TODO(szym): Track RTMGRP_LINK as well for ifi_type,
	-- // http://crbug.com/113993
	-- addr.nl_groups =
	-- RTMGRP_IPV4_IFADDR \| RTMGRP_IPV6_IFADDR \| RTMGRP_NOTIFY \| RTMGRP_LINK;
	-- rv = bind(
	-- netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr));
	-- if (rv < 0) {
	-- PLOG(ERROR) << "Could not bind NETLINK socket";
	-- AbortAndForceOnline();
	-- return;
	-- }
	-- }
	--
	-- // Request dump of addresses.
	-- struct sockaddr_nl peer = {};
	-- peer.nl_family = AF_NETLINK;
	--
	-- struct {
	-- struct nlmsghdr header;
	-- struct rtgenmsg msg;
	-- } request = {};
	--
	-- request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg));
	-- request.header.nlmsg_type = RTM_GETADDR;
	-- request.header.nlmsg_flags = NLM_F_REQUEST \| NLM_F_DUMP;
	-- request.header.nlmsg_pid = getpid();
	-- request.msg.rtgen_family = AF_UNSPEC;
	--
	-- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len,
	-- 0, reinterpret_cast<struct sockaddr*>(&peer),
	-- sizeof(peer)));
	-- if (rv < 0) {
	-- PLOG(ERROR) << "Could not send NETLINK request";
	-- AbortAndForceOnline();
	-- return;
	-- }
	--
	-- // Consume pending message to populate the AddressMap, but don't notify.
	-- // Sending another request without first reading responses results in EBUSY.
	-- bool address_changed;
	-- bool link_changed;
	-- bool tunnel_changed;
	-- ReadMessages(&address_changed, &link_changed, &tunnel_changed);
	--
	-- // Request dump of link state
	-- request.header.nlmsg_type = RTM_GETLINK;
	--
	-- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0,
	-- reinterpret_cast<struct sockaddr*>(&peer),
	-- sizeof(peer)));
	-- if (rv < 0) {
	-- PLOG(ERROR) << "Could not send NETLINK request";
	-- AbortAndForceOnline();
	-- return;
	-- }
	--
	-- // Consume pending message to populate links_online_, but don't notify.
	-- ReadMessages(&address_changed, &link_changed, &tunnel_changed);
	-- {
	-- AddressTrackerAutoLock lock(*this, connection_type_lock_);
	-- connection_type_initialized_ = true;
	-- connection_type_initialized_cv_.Broadcast();
	-- }
	--
	-- if (tracking_) {
	-- rv = base::MessageLoopCurrentForIO::Get()->WatchFileDescriptor(
	-- netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this);
	-- if (rv < 0) {
	-- PLOG(ERROR) << "Could not watch NETLINK socket";
	-- AbortAndForceOnline();
	-- return;
	-- }
	-- }
	-+NOTIMPLEMENTED();
	-+AbortAndForceOnline();
	++#if !defined(OS_FREEBSD)
	+ netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE));
	+ if (!netlink_fd_.is_valid()) {
	+ PLOG(ERROR) << "Could not create NETLINK socket";
	+@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() {
	+ connection_type_initialized_cv_.Broadcast();
	}

	- void AddressTrackerLinux::AbortAndForceOnline() {
	-@@ -250,25 +79,6 @@ void AddressTrackerLinux::AbortAndForceOnline() {
	- connection_type_initialized_cv_.Broadcast();
	++#if !defined(OS_BSD)
	+ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
	+ AddressTrackerAutoLock lock(*this, address_map_lock_);
	+ return address_map_;
	+@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter
	+ const char* interface_name = get_interface_name_(interface_index, buf);
	+ return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
	}
	++#endif // !OS_BSD

	--AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
	-- AddressTrackerAutoLock lock(*this, address_map_lock_);
	-- return address_map_;
	--}
	--
	--std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const {
	-- AddressTrackerAutoLock lock(*this, online_links_lock_);
	-- return online_links_;
	--}
	--
	--bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const {
	-- if (ignored_interfaces_.empty())
	-- return false;
	--
	-- char buf[IFNAMSIZ] = {0};
	-- const char* interface_name = get_interface_name_(interface_index, buf);
	-- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
	--}
	--
	NetworkChangeNotifier::ConnectionType
	AddressTrackerLinux::GetCurrentConnectionType() {
	- // http://crbug.com/125097
	-@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
	+@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
	bool* address_changed,
	bool* link_changed,
	bool* tunnel_changed) {
	-- DCHECK(buffer);
	-- for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
	-- NLMSG_OK(header, length);
	-- header = NLMSG_NEXT(header, length)) {
	-- switch (header->nlmsg_type) {
	-- case NLMSG_DONE:
	-- return;
	-- case NLMSG_ERROR: {
	-- const struct nlmsgerr* msg =
	-- reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header));
	-- LOG(ERROR) << "Unexpected netlink error " << msg->error << ".";
	-- } return;
	-- case RTM_NEWADDR: {
	-- IPAddress address;
	-- bool really_deprecated;
	-- struct ifaddrmsg* msg =
	-- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
	-- if (IsInterfaceIgnored(msg->ifa_index))
	-- break;
	-- if (GetAddress(header, &address, &really_deprecated)) {
	-- AddressTrackerAutoLock lock(*this, address_map_lock_);
	-- // Routers may frequently (every few seconds) output the IPv6 ULA
	-- // prefix which can cause the linux kernel to frequently output two
	-- // back-to-back messages, one without the deprecated flag and one with
	-- // the deprecated flag but both with preferred lifetimes of 0. Avoid
	-- // interpretting this as an actual change by canonicalizing the two
	-- // messages by setting the deprecated flag based on the preferred
	-- // lifetime also. http://crbug.com/268042
	-- if (really_deprecated)
	-- msg->ifa_flags \|= IFA_F_DEPRECATED;
	-- // Only indicate change if the address is new or ifaddrmsg info has
	-- // changed.
	-- auto it = address_map_.find(address);
	-- if (it == address_map_.end()) {
	-- address_map_.insert(it, std::make_pair(address, *msg));
	-- *address_changed = true;
	-- } else if (memcmp(&it->second, msg, sizeof(*msg))) {
	-- it->second = *msg;
	-- *address_changed = true;
	-- }
	-- }
	-- } break;
	-- case RTM_DELADDR: {
	-- IPAddress address;
	-- const struct ifaddrmsg* msg =
	-- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
	-- if (IsInterfaceIgnored(msg->ifa_index))
	-- break;
	-- if (GetAddress(header, &address, NULL)) {
	-- AddressTrackerAutoLock lock(*this, address_map_lock_);
	-- if (address_map_.erase(address))
	-- *address_changed = true;
	-- }
	-- } break;
	-- case RTM_NEWLINK: {
	-- const struct ifinfomsg* msg =
	-- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
	-- if (IsInterfaceIgnored(msg->ifi_index))
	-- break;
	-- if (IgnoreWirelessChange(header, msg)) {
	-- VLOG(2) << "Ignoring RTM_NEWLINK message";
	-- break;
	-- }
	-- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) &&
	-- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) {
	-- AddressTrackerAutoLock lock(*this, online_links_lock_);
	-- if (online_links_.insert(msg->ifi_index).second) {
	-- *link_changed = true;
	-- if (IsTunnelInterface(msg->ifi_index))
	-- *tunnel_changed = true;
	-- }
	-- } else {
	-- AddressTrackerAutoLock lock(*this, online_links_lock_);
	-- if (online_links_.erase(msg->ifi_index)) {
	-- *link_changed = true;
	-- if (IsTunnelInterface(msg->ifi_index))
	-- *tunnel_changed = true;
	-- }
	-- }
	-- } break;
	-- case RTM_DELLINK: {
	-- const struct ifinfomsg* msg =
	-- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
	-- if (IsInterfaceIgnored(msg->ifi_index))
	-- break;
	-- AddressTrackerAutoLock lock(*this, online_links_lock_);
	-- if (online_links_.erase(msg->ifi_index)) {
	-- *link_changed = true;
	-- if (IsTunnelInterface(msg->ifi_index))
	-- *tunnel_changed = true;
	-- }
	-- } break;
	-- default:
	-- break;
	-- }
	-- }
	++#if !defined(OS_FREEBSD)
	+ DCHECK(buffer);
	+ for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
	+ NLMSG_OK(header, length);
	+@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
	+ break;
	+ }
	+ }
	++#else // !OS_FREEBSD
	+ NOTIMPLEMENTED();
	++ AbortAndForceOnline();
	++#endif // !OS_FREEBSD
	}

	- void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
	-@@ -458,31 +173,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
	+ void AddressTrackerLinux::OnFileCanReadWithoutBlocking() {
	+@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
	}

	void AddressTrackerLinux::UpdateCurrentConnectionType() {
	Index: www/iridium/files/patch-net_base_network__change__notifier.cc
	===================================================================
	--- www/iridium/files/patch-net_base_network__change__notifier.cc
	+++ www/iridium/files/patch-net_base_network__change__notifier.cc
	@@ -1,8 +1,26 @@
	---- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC
	+--- net/base/network_change_notifier.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/base/network_change_notifier.cc
	-@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
	+@@ -35,7 +35,7 @@
	+ #include "net/base/network_change_notifier_linux.h"
	+ #elif defined(OS_MACOSX)
	+ #include "net/base/network_change_notifier_mac.h"
	+-#elif defined(OS_CHROMEOS)
	++#elif defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	+ #include "net/base/network_change_notifier_posix.h"
	#elif defined(OS_FUCHSIA)
	- return new NetworkChangeNotifierFuchsia(0 /* required_features */);
	+ #include "net/base/network_change_notifier_fuchsia.h"
	+@@ -224,7 +224,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
	+ // Android builds MUST use their own class factory.
	+ CHECK(false);
	+ return NULL;
	+-#elif defined(OS_CHROMEOS)
	++#elif defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	+ return std::make_unique<NetworkChangeNotifierPosix>(CONNECTION_NONE,
	+ SUBTYPE_NONE);
	+ #elif defined(OS_LINUX)
	+@@ -236,7 +236,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
	+ return std::make_unique<NetworkChangeNotifierFuchsia>(
	+ 0 /* required_features */);
	#else
	- NOTIMPLEMENTED();
	return NULL;
	Index: www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc
	===================================================================
	--- www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc
	+++ www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc
	@@ -1,4 +1,4 @@
	---- net/dns/dns_config_service_posix_unittest.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-06-04 18:55:27 UTC
	+++ net/dns/dns_config_service_posix_unittest.cc
	@@ -2,8 +2,6 @@
	// Use of this source code is governed by a BSD-style license that can be
	@@ -9,7 +9,7 @@
	#include <memory>

	#include "base/cancelable_callback.h"
	-@@ -46,7 +44,7 @@ const char* const kNameserversIPv4[] = {
	+@@ -50,7 +48,7 @@ const char* const kNameserversIPv4[] = {
	"1.0.0.1",
	};

	@@ -18,7 +18,7 @@
	const char* const kNameserversIPv6[] = {
	NULL,
	"2001:DB8:0::42",
	-@@ -82,7 +80,7 @@ void InitializeResState(res_state res) {
	+@@ -86,7 +84,7 @@ void InitializeResState(res_state res) {
	++res->nscount;
	}

	@@ -27,7 +27,7 @@
	// Install IPv6 addresses, replacing the corresponding IPv4 addresses.
	unsigned nscount6 = 0;
	for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
	-@@ -103,7 +101,7 @@ void InitializeResState(res_state res) {
	+@@ -107,7 +105,7 @@ void InitializeResState(res_state res) {
	}

	void CloseResState(res_state res) {
	@@ -36,7 +36,7 @@
	for (int i = 0; i < res->nscount; ++i) {
	if (res->_u._ext.nsaddrs[i] != NULL)
	free(res->_u._ext.nsaddrs[i]);
	-@@ -128,7 +126,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
	+@@ -132,7 +130,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
	config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
	}

	Index: www/iridium/files/patch-net_dns_dns__util.cc
	===================================================================
	--- www/iridium/files/patch-net_dns_dns__util.cc
	+++ www/iridium/files/patch-net_dns_dns__util.cc
	@@ -1,6 +1,6 @@
	---- net/dns/dns_util.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/dns/dns_util.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/dns/dns_util.cc
	-@@ -36,6 +36,8 @@ const uint16_t kFlagNamePointer = 0xc000;
	+@@ -38,6 +38,8 @@ const uint16_t kFlagNamePointer = 0xc000;

	} // namespace

	Index: www/iridium/files/patch-net_dns_host__resolver__proc.cc
	===================================================================
	--- www/iridium/files/patch-net_dns_host__resolver__proc.cc
	+++ www/iridium/files/patch-net_dns_host__resolver__proc.cc
	@@ -1,8 +1,8 @@
	---- net/dns/host_resolver_proc.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/dns/host_resolver_proc.cc.orig 2019-04-30 22:22:54 UTC
	+++ net/dns/host_resolver_proc.cc
	-@@ -195,7 +195,7 @@ int SystemHostResolverCall(const std::string& host,
	- // current process during that time.
	- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
	+@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
	+ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
	+ base::BlockingType::WILL_BLOCK);

	-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
	+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
	Index: www/iridium/files/patch-net_features.gni
	===================================================================
	--- www/iridium/files/patch-net_features.gni
	+++ www/iridium/files/patch-net_features.gni
	@@ -1,6 +1,6 @@
	---- net/features.gni.orig 2019-03-11 22:01:01 UTC
	+--- net/features.gni.orig 2019-09-09 21:55:21 UTC
	+++ net/features.gni
	-@@ -27,7 +27,7 @@ declare_args() {
	+@@ -23,7 +23,7 @@ declare_args() {
	disable_brotli_filter = false

	# Multicast DNS.
	Index: www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
	===================================================================
	--- www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
	+++ www/iridium/files/patch-net_http_http__auth__gssapi__posix.h
	@@ -0,0 +1,12 @@
	+--- net/http/http_auth_gssapi_posix.h.orig 2019-09-09 21:55:21 UTC
	++++ net/http/http_auth_gssapi_posix.h
	+@@ -21,6 +21,9 @@
	+ #include <GSS/gssapi.h>
	+ #elif defined(OS_FREEBSD)
	+ #include <gssapi/gssapi.h>
	++#ifndef GSS_C_DELEG_POLICY_FLAG
	++#define GSS_C_DELEG_POLICY_FLAG 32768
	++#endif
	+ #else
	+ #include <gssapi.h>
	+ #endif
	Index: www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
	===================================================================
	--- www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
	+++ www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
	@@ -1,6 +1,6 @@
	---- net/http/http_auth_gssapi_posix.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/http/http_auth_gssapi_posix.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/http/http_auth_gssapi_posix.cc
	-@@ -431,8 +431,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
	+@@ -366,8 +366,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
	static const char* const kDefaultLibraryNames[] = {
	#if defined(OS_MACOSX)
	"/System/Library/Frameworks/GSS.framework/GSS"
	Index: www/iridium/files/patch-net_http_http__network__session.cc
	===================================================================
	--- www/iridium/files/patch-net_http_http__network__session.cc
	+++ www/iridium/files/patch-net_http_http__network__session.cc
	@@ -1,12 +0,0 @@
	---- net/http/http_network_session.cc.orig 2019-03-11 22:01:01 UTC
	-+++ net/http/http_network_session.cc
	-@@ -19,7 +19,9 @@
	- #include "base/trace_event/memory_dump_request_args.h"
	- #include "base/trace_event/process_memory_dump.h"
	- #include "base/values.h"
	-+#if defined(USE_KERBEROS)
	- #include "net/http/http_auth_handler_factory.h"
	-+#endif
	- #include "net/http/http_response_body_drainer.h"
	- #include "net/http/http_stream_factory.h"
	- #include "net/http/url_security_manager.h"
	Index: www/iridium/files/patch-net_nqe_network__quality__estimator.cc
	===================================================================
	--- www/iridium/files/patch-net_nqe_network__quality__estimator.cc
	+++ www/iridium/files/patch-net_nqe_network__quality__estimator.cc
	@@ -1,6 +1,6 @@
	---- net/nqe/network_quality_estimator.cc.orig 2019-03-17 14:51:31 UTC
	+--- net/nqe/network_quality_estimator.cc.orig 2019-09-09 21:55:22 UTC
	+++ net/nqe/network_quality_estimator.cc
	-@@ -99,7 +99,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
	+@@ -101,7 +101,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
	case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
	break;
	case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
	Index: www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc
	===================================================================
	--- www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc
	+++ www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc
	@@ -1,11 +1,11 @@
	---- net/nqe/network_quality_estimator_unittest.cc.orig 2019-03-17 14:56:02 UTC
	+--- net/nqe/network_quality_estimator_unittest.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/nqe/network_quality_estimator_unittest.cc
	-@@ -2058,7 +2058,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
	-
	+@@ -2144,7 +2144,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
	// TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
	// enabled only on certain platforms.
	--#if defined(TCP_INFO) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID)
	-+#if defined(TCP_INFO) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ // ChromeOS is disabled due to crbug.com/986904
	+-#if (defined(TCP_INFO) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID)) && \
	++#if (defined(TCP_INFO) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)) && \
	+ !defined(OS_CHROMEOS)
	#define MAYBE_TestTCPSocketRTT TestTCPSocketRTT
	#else
	- #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT
	Index: www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
	===================================================================
	--- www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
	+++ www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
	@@ -1,4 +1,4 @@
	---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/proxy_resolution/proxy_resolution_service.cc
	@@ -48,7 +48,7 @@
	#elif defined(OS_MACOSX)
	@@ -18,7 +18,7 @@
	constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
	net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
	semantics {
	-@@ -1577,7 +1577,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
	+@@ -1547,7 +1547,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
	<< "profile_io_data.cc::CreateProxyConfigService and this should "
	<< "be used only for examples.";
	return std::make_unique<UnsetProxyConfigService>();
	Index: www/iridium/files/patch-net_socket_socket__posix.cc
	===================================================================
	--- www/iridium/files/patch-net_socket_socket__posix.cc
	+++ www/iridium/files/patch-net_socket_socket__posix.cc
	@@ -1,6 +1,6 @@
	---- net/socket/socket_posix.cc.orig 2019-03-17 15:48:31 UTC
	+--- net/socket/socket_posix.cc.orig 2019-10-21 19:06:38 UTC
	+++ net/socket/socket_posix.cc
	-@@ -568,7 +568,7 @@ void SocketPosix::ReadCompleted() {
	+@@ -520,7 +520,7 @@ void SocketPosix::ReadCompleted() {
	}

	int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) {
	Index: www/iridium/files/patch-net_socket_socks5__client__socket.cc
	===================================================================
	--- www/iridium/files/patch-net_socket_socks5__client__socket.cc
	+++ www/iridium/files/patch-net_socket_socks5__client__socket.cc
	@@ -1,4 +1,4 @@
	---- net/socket/socks5_client_socket.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/socket/socks5_client_socket.cc.orig 2019-04-30 22:22:55 UTC
	+++ net/socket/socks5_client_socket.cc
	@@ -4,6 +4,10 @@

	@@ -10,4 +10,4 @@
	+
	#include <utility>

	- #include "base/callback_helpers.h"
	+ #include "base/bind.h"
	Index: www/iridium/files/patch-net_socket_udp__socket__posix.h
	===================================================================
	--- www/iridium/files/patch-net_socket_udp__socket__posix.h
	+++ www/iridium/files/patch-net_socket_udp__socket__posix.h
	@@ -0,0 +1,11 @@
	+--- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC
	++++ net/socket/udp_socket_posix.h
	+@@ -33,7 +33,7 @@
	+
	+ #if defined(__ANDROID__) && defined(__aarch64__)
	+ #define HAVE_SENDMMSG 1
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #define HAVE_SENDMMSG 1
	+ #else
	+ #define HAVE_SENDMMSG 0
	Index: www/iridium/files/patch-net_socket_udp__socket__posix.cc
	===================================================================
	--- www/iridium/files/patch-net_socket_udp__socket__posix.cc
	+++ www/iridium/files/patch-net_socket_udp__socket__posix.cc
	@@ -1,6 +1,6 @@
	---- net/socket/udp_socket_posix.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/socket/udp_socket_posix.cc.orig 2019-09-09 21:55:22 UTC
	+++ net/socket/udp_socket_posix.cc
	-@@ -68,7 +68,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
	+@@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
	const base::TimeDelta kActivityMonitorMsThreshold =
	base::TimeDelta::FromMilliseconds(100);

	@@ -9,7 +9,7 @@
	// When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS
	// requires passing IPv4 address instead of interface index. This function
	// resolves IPv4 address by interface index. The \|address\| is returned in
	-@@ -97,7 +97,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
	+@@ -98,7 +98,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
	return OK;
	}

	@@ -57,7 +57,7 @@
	rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));

	return rv == 0 ? OK : MapSystemError(errno);
	-@@ -937,19 +940,24 @@ int UDPSocketPosix::SetMulticastOptions() {
	+@@ -935,7 +938,7 @@ int UDPSocketPosix::SetMulticastOptions() {
	if (multicast_interface_ != 0) {
	switch (addr_family_) {
	case AF_INET: {
	@@ -66,26 +66,19 @@
	ip_mreq mreq = {};
	int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
	&mreq.imr_interface.s_addr);
	- if (error != OK)
	- return error;
	--#else // defined(OS_MACOSX)
	-+#else // defined(OS_MACOSX) \|\| defined(OS_BSD)
	- ip_mreqn mreq = {};
	- mreq.imr_ifindex = multicast_interface_;
	+@@ -947,7 +950,11 @@ int UDPSocketPosix::SetMulticastOptions() {
	mreq.imr_address.s_addr = htonl(INADDR_ANY);
	--#endif // !defined(OS_MACOSX)
	-+#endif // !defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ #endif // !defined(OS_MACOSX)
	int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
	+#if defined(OS_BSD)
	-+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr),
	-+ sizeof(mreq.imr_interface.s_addr));
	++ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr));
	+#else
	reinterpret_cast<const char*>(&mreq), sizeof(mreq));
	+#endif
	if (rv)
	return MapSystemError(errno);
	break;
	-@@ -1011,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
	+@@ -1009,7 +1016,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
	if (addr_family_ != AF_INET)
	return ERR_ADDRESS_INVALID;

	@@ -94,7 +87,7 @@
	ip_mreq mreq = {};
	int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
	&mreq.imr_interface.s_addr);
	-@@ -1059,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
	+@@ -1057,9 +1064,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
	case IPAddress::kIPv4AddressSize: {
	if (addr_family_ != AF_INET)
	return ERR_ADDRESS_INVALID;
	Index: www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc
	===================================================================
	--- www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc
	+++ www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc
	@@ -0,0 +1,11 @@
	+--- net/socket/unix_domain_client_socket_posix.cc.orig 2019-06-07 19:59:03 UTC
	++++ net/socket/unix_domain_client_socket_posix.cc
	+@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st
	+ return true;
	+ }
	+
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // Convert the path given into abstract socket name. It must start with
	+ // the '\0' character, so we are adding it. \|addr_len\| must specify the
	+ // length of the structure exactly, as potentially the socket name may
	Index: www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
	===================================================================
	--- www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
	+++ www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
	@@ -1,10 +0,0 @@
	---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC
	-+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc
	-@@ -13,6 +13,7 @@
	- #include <ws2bth.h>
	- #elif defined(OS_POSIX) \|\| defined(OS_FUCHSIA)
	- #include <netinet/in.h>
	-+#include <sys/socket.h>
	- #endif
	-
	- using std::string;
	Index: www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
	===================================================================
	--- www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
	+++ www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
	@@ -1,6 +1,6 @@
	---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-07-24 18:58:33 UTC
	+++ net/tools/cert_verify_tool/cert_verify_tool.cc
	-@@ -27,7 +27,7 @@
	+@@ -28,7 +28,7 @@
	#include "net/url_request/url_request_context_builder.h"
	#include "net/url_request/url_request_context_getter.h"

	@@ -9,8 +9,8 @@
	#include "net/proxy_resolution/proxy_config.h"
	#include "net/proxy_resolution/proxy_config_service_fixed.h"
	#endif
	-@@ -46,7 +46,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ
	- base::WaitableEvent* initialization_complete_event) {
	+@@ -49,7 +49,7 @@ void SetUpOnNetworkThread(
	+ base::WaitableEvent* initialization_complete_event) {
	net::URLRequestContextBuilder url_request_context_builder;
	url_request_context_builder.set_user_agent(GetUserAgent());
	-#if defined(OS_LINUX)
	Index: www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
	===================================================================
	--- www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
	+++ www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
	@@ -1,6 +1,6 @@
	---- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-03-17 15:38:01 UTC
	+--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-10-21 19:06:39 UTC
	+++ net/tools/quic/quic_http_proxy_backend.cc
	-@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
	+@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
	// Enable HTTP2, but disable QUIC on the backend
	context_builder.SetSpdyAndQuicEnabled(true /* http2 /, false / quic */);

	Index: www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
	===================================================================
	--- www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
	+++ www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h
	@@ -0,0 +1,20 @@
	+--- net/traffic_annotation/network_traffic_annotation.h.orig 2019-09-16 09:58:42 UTC
	++++ net/traffic_annotation/network_traffic_annotation.h
	+@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
	+ } // namespace net
	+
	+ // Placeholder for unannotated usages.
	+-#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS)
	++#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
	+ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
	+ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
	+ #endif
	+@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
	+ //
	+ // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or
	+ // TRAFFIC_ANNOTATION_FOR_TESTS.
	+-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
	+ #define NO_TRAFFIC_ANNOTATION_YET \
	+ net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.")
	+
	Index: www/iridium/files/patch-net_url__request_url__fetcher.h
	===================================================================
	--- www/iridium/files/patch-net_url__request_url__fetcher.h
	+++ www/iridium/files/patch-net_url__request_url__fetcher.h
	@@ -0,0 +1,11 @@
	+--- net/url_request/url_fetcher.h.orig 2019-10-30 16:19:33 UTC
	++++ net/url_request/url_fetcher.h
	+@@ -113,7 +113,7 @@ class NET_EXPORT URLFetcher {
	+ // The unannotated Create() methods are not available on desktop Linux +
	+ // Windows. They are available on other platforms, since we only audit network
	+ // annotations on Linux & Windows.
	+-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
	+ // \|url\| is the URL to send the request to. It must be valid.
	+ // \|request_type\| is the type of request to make.
	+ // \|d\| the object that will receive the callback on fetch completion.
	Index: www/iridium/files/patch-net_url__request_url__fetcher.cc
	===================================================================
	--- www/iridium/files/patch-net_url__request_url__fetcher.cc
	+++ www/iridium/files/patch-net_url__request_url__fetcher.cc
	@@ -0,0 +1,11 @@
	+--- net/url_request/url_fetcher.cc.orig 2019-10-30 16:19:14 UTC
	++++ net/url_request/url_fetcher.cc
	+@@ -11,7 +11,7 @@ namespace net {
	+
	+ URLFetcher::~URLFetcher() = default;
	+
	+-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
	+ // static
	+ std::unique_ptr<URLFetcher> URLFetcher::Create(
	+ const GURL& url,
	Index: www/iridium/files/patch-net_url__request_url__request__context.h
	===================================================================
	--- www/iridium/files/patch-net_url__request_url__request__context.h
	+++ www/iridium/files/patch-net_url__request_url__request__context.h
	@@ -0,0 +1,11 @@
	+--- net/url_request/url_request_context.h.orig 2019-10-30 16:20:11 UTC
	++++ net/url_request/url_request_context.h
	+@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext
	+ // session.
	+ const HttpNetworkSession::Context* GetNetworkSessionContext() const;
	+
	+-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
	+ // This function should not be used in Chromium, please use the version with
	+ // NetworkTrafficAnnotationTag in the future.
	+ //
	Index: www/iridium/files/patch-net_url__request_url__request__context.cc
	===================================================================
	--- www/iridium/files/patch-net_url__request_url__request__context.cc
	+++ www/iridium/files/patch-net_url__request_url__request__context.cc
	@@ -0,0 +1,11 @@
	+--- net/url_request/url_request_context.cc.orig 2019-10-30 16:19:57 UTC
	++++ net/url_request/url_request_context.cc
	+@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext::
	+ return &network_session->context();
	+ }
	+
	+-#if (!defined(OS_WIN) && !defined(OS_LINUX)) \|\| defined(OS_CHROMEOS)
	++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) \|\| defined(OS_CHROMEOS)
	+ std::unique_ptr<URLRequest> URLRequestContext::CreateRequest(
	+ const GURL& url,
	+ RequestPriority priority,
	Index: www/iridium/files/patch-net_url__request_url__request__context__builder.cc
	===================================================================
	--- www/iridium/files/patch-net_url__request_url__request__context__builder.cc
	+++ www/iridium/files/patch-net_url__request_url__request__context__builder.cc
	@@ -1,6 +1,6 @@
	---- net/url_request/url_request_context_builder.cc.orig 2019-03-11 22:01:01 UTC
	+--- net/url_request/url_request_context_builder.cc.orig 2019-10-21 19:06:39 UTC
	+++ net/url_request/url_request_context_builder.cc
	-@@ -520,7 +520,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
	+@@ -519,7 +519,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
	}

	if (!proxy_resolution_service_) {
	@@ -9,3 +9,12 @@
	// TODO(willchan): Switch to using this code when
	// ProxyResolutionService::CreateSystemProxyConfigService()'s signature
	// doesn't suck.
	+@@ -528,7 +528,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
	+ ProxyResolutionService::CreateSystemProxyConfigService(
	+ base::ThreadTaskRunnerHandle::Get().get());
	+ }
	+-#endif // !defined(OS_LINUX) && !defined(OS_ANDROID)
	++#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
	+ proxy_resolution_service_ = CreateProxyResolutionService(
	+ std::move(proxy_config_service_), context.get(),
	+ context->host_resolver(), context->network_delegate(),
	Index: www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
	===================================================================
	--- www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
	+++ www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
	@@ -1,74 +1,56 @@
	---- pdf/pdfium/pdfium_engine.cc.orig 2019-03-11 22:01:01 UTC
	+--- pdf/pdfium/pdfium_engine.cc.orig 2019-10-21 19:06:39 UTC
	+++ pdf/pdfium/pdfium_engine.cc
	-@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
	+@@ -53,7 +53,7 @@
	+ #include "ui/gfx/geometry/rect.h"
	+ #include "v8/include/v8.h"

	- PDFiumEngine* g_engine_for_fontmapper = nullptr;
	-
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "pdf/pdfium/pdfium_font_linux.h"
	+ #endif

	- PP_Instance g_last_instance_id;
	-
	-@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) {
	- fontinfo_with_metrics->default_sysfontinfo->Release(
	- fontinfo_with_metrics->default_sysfontinfo);
	- }
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	-
	- PDFiumEngine::CreateDocumentLoaderFunction
	- g_create_document_loader_for_testing = nullptr;
	-@@ -663,7 +663,7 @@ bool InitializeSDK() {
	+@@ -378,7 +378,7 @@ bool InitializeSDK(bool enable_v8) {
	config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
	FPDF_InitLibraryWithConfig(&config);

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- // Font loading doesn't work in the renderer sandbox in Linux.
	- FPDF_SetSystemFontInfo(&g_font_info);
	- #else
	-@@ -688,7 +688,7 @@ bool InitializeSDK() {
	-
	- void ShutdownSDK() {
	- FPDF_DestroyLibrary();
	--#if !defined(OS_LINUX)
	-+#if !defined(OS_LINUX) && !defined(OS_BSD)
	- delete g_font_info;
	+ InitializeLinuxFontMapper();
	#endif
	- TearDownV8();
	-@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
	+
	+@@ -414,7 +414,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
	IFSDK_PAUSE::user = nullptr;
	IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// PreviewModeClient does not know its pp::Instance.
	- pp::Instance* instance = client_->GetPluginInstance();
	- if (instance)
	-@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
	+ SetLastInstance(client_->GetPluginInstance());
	+ #endif
	+@@ -870,7 +870,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(

	KillFormFocus();

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- g_last_instance_id = client_->GetPluginInstance()->pp_instance();
	+ SetLastInstance(client_->GetPluginInstance());
	#endif

	-@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
	+@@ -2696,7 +2696,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
	DCHECK(image_data);

	last_progressive_start_time_ = base::Time::Now();
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- g_last_instance_id = client_->GetPluginInstance()->pp_instance();
	+ SetLastInstance(client_->GetPluginInstance());
	#endif

	-@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
	+@@ -3190,7 +3190,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
	FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
	}
	most_visible_page_ = index;
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- g_last_instance_id = client_->GetPluginInstance()->pp_instance();
	+ SetLastInstance(client_->GetPluginInstance());
	#endif
	if (most_visible_page_ != -1 && called_do_document_action_) {
	Index: www/iridium/files/patch-ppapi_proxy_flash__resource.cc
	===================================================================
	--- www/iridium/files/patch-ppapi_proxy_flash__resource.cc
	+++ www/iridium/files/patch-ppapi_proxy_flash__resource.cc
	@@ -0,0 +1,11 @@
	+--- ppapi/proxy/flash_resource.cc.orig 2019-09-16 10:01:18 UTC
	++++ ppapi/proxy/flash_resource.cc
	+@@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan
	+ // require filesystem access prohibited by the sandbox.
	+ // TODO(shess): Figure out why OSX needs the access, the sandbox warmup should
	+ // handle it. http://crbug.com/149006
	+-#if defined(OS_LINUX) \|\| defined(OS_MACOSX)
	++#if defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD)
	+ int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>(
	+ BROWSER,
	+ PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)),
	Index: www/iridium/files/patch-printing_backend_print__backend__cups.h
	===================================================================
	--- www/iridium/files/patch-printing_backend_print__backend__cups.h
	+++ www/iridium/files/patch-printing_backend_print__backend__cups.h
	@@ -1,11 +0,0 @@
	---- printing/backend/print_backend_cups.h.orig 2019-03-11 22:01:01 UTC
	-+++ printing/backend/print_backend_cups.h
	-@@ -5,6 +5,8 @@
	- #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
	- #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
	-
	-+#include <cups/ppd.h>
	-+
	- #include <string>
	-
	- #include "base/files/file_util.h"
	Index: www/iridium/files/patch-remoting_base_chromoting__event.cc
	===================================================================
	--- www/iridium/files/patch-remoting_base_chromoting__event.cc
	+++ www/iridium/files/patch-remoting_base_chromoting__event.cc
	@@ -1,8 +1,8 @@
	---- remoting/base/chromoting_event.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/base/chromoting_event.cc.orig 2019-09-09 21:55:22 UTC
	+++ remoting/base/chromoting_event.cc
	-@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() {
	+@@ -188,7 +188,7 @@ void ChromotingEvent::AddSystemInfo() {
	SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
	- SetString(kOsVersionKey, GetOperatingSystemVersionString());
	+ SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
	SetString(kWebAppVersionKey, STRINGIZE(VERSION));
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-remoting_host_host__attributes.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_host__attributes.cc
	+++ www/iridium/files/patch-remoting_host_host__attributes.cc
	@@ -1,6 +1,6 @@
	---- remoting/host/host_attributes.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/host/host_attributes.cc.orig 2019-09-09 21:55:22 UTC
	+++ remoting/host/host_attributes.cc
	-@@ -123,7 +123,7 @@ std::string GetHostAttributes() {
	+@@ -124,7 +124,7 @@ std::string GetHostAttributes() {
	media::InitializeMediaFoundation()) {
	result.push_back("HWEncoder");
	}
	Index: www/iridium/files/patch-remoting_host_host__details.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_host__details.cc
	+++ www/iridium/files/patch-remoting_host_host__details.cc
	@@ -1,6 +1,6 @@
	---- remoting/host/host_details.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/host/host_details.cc.orig 2019-09-09 21:55:22 UTC
	+++ remoting/host/host_details.cc
	-@@ -24,7 +24,7 @@ std::string GetHostOperatingSystemName() {
	+@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() {
	return "Mac";
	#elif defined(OS_CHROMEOS)
	return "ChromeOS";
	Index: www/iridium/files/patch-remoting_host_host__main.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_host__main.cc
	+++ www/iridium/files/patch-remoting_host_host__main.cc
	@@ -0,0 +1,27 @@
	+--- remoting/host/host_main.cc.orig 2019-10-30 16:20:58 UTC
	++++ remoting/host/host_main.cc
	+@@ -49,9 +49,9 @@ int DesktopProcessMain();
	+ int FileChooserMain();
	+ int RdpDesktopSessionMain();
	+ #endif // defined(OS_WIN)
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ int XSessionChooserMain();
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ namespace {
	+
	+@@ -146,10 +146,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro
	+ } else if (process_type == kProcessTypeRdpDesktopSession) {
	+ main_routine = &RdpDesktopSessionMain;
	+ #endif // defined(OS_WIN)
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ } else if (process_type == kProcessTypeXSessionChooser) {
	+ main_routine = &XSessionChooserMain;
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+ }
	+
	+ return main_routine;
	Index: www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
	+++ www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
	@@ -1,6 +1,6 @@
	---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-10-21 19:06:39 UTC
	+++ remoting/host/it2me/it2me_native_messaging_host_main.cc
	-@@ -27,12 +27,12 @@
	+@@ -28,12 +28,12 @@
	#include "remoting/host/resources.h"
	#include "remoting/host/usage_stats_consent.h"

	@@ -15,7 +15,7 @@

	#if defined(OS_MACOSX)
	#include "base/mac/scoped_nsautorelease_pool.h"
	-@@ -106,7 +106,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
	+@@ -108,7 +108,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv

	remoting::LoadResources("");

	@@ -24,7 +24,7 @@
	// Required in order for us to run multiple X11 threads.
	XInitThreads();

	-@@ -122,7 +122,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
	+@@ -124,7 +124,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
	// Need to prime the host OS version value for linux to prevent IO on the
	// network thread. base::GetLinuxDistro() caches the result.
	base::GetLinuxDistro();
	Index: www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
	+++ www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc
	@@ -1,4 +1,4 @@
	---- remoting/host/me2me_desktop_environment.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/host/me2me_desktop_environment.cc.orig 2019-09-09 21:55:22 UTC
	+++ remoting/host/me2me_desktop_environment.cc
	@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(

	Index: www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
	+++ www/iridium/files/patch-remoting_host_remoting__me2me__host.cc
	@@ -1,6 +1,6 @@
	---- remoting/host/remoting_me2me_host.cc.orig 2019-03-11 22:01:01 UTC
	+--- remoting/host/remoting_me2me_host.cc.orig 2019-10-21 19:06:39 UTC
	+++ remoting/host/remoting_me2me_host.cc
	-@@ -117,13 +117,13 @@
	+@@ -120,13 +120,13 @@
	#include "remoting/host/mac/permission_utils.h"
	#endif // defined(OS_MACOSX)

	@@ -16,7 +16,7 @@

	#if defined(OS_WIN)
	#include <commctrl.h>
	-@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting";
	+@@ -161,11 +161,11 @@ const char kApplicationName[] = "chromoting";
	const char kStdinConfigPath[] = "-";
	#endif // !defined(REMOTING_MULTI_PROCESS)

	@@ -30,7 +30,7 @@

	#if defined(OS_POSIX)
	// The command line switch used to pass name of the unix domain socket used to
	-@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate,
	+@@ -358,7 +358,7 @@ class HostProcess : public ConfigWatcher::Delegate,

	std::unique_ptr<ChromotingHostContext> context_;

	@@ -39,7 +39,7 @@
	// Watch for certificate changes and kill the host when changes occur
	std::unique_ptr<CertificateWatcher> cert_watcher_;
	#endif
	-@@ -567,10 +567,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
	+@@ -555,10 +555,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm
	enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
	if (enable_window_capture_) {

	@@ -52,7 +52,7 @@

	// uint32_t is large enough to hold window IDs on all platforms.
	uint32_t window_id;
	-@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() {
	+@@ -753,7 +753,7 @@ void HostProcess::CreateAuthenticatorFactory() {
	DCHECK(third_party_auth_config_.token_url.is_valid());
	DCHECK(third_party_auth_config_.token_validation_url.is_valid());

	@@ -61,7 +61,7 @@
	if (!cert_watcher_) {
	cert_watcher_.reset(new CertificateWatcher(
	base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode),
	-@@ -849,7 +849,7 @@ void HostProcess::StartOnUiThread() {
	+@@ -839,7 +839,7 @@ void HostProcess::StartOnUiThread() {
	base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
	base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));

	@@ -70,7 +70,7 @@
	// If an audio pipe is specific on the command-line then initialize
	// AudioCapturerLinux to capture from it.
	base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
	-@@ -858,7 +858,7 @@ void HostProcess::StartOnUiThread() {
	+@@ -848,7 +848,7 @@ void HostProcess::StartOnUiThread() {
	remoting::AudioCapturerLinux::InitializePipeReader(
	context_->audio_task_runner(), audio_pipe_name);
	}
	@@ -79,7 +79,7 @@

	#if defined(OS_POSIX)
	base::FilePath security_key_socket_name =
	-@@ -916,7 +916,7 @@ void HostProcess::ShutdownOnUiThread() {
	+@@ -903,7 +903,7 @@ void HostProcess::ShutdownOnUiThread() {
	// It is now safe for the HostProcess to be deleted.
	self_ = nullptr;

	@@ -88,7 +88,7 @@
	// Cause the global AudioPipeReader to be freed, otherwise the audio
	// thread will remain in-use and prevent the process from exiting.
	// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
	-@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() {
	+@@ -1532,7 +1532,7 @@ void HostProcess::StartHost() {
	host_->AddExtension(std::make_unique<TestEchoExtension>());

	// TODO(simonmorris): Get the maximum session duration from a policy.
	@@ -97,7 +97,7 @@
	host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
	#endif

	-@@ -1719,7 +1719,7 @@ void HostProcess::OnCrash(const std::string& function_
	+@@ -1711,7 +1711,7 @@ void HostProcess::OnCrash(const std::string& function_
	int HostProcessMain() {
	HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);

	Index: www/iridium/files/patch-remoting_host_switches.h
	===================================================================
	--- www/iridium/files/patch-remoting_host_switches.h
	+++ www/iridium/files/patch-remoting_host_switches.h
	@@ -0,0 +1,14 @@
	+--- remoting/host/switches.h.orig 2019-10-30 16:21:42 UTC
	++++ remoting/host/switches.h
	+@@ -34,9 +34,9 @@ extern const char kProcessTypeHost[];
	+ extern const char kProcessTypeRdpDesktopSession[];
	+ extern const char kProcessTypeEvaluateCapability[];
	+ extern const char kProcessTypeFileChooser[];
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ extern const char kProcessTypeXSessionChooser[];
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ extern const char kEvaluateCapabilitySwitchName[];
	+
	Index: www/iridium/files/patch-remoting_host_switches.cc
	===================================================================
	--- www/iridium/files/patch-remoting_host_switches.cc
	+++ www/iridium/files/patch-remoting_host_switches.cc
	@@ -0,0 +1,14 @@
	+--- remoting/host/switches.cc.orig 2019-10-30 16:21:28 UTC
	++++ remoting/host/switches.cc
	+@@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host";
	+ const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session";
	+ const char kProcessTypeEvaluateCapability[] = "evaluate_capability";
	+ const char kProcessTypeFileChooser[] = "file_chooser";
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ const char kProcessTypeXSessionChooser[] = "xsession_chooser";
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ const char kEvaluateCapabilitySwitchName[] = "evaluate-type";
	+
	Index: www/iridium/files/patch-remoting_resources_remoting__strings.grd
	===================================================================
	--- www/iridium/files/patch-remoting_resources_remoting__strings.grd
	+++ www/iridium/files/patch-remoting_resources_remoting__strings.grd
	@@ -0,0 +1,20 @@
	+--- remoting/resources/remoting_strings.grd.orig 2019-10-30 16:22:45 UTC
	++++ remoting/resources/remoting_strings.grd
	+@@ -1332,7 +1332,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
	+ Not Now
	+ </message>
	+ </if>
	+- <if expr="is_linux">
	++ <if expr="is_posix">
	+ <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog.">
	+ Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.)
	+ </message>
	+@@ -1348,7 +1348,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium.
	+ <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session.">
	+ Launch the default XSession
	+ </message>
	+- </if> <!-- is_linux -->
	++ </if> <!-- is_posix -->
	+ </messages>
	+ </release>
	+ </grit>
	Index: www/iridium/files/patch-sandbox_linux_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-sandbox_linux_BUILD.gn
	+++ www/iridium/files/patch-sandbox_linux_BUILD.gn
	@@ -1,4 +1,4 @@
	---- sandbox/linux/BUILD.gn.orig 2019-04-10 10:50:05 UTC
	+--- sandbox/linux/BUILD.gn.orig 2019-03-11 22:01:01 UTC
	+++ sandbox/linux/BUILD.gn
	@@ -12,12 +12,12 @@ if (is_android) {
	}
	@@ -16,7 +16,7 @@
	}

	if (is_nacl_nonsfi) {
	-@@ -382,7 +382,7 @@ component("sandbox_services") {
	+@@ -379,7 +379,7 @@ component("sandbox_services") {
	public_deps += [ ":sandbox_services_headers" ]
	}

	@@ -25,7 +25,7 @@
	cflags = [ "-fgnu-inline-asm" ]

	sources -= [
	-@@ -390,6 +390,8 @@ component("sandbox_services") {
	+@@ -387,6 +387,8 @@ component("sandbox_services") {
	"services/init_process_reaper.h",
	"services/scoped_process.cc",
	"services/scoped_process.h",
	@@ -34,7 +34,7 @@
	"services/yama.cc",
	"services/yama.h",
	"syscall_broker/broker_channel.cc",
	-@@ -408,6 +410,10 @@ component("sandbox_services") {
	+@@ -405,6 +407,10 @@ component("sandbox_services") {
	"syscall_broker/broker_process.h",
	"syscall_broker/broker_simple_message.cc",
	"syscall_broker/broker_simple_message.h",
	Index: www/iridium/files/patch-services_audio_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_audio_BUILD.gn
	+++ www/iridium/files/patch-services_audio_BUILD.gn
	@@ -1,6 +1,6 @@
	---- services/audio/BUILD.gn.orig 2019-03-11 22:01:01 UTC
	+--- services/audio/BUILD.gn.orig 2019-04-30 22:22:56 UTC
	+++ services/audio/BUILD.gn
	-@@ -106,7 +106,7 @@ source_set("lib") {
	+@@ -99,7 +99,7 @@ source_set("lib") {
	"//services/service_manager/sandbox:sandbox",
	]

	Index: www/iridium/files/patch-services_catalog_store.h
	===================================================================
	--- www/iridium/files/patch-services_catalog_store.h
	+++ www/iridium/files/patch-services_catalog_store.h
	@@ -1,10 +0,0 @@
	---- services/catalog/store.h.orig 2019-03-11 22:01:01 UTC
	-+++ services/catalog/store.h
	-@@ -38,6 +38,7 @@ class Store {
	- static const char kRequiredFilesKey_PlatformValue_MacOSX[];
	- static const char kRequiredFilesKey_PlatformValue_Android[];
	- static const char kRequiredFilesKey_PlatformValue_Fuchsia[];
	-+ static const char kRequiredFilesKey_PlatformValue_FreeBSD[];
	- };
	-
	- } // namespace catalog
	Index: www/iridium/files/patch-services_catalog_store.cc
	===================================================================
	--- www/iridium/files/patch-services_catalog_store.cc
	+++ www/iridium/files/patch-services_catalog_store.cc
	@@ -1,10 +0,0 @@
	---- services/catalog/store.cc.orig 2019-03-11 22:01:01 UTC
	-+++ services/catalog/store.cc
	-@@ -38,5 +38,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO
	- const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android";
	- // static
	- const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia";
	-+// static
	-+const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd";
	-
	- } // namespace catalog
	Index: www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h
	===================================================================
	--- www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h
	+++ www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h
	@@ -1,20 +0,0 @@
	---- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC
	-+++ services/content/simple_browser/simple_browser_service.h
	-@@ -16,7 +16,7 @@
	- #include "services/service_manager/public/cpp/service_binding.h"
	- #include "services/service_manager/public/mojom/service.mojom.h"
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "components/services/font/public/cpp/font_loader.h" // nogncheck
	- #endif
	-
	-@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe
	- // service_manager::Service:
	- void OnStart() override;
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- sk_sp<font_service::FontLoader> font_loader_;
	- #endif
	-
	Index: www/iridium/files/patch-services_device_device__service.h
	===================================================================
	--- www/iridium/files/patch-services_device_device__service.h
	+++ www/iridium/files/patch-services_device_device__service.h
	@@ -1,11 +0,0 @@
	---- services/device/device_service.h.orig 2019-03-17 14:44:04 UTC
	-+++ services/device/device_service.h
	-@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service
	- #endif
	-
	- #if (defined(OS_LINUX) && defined(USE_UDEV)) \|\| defined(OS_WIN) \|\| \
	-- defined(OS_MACOSX)
	-+ defined(OS_MACOSX) \|\| defined(OS_BSD)
	- // Requests for the SerialPortManager interface must be bound to
	- // \|serial_port_manager_\| on \|serial_port_manager_task_runner_\| and it will
	- // be destroyed on that sequence.
	Index: www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
	===================================================================
	--- www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
	+++ www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
	@@ -1,11 +1,11 @@
	---- services/device/geolocation/location_arbitrator.cc.orig 2019-03-11 22:01:01 UTC
	+--- services/device/geolocation/location_arbitrator.cc.orig 2019-06-04 18:55:28 UTC
	+++ services/device/geolocation/location_arbitrator.cc
	-@@ -164,7 +164,7 @@ LocationArbitrator::NewNetworkLocationProvider(
	+@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider(
	+
	std::unique_ptr<LocationProvider>
	LocationArbitrator::NewSystemLocationProvider() {
	- #if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| \
	-- defined(OS_FUCHSIA)
	-+ 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_FUCHSIA)
	return nullptr;
	#else
	- return device::NewSystemLocationProvider();
	Index: www/iridium/files/patch-services_device_hid_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_device_hid_BUILD.gn
	+++ www/iridium/files/patch-services_device_hid_BUILD.gn
	@@ -1,4 +1,4 @@
	---- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC
	+--- services/device/hid/BUILD.gn.orig 2019-06-04 18:55:28 UTC
	+++ services/device/hid/BUILD.gn
	@@ -51,6 +51,19 @@ source_set("hid") {
	deps += [ "//device/udev_linux" ]
	@@ -18,5 +18,5 @@
	+ }
	+
	if (is_chromeos) {
	- deps += [ "//chromeos/dbus" ]
	+ deps += [ "//chromeos/dbus/permission_broker" ]
	}
	Index: www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
	===================================================================
	--- www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
	+++ www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
	@@ -1,4 +1,4 @@
	---- services/device/hid/hid_connection_freebsd.h.orig 2019-04-15 17:58:16 UTC
	+--- services/device/hid/hid_connection_freebsd.h.orig 2019-05-01 15:21:27 UTC
	+++ services/device/hid/hid_connection_freebsd.h
	@@ -0,0 +1,68 @@
	+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
	Index: www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
	===================================================================
	--- www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
	+++ www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
	@@ -1,4 +1,4 @@
	---- services/device/hid/hid_connection_freebsd.cc.orig 2019-04-15 17:58:16 UTC
	+--- services/device/hid/hid_connection_freebsd.cc.orig 2019-05-04 09:19:19 UTC
	+++ services/device/hid/hid_connection_freebsd.cc
	@@ -0,0 +1,240 @@
	+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
	@@ -57,7 +57,7 @@
	+ WriteCallback callback) {
	+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
	+ base::ScopedBlockingCall scoped_blocking_call(
	-+ base::BlockingType::MAY_BLOCK);
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+
	+ auto data = buffer->front();
	+ size_t size = buffer->size();
	@@ -83,7 +83,7 @@
	+ ReadCallback callback) {
	+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
	+ base::ScopedBlockingCall scoped_blocking_call(
	-+ base::BlockingType::MAY_BLOCK);
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+ struct usb_gen_descriptor ugd;
	+ ugd.ugd_report_type = UHID_FEATURE_REPORT;
	+ ugd.ugd_data = buffer->front();
	@@ -233,7 +233,7 @@
	+ scoped_refptr<base::RefCountedBytes> buffer,
	+ WriteCallback callback) {
	+ base::ScopedBlockingCall scoped_blocking_call(
	-+ base::BlockingType::MAY_BLOCK);
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+ blocking_task_runner_->PostTask(
	+ FROM_HERE,
	+ base::BindOnce(&BlockingTaskHelper::SendFeatureReport,
	Index: www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
	===================================================================
	--- www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
	+++ www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
	@@ -1,6 +1,6 @@
	---- services/device/hid/hid_service_freebsd.cc.orig 2019-04-15 17:58:16 UTC
	+--- services/device/hid/hid_service_freebsd.cc.orig 2019-10-30 16:46:42 UTC
	+++ services/device/hid/hid_service_freebsd.cc
	-@@ -0,0 +1,373 @@
	+@@ -0,0 +1,375 @@
	+// Copyright 2014 The Chromium Authors. All rights reserved.
	+// Use of this source code is governed by a BSD-style license that can be
	+// found in the LICENSE file.
	@@ -19,6 +19,7 @@
	+#include "base/bind.h"
	+#include "base/files/file_descriptor_watcher_posix.h"
	+#include "base/files/file_enumerator.h"
	++#include "base/files/file.h"
	+#include "base/location.h"
	+#include "base/logging.h"
	+#include "base/posix/eintr_wrapper.h"
	@@ -111,7 +112,7 @@
	+
	+ void OnDeviceAdded(std::string device_id) {
	+ base::ScopedBlockingCall scoped_blocking_call(
	-+ base::BlockingType::MAY_BLOCK);
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+ std::string device_node = "/dev/" + device_id;
	+ uint16_t vendor_id = 0xffff;
	+ uint16_t product_id = 0xffff;
	@@ -171,7 +172,7 @@
	+
	+ void OnDeviceRemoved(std::string device_id) {
	+ base::ScopedBlockingCall scoped_blocking_call(
	-+ base::BlockingType::MAY_BLOCK);
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+ task_runner_->PostTask(
	+ FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_,
	+ device_id));
	@@ -315,7 +316,8 @@
	+// static
	+void HidServiceFreeBSD::OpenOnBlockingThread(
	+ std::unique_ptr<ConnectParams> params) {
	-+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
	++ base::ScopedBlockingCall scoped_blocking_call(
	++ FROM_HERE, base::BlockingType::MAY_BLOCK);
	+ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
	+
	+ base::FilePath device_path(params->device_info->device_node());
	Index: www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
	===================================================================
	--- www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
	+++ www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc
	@@ -1,6 +1,6 @@
	---- services/device/serial/serial_io_handler_posix.cc.orig 2019-03-11 22:01:01 UTC
	+--- services/device/serial/serial_io_handler_posix.cc.orig 2019-04-30 22:22:56 UTC
	+++ services/device/serial/serial_io_handler_posix.cc
	-@@ -65,7 +65,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
	+@@ -66,7 +66,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
	BITRATE_TO_SPEED_CASE(9600)
	BITRATE_TO_SPEED_CASE(19200)
	BITRATE_TO_SPEED_CASE(38400)
	Index: www/iridium/files/patch-services_device_usb_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_device_usb_BUILD.gn
	+++ www/iridium/files/patch-services_device_usb_BUILD.gn
	@@ -0,0 +1,11 @@
	+--- services/device/usb/BUILD.gn.orig 2019-09-09 21:55:22 UTC
	++++ services/device/usb/BUILD.gn
	+@@ -110,7 +110,7 @@ static_library("usb") {
	+ ]
	+ }
	+
	+- if (is_android \|\| is_chromeos \|\| is_linux) {
	++ if ((is_android \|\| is_chromeos \|\| is_linux) && !is_bsd) {
	+ sources += [
	+ "usb_device_handle_usbfs.cc",
	+ "usb_device_handle_usbfs.h",
	Index: www/iridium/files/patch-services_network_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_network_BUILD.gn
	+++ www/iridium/files/patch-services_network_BUILD.gn
	@@ -1,6 +1,6 @@
	---- services/network/BUILD.gn.orig 2019-03-11 22:01:01 UTC
	+--- services/network/BUILD.gn.orig 2019-10-21 19:06:39 UTC
	+++ services/network/BUILD.gn
	-@@ -248,7 +248,6 @@ jumbo_component("network_service") {
	+@@ -261,7 +261,6 @@ jumbo_component("network_service") {

	if (is_linux) {
	deps += [
	Index: www/iridium/files/patch-services_network_network__context.cc
	===================================================================
	--- www/iridium/files/patch-services_network_network__context.cc
	+++ www/iridium/files/patch-services_network_network__context.cc
	@@ -1,25 +1,7 @@
	---- services/network/network_context.cc.orig 2019-03-11 22:01:01 UTC
	+--- services/network/network_context.cc.orig 2019-10-21 19:06:39 UTC
	+++ services/network/network_context.cc
	-@@ -132,7 +132,7 @@
	- #endif // defined(USE_NSS_CERTS)
	+@@ -1776,7 +1776,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC

	- #if defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| \
	-- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	-+ ((defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	- #include "net/cert/cert_net_fetcher.h"
	- #include "net/cert_net/cert_net_fetcher_impl.h"
	- #endif
	-@@ -610,7 +610,7 @@ NetworkContext::~NetworkContext() {
	- #endif
	-
	- #if defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| \
	-- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	-+ ((defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	- net::ShutdownGlobalCertNetFetcher();
	- #endif
	- }
	-@@ -1700,7 +1700,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
	-
	net::CookieCryptoDelegate* crypto_delegate = nullptr;
	if (params_->enable_encrypted_cookies) {
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)
	@@ -27,12 +9,3 @@
	DCHECK(network_service_->os_crypt_config_set())
	<< "NetworkService::SetCryptConfig must be called before creating a "
	"NetworkContext with encrypted cookies.";
	-@@ -2015,7 +2015,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar
	- net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get());
	- #endif
	- #if defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| \
	-- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	-+ ((defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)) \|\| defined(OS_MACOSX)
	- net::SetGlobalCertNetFetcher(
	- net::CreateCertNetFetcher(result.url_request_context.get()));
	- #endif
	Index: www/iridium/files/patch-services_network_network__service.h
	===================================================================
	--- www/iridium/files/patch-services_network_network__service.h
	+++ www/iridium/files/patch-services_network_network__service.h
	@@ -1,7 +1,7 @@
	---- services/network/network_service.h.orig 2019-03-11 22:01:01 UTC
	+--- services/network/network_service.h.orig 2019-10-21 19:06:39 UTC
	+++ services/network/network_service.h
	-@@ -186,7 +186,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
	- #endif // !BUILDFLAG(IS_CT_SUPPORTED)
	+@@ -152,7 +152,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
	+ mojom::NetworkService::GetNetworkListCallback callback) override;
	void UpdateCRLSet(base::span<const uint8_t> crl_set) override;
	void OnCertDBChanged() override;
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-services_network_network__service.cc
	===================================================================
	--- www/iridium/files/patch-services_network_network__service.cc
	+++ www/iridium/files/patch-services_network_network__service.cc
	@@ -1,6 +1,6 @@
	---- services/network/network_service.cc.orig 2019-03-21 00:36:59 UTC
	+--- services/network/network_service.cc.orig 2019-10-21 19:06:39 UTC
	+++ services/network/network_service.cc
	-@@ -61,7 +61,7 @@
	+@@ -62,7 +62,7 @@
	#include "third_party/boringssl/src/include/openssl/cpu.h"
	#endif

	@@ -9,7 +9,7 @@
	#include "components/os_crypt/key_storage_config_linux.h"
	#endif

	-@@ -605,7 +605,7 @@ void NetworkService::OnCertDBChanged() {
	+@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() {
	net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged();
	}

	Index: www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
	===================================================================
	--- www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
	+++ www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
	@@ -0,0 +1,20 @@
	+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-09-09 21:55:22 UTC
	++++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
	+@@ -43,7 +43,7 @@ namespace {
	+ uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump,
	+ uint32_t shared_resident_kb) {
	+ DCHECK(os_dump.platform_private_footprint);
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
	+ uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
	+ return (rss_anon_bytes + vm_swap_bytes) / 1024;
	+@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
	+ os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
	+ os_dump->private_footprint_kb =
	+ CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ os_dump->private_footprint_swap_kb =
	+ internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
	+ #endif
	Index: www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
	===================================================================
	--- www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
	+++ www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
	@@ -1,6 +1,6 @@
	---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-03-11 22:01:02 UTC
	+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC
	+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
	-@@ -26,9 +26,9 @@ class COMPONENT_EXPORT(
	+@@ -28,9 +28,9 @@ class COMPONENT_EXPORT(
	mojom::RawOSMemDump*);
	static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId);

	@@ -12,3 +12,21 @@

	private:
	FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps);
	+@@ -44,7 +44,7 @@ class COMPONENT_EXPORT(
	+ static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId);
	+ #endif
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ // Provides information on the dump state of resident pages.
	+ enum class MappedAndResidentPagesDumpState {
	+ // Access to /proc/<pid>/pagemap can be denied for android devices running
	+@@ -68,7 +68,7 @@ class COMPONENT_EXPORT(
	+ // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after
	+ // making sure that peak RSS is useful.
	+ static size_t GetPeakResidentSetSize(base::ProcessId pid);
	+-#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID)
	++#endif // defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD)
	+ };
	+
	+ } // namespace memory_instrumentation
	Index: www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
	===================================================================
	--- www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
	+++ www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
	@@ -1,6 +1,6 @@
	---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-04-05 00:49:26 UTC
	+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC
	+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
	-@@ -17,8 +17,10 @@
	+@@ -22,8 +22,10 @@
	#include "build/build_config.h"
	#include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"

	@@ -11,23 +11,23 @@

	namespace memory_instrumentation {

	-@@ -67,6 +69,7 @@ struct ModuleData {
	+@@ -86,6 +88,7 @@ struct ModuleData {

	ModuleData GetMainModuleData() {
	ModuleData module_data;
	+#if !defined(OS_BSD)
	Dl_info dl_info;
	if (dladdr(&__ehdr_start, &dl_info)) {
	- base::Optional<std::string> build_id =
	-@@ -76,6 +79,7 @@ ModuleData GetMainModuleData() {
	- module_data.build_id = *build_id;
	+ base::debug::ElfBuildIdBuffer build_id;
	+@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() {
	+ module_data.build_id = std::string(build_id, build_id_length);
	}
	}
	+#endif
	return module_data;
	}

	-@@ -123,14 +127,14 @@ bool ParseSmapsHeader(const char* header_line,
	+@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line,
	// Build ID is needed to symbolize heap profiles, and is generated only on
	// official builds. Build ID is only added for the current library (chrome)
	// since it is racy to read other libraries which can be unmapped any time.
	@@ -44,37 +44,60 @@

	return res;
	}
	-@@ -217,6 +221,9 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) {
	- // static
	- bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
	+@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
	mojom::RawOSMemDump* dump) {
	-+#if defined(OS_BSD)
	-+ return false;
	-+#else
	- base::ScopedFD autoclose = OpenStatm(pid);
	+ // TODO(chiniforooshan): There is no need to read both /statm and /status
	+ // files. Refactor to get everything from /status using ProcessMetric.
	++#if !defined(OS_BSD)
	+ auto statm_file = GetProcPidDir(pid).Append("statm");
	+ auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY));
	int statm_fd = autoclose.get();
	+@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,

	-@@ -242,10 +249,12 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
	- dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024;
	-
	- return true;
	+ if (!success)
	+ return false;
	++#else
	++ uint64_t resident_pages = 0;
	++ uint64_t shared_pages = 0;
	+#endif
	- }

	+ auto process_metrics = CreateProcessMetrics(pid);
	+
	+@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
	+
	// static
	std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) {
	+#if defined(OS_BSD)
	++ NOTIMPLEMENTED();
	++ return std::vector<VmRegionPtr>();
	++#else
	std::vector<VmRegionPtr> maps;
	uint32_t res = 0;
	if (g_proc_smaps_for_testing) {
	-@@ -263,6 +272,10 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa
	+@@ -310,6 +323,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa
	return std::vector<VmRegionPtr>();

	return maps;
	-+#else
	++#endif
	+ }
	+
	+ // static
	+@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
	+ const size_t start_address,
	+ const size_t end_address,
	+ std::vector<uint8_t>* accessed_pages_bitmap) {
	++#if defined(OS_BSD)
	+ NOTIMPLEMENTED();
	-+ return std::vector<VmRegionPtr>();
	++ return OSMetrics::MappedAndResidentPagesDumpState::kFailure;
	++#else
	+ const char* kPagemap = "/proc/self/pagemap";
	+
	+ base::ScopedFILE pagemap_file(fopen(kPagemap, "r"));
	+@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics::
	+ }
	+ }
	+ return OSMetrics::MappedAndResidentPagesDumpState::kSuccess;
	+#endif
	}

	- } // namespace memory_instrumentation
	+ // static
	Index: www/iridium/files/patch-services_service__manager_embedder_main.cc
	===================================================================
	--- www/iridium/files/patch-services_service__manager_embedder_main.cc
	+++ www/iridium/files/patch-services_service__manager_embedder_main.cc
	@@ -1,6 +1,6 @@
	---- services/service_manager/embedder/main.cc.orig 2019-03-11 22:01:02 UTC
	+--- services/service_manager/embedder/main.cc.orig 2019-10-21 19:06:40 UTC
	+++ services/service_manager/embedder/main.cc
	-@@ -320,7 +320,7 @@ int Main(const MainParams& params) {
	+@@ -272,7 +272,7 @@ int Main(const MainParams& params) {
	#endif
	base::EnableTerminationOnOutOfMemory();

	Index: www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
	+++ www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
	@@ -1,6 +1,6 @@
	---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-03-11 22:01:02 UTC
	+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-04-30 22:22:56 UTC
	+++ services/service_manager/public/cpp/service_executable/BUILD.gn
	-@@ -30,6 +30,11 @@ source_set("support") {
	+@@ -29,6 +29,11 @@ source_set("support") {
	"//sandbox/linux:seccomp_bpf",
	]
	}
	@@ -11,4 +11,4 @@
	+ }
	}

	- # Service executable targets should link against this to get a boilerplate entry
	+ source_set("switches") {
	Index: www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn
	+++ www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn
	@@ -1,11 +0,0 @@
	---- services/service_manager/runner/host/BUILD.gn.orig 2019-03-11 22:01:02 UTC
	-+++ services/service_manager/runner/host/BUILD.gn
	-@@ -30,7 +30,7 @@ source_set("lib") {
	- "//mojo/public/cpp/system",
	- ]
	-
	-- if (is_linux) {
	-+ if (is_linux && !is_bsd) {
	- deps += [ "//sandbox/linux:sandbox_services" ]
	- }
	-
	Index: www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc
	===================================================================
	--- www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc
	+++ www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc
	@@ -1,4 +1,4 @@
	---- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC
	+--- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC
	+++ services/service_manager/zygote/zygote_linux.cc
	@@ -1,6 +1,7 @@
	// Copyright (c) 2012 The Chromium Authors. All rights reserved.
	@@ -8,7 +8,7 @@

	#include "services/service_manager/zygote/zygote_linux.h"

	-@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
	+@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
	}

	} // namespace service_manager
	Index: www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc
	===================================================================
	--- www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc
	+++ www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc
	@@ -0,0 +1,20 @@
	+--- services/video_capture/broadcasting_receiver.cc.orig 2019-10-21 19:06:40 UTC
	++++ services/video_capture/broadcasting_receiver.cc
	+@@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
	+ void CloneSharedBufferToRawFileDescriptorHandle(
	+ const mojo::ScopedSharedBufferHandle& source,
	+ media::mojom::VideoBufferHandlePtr* target) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // \|source\| is unwrapped to a \|PlatformSharedMemoryRegion\|, from whence a file
	+ // descriptor can be extracted which is then mojo-wrapped.
	+ base::subtle::PlatformSharedMemoryRegion platform_region =
	+@@ -178,7 +178,7 @@ void BroadcastingReceiver::BufferContext::
	+ ConvertRawFileDescriptorToSharedBuffer() {
	+ DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // The conversion unwraps the descriptor from its mojo handle to the raw file
	+ // descriptor (ie, an int). This is used to create a
	+ // PlatformSharedMemoryRegion which is then wrapped as a
	Index: www/iridium/files/patch-third__party_angle_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_angle_BUILD.gn
	+++ www/iridium/files/patch-third__party_angle_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/angle/BUILD.gn.orig 2019-03-11 22:07:58 UTC
	+--- third_party/angle/BUILD.gn.orig 2019-10-21 19:09:09 UTC
	+++ third_party/angle/BUILD.gn
	-@@ -276,6 +276,7 @@ angle_static_library("angle_gpu_info_util") {
	+@@ -353,6 +353,7 @@ angle_static_library("angle_gpu_info_util") {
	"X11",
	"Xi",
	"Xext",
	@@ -8,8 +8,8 @@
	]
	}
	}
	-@@ -842,10 +843,6 @@ foreach(is_shared_library,
	- libs = []
	+@@ -1076,10 +1077,6 @@ foreach(is_shared_library,
	+
	if (is_linux) {
	sources += util_linux_sources
	- libs += [
	Index: www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
	+++ www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
	@@ -1,6 +1,6 @@
	---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-03-11 22:07:59 UTC
	+--- third_party/angle/src/libANGLE/Display.cpp.orig 2019-10-21 19:09:09 UTC
	+++ third_party/angle/src/libANGLE/Display.cpp
	-@@ -64,7 +64,7 @@
	+@@ -68,7 +68,7 @@
	#if defined(ANGLE_ENABLE_VULKAN)
	# if defined(ANGLE_PLATFORM_WINDOWS)
	# include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
	@@ -9,7 +9,7 @@
	# include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
	# elif defined(ANGLE_PLATFORM_ANDROID)
	# include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
	-@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
	+@@ -268,7 +268,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
	#if defined(ANGLE_ENABLE_VULKAN)
	# if defined(ANGLE_PLATFORM_WINDOWS)
	impl = new rx::DisplayVkWin32(state);
	Index: www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
	===================================================================
	--- www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
	+++ www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
	@@ -1,6 +1,6 @@
	---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-03-11 22:07:59 UTC
	+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-10-21 19:09:09 UTC
	+++ third_party/angle/src/libANGLE/renderer/driver_utils.h
	-@@ -107,7 +107,7 @@ inline bool IsWindows()
	+@@ -114,7 +114,7 @@ inline bool IsWindows()

	inline bool IsLinux()
	{
	Index: www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
	===================================================================
	--- www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
	+++ www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
	@@ -1,6 +1,6 @@
	---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-03-11 22:08:05 UTC
	+--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-04-30 22:25:57 UTC
	+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
	-@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d
	+@@ -229,7 +229,7 @@ void *loader_device_heap_realloc(const struct loader_d
	}

	// Environment variables
	Index: www/iridium/files/patch-third__party_blink_renderer_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_BUILD.gn
	+++ www/iridium/files/patch-third__party_blink_renderer_BUILD.gn
	@@ -0,0 +1,13 @@
	+--- third_party/blink/renderer/BUILD.gn.orig 2019-07-29 20:47:32 UTC
	++++ third_party/blink/renderer/BUILD.gn
	+@@ -45,8 +45,8 @@ config("inside_blink") {
	+ "-Wconversion",
	+ "-Wno-float-conversion",
	+ "-Wno-sign-conversion",
	+- "-Wno-implicit-float-conversion",
	+- "-Wno-implicit-int-conversion",
	++# "-Wno-implicit-float-conversion",
	++# "-Wno-implicit-int-conversion",
	+ ]
	+ }
	+ }
	Index: www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
	@@ -1,7 +1,7 @@
	---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC
	+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-09-09 21:55:24 UTC
	+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
	-@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline =
	- TimeDelta::FromMicroseconds(100);
	+@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
	+ base::TimeDelta::FromMicroseconds(100);

	/* The value is based on user statistics on Nov 2017. */
	-#if (defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_WIN))
	Index: www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC
	+--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-10-21 19:06:43 UTC
	+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
	-@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext {
	+@@ -121,7 +121,7 @@ class InternalPopupMenu::ItemIterationContext {
	is_in_group_(false),
	buffer_(buffer) {
	DCHECK(buffer_);
	Index: www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
	@@ -1,11 +1,11 @@
	---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-03-11 22:01:03 UTC
	+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-09-09 21:55:24 UTC
	+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
	-@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
	+@@ -184,7 +184,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t

	- std::vector<std::string> InspectorMemoryAgent::Symbolize(
	- const std::vector<void*>& addresses) {
	+ Vector<String> InspectorMemoryAgent::Symbolize(
	+ const WebVector<void*>& addresses) {
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// TODO(alph): Move symbolization to the client.
	- std::vector<void*> addresses_to_symbolize;
	- for (void* address : addresses) {
	+ Vector<void*> addresses_to_symbolize;
	+ for (size_t i = 0; i < addresses.size(); i++) {
	Index: www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
	@@ -1,15 +1,15 @@
	---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC
	+--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-09-09 21:55:24 UTC
	+++ third_party/blink/renderer/core/layout/layout_view.cc
	@@ -58,7 +58,7 @@
	+ #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h"
	#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
	- #include "third_party/blink/renderer/platform/transforms/transform_state.h"

	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	#include "third_party/blink/renderer/platform/fonts/font_cache.h"
	#endif

	-@@ -321,7 +321,7 @@ void LayoutView::UpdateLayout() {
	+@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() {
	DCHECK(!layout_state_);
	LayoutState root_layout_state(*this);

	Index: www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
	@@ -1,4 +1,4 @@
	---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-03-11 22:01:03 UTC
	+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-10-21 19:06:43 UTC
	+++ third_party/blink/renderer/core/paint/paint_layer.cc
	@@ -104,7 +104,7 @@ namespace {
	static CompositingQueryMode g_compositing_query_mode =
	Index: www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-03-11 22:01:03 UTC
	+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-10-21 19:06:43 UTC
	+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
	-@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos
	+@@ -338,7 +338,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos

	bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
	const WebMouseEvent& event) {
	@@ -9,3 +9,12 @@
	if (event.button == WebPointerProperties::Button::kMiddle)
	return true;
	#endif
	+@@ -353,7 +353,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin(
	+ // Disable snapback on desktop Linux to better integrate with the desktop
	+ // behavior. Typically, Linux apps do not implement scrollbar snapback (this is
	+ // true for at least GTK and QT apps).
	+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ return false;
	+ #endif
	+
	Index: www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc
	@@ -0,0 +1,20 @@
	+--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2019-10-30 16:30:37 UTC
	++++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc
	+@@ -84,7 +84,7 @@ void LogAudioProcesingProperties(
	+ } // namespace
	+
	+ bool IsApmInAudioServiceEnabled() {
	+-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	++#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
	+ #else
	+ return false;
	+@@ -427,7 +427,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
	+ bool key_pressed) {
	+ #if defined(OS_WIN) \|\| defined(OS_MACOSX)
	+ DCHECK_LE(volume, 1.0);
	+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_OPENBSD)
	++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // We have a special situation on Linux where the microphone volume can be
	+ // "higher than maximum". The input volume slider in the sound preference
	+ // allows the user to set a scaling that is higher than 100%. It means that
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-09-09 21:55:25 UTC
	+++ third_party/blink/renderer/platform/BUILD.gn
	-@@ -129,6 +129,7 @@ executable("character_data_generator") {
	+@@ -103,6 +103,7 @@ executable("character_data_generator") {
	"//build/win:default_exe_manifest",
	"//third_party/icu",
	]
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-10-21 19:06:44 UTC
	+++ third_party/blink/renderer/platform/fonts/font_cache.h
	-@@ -157,7 +157,7 @@ class PLATFORM_EXPORT FontCache {
	+@@ -158,7 +158,7 @@ class PLATFORM_EXPORT FontCache {
	sk_sp<SkFontMgr> FontManager() { return font_manager_; }
	static void SetFontManager(sk_sp<SkFontMgr>);

	@@ -9,7 +9,7 @@
	// These are needed for calling QueryRenderStyleForStrike, since
	// gfx::GetFontRenderParams makes distinctions based on DSF.
	static float DeviceScaleFactor() { return device_scale_factor_; }
	-@@ -218,7 +218,7 @@ class PLATFORM_EXPORT FontCache {
	+@@ -233,7 +233,7 @@ class PLATFORM_EXPORT FontCache {
	const FontDescription&);
	#endif // defined(OS_ANDROID)

	@@ -17,8 +17,8 @@
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	struct PlatformFallbackFont {
	String name;
	- CString filename;
	-@@ -230,7 +230,7 @@ class PLATFORM_EXPORT FontCache {
	+ std::string filename;
	+@@ -245,7 +245,7 @@ class PLATFORM_EXPORT FontCache {
	static void GetFontForCharacter(UChar32,
	const char* preferred_locale,
	PlatformFallbackFont*);
	@@ -27,23 +27,23 @@

	scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
	const FontPlatformData*,
	-@@ -294,12 +294,12 @@ class PLATFORM_EXPORT FontCache {
	+@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache {
	const FontFaceCreationParams&,
	- CString& name);
	+ std::string& name);

	--#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
	UChar32,
	const FontDescription&,
	FontFallbackPriority);
	--#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	-+#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)

	- scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&,
	- UChar32);
	-@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache {
	- bool is_test_font_mgr_ = false;
	+ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(
	+ const FontDescription&,
	+@@ -355,7 +355,7 @@ class PLATFORM_EXPORT FontCache {
	+ mojom::blink::DWriteFontProxyPtr service_;
	#endif // defined(OS_WIN)

	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-09-09 21:55:26 UTC
	+++ third_party/blink/renderer/platform/fonts/font_cache.cc
	-@@ -66,7 +66,7 @@ namespace blink {
	+@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye";

	SkFontMgr* FontCache::static_font_manager_ = nullptr;

	@@ -9,7 +9,7 @@
	float FontCache::device_scale_factor_ = 1.0;
	#endif

	-@@ -89,7 +89,7 @@ FontCache::FontCache()
	+@@ -115,7 +115,7 @@ FontCache::FontCache()
	FontPlatformData* FontCache::SystemFontPlatformData(
	const FontDescription& font_description) {
	const AtomicString& family = FontCache::SystemFontFamily();
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
	@@ -1,8 +1,8 @@
	---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-06-04 18:55:30 UTC
	+++ third_party/blink/renderer/platform/fonts/font_description.cc
	@@ -38,7 +38,7 @@
	- #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
	#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
	+ #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h"

	-#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS)
	+#if defined(OS_LINUX) \|\| defined(OS_CHROMEOS) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC
	+++ third_party/blink/renderer/platform/fonts/font_metrics.cc
	-@@ -39,7 +39,7 @@
	+@@ -38,7 +38,7 @@

	namespace blink {

	@@ -9,7 +9,7 @@
	// This is the largest VDMX table which we'll try to load and parse.
	static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB
	#endif
	-@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks(
	+@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks(
	int vdmx_ascent = 0, vdmx_descent = 0;
	bool is_vdmx_valid = false;

	@@ -18,7 +18,7 @@
	// Manually digging up VDMX metrics is only applicable when bytecode hinting
	// using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever
	// done. This code should be pushed into FreeType (hinted font metrics).
	-@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks(
	+@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks(
	visual_overflow_inflation_for_ascent = 1;
	if (descent < metrics.fDescent) {
	visual_overflow_inflation_for_descent = 1;
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
	@@ -1,15 +1,15 @@
	---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-06-04 18:55:30 UTC
	+++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
	-@@ -10,7 +10,7 @@
	+@@ -8,7 +8,7 @@
	#if defined(OS_ANDROID)
	- #include "third_party/blink/public/platform/modules/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
	+ #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
	#include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h"
	-#elif defined(OS_LINUX)
	+#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	#include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h"
	#elif defined(OS_WIN)
	- #include "third_party/blink/public/mojom/dwrite_font_proxy/dwrite_font_proxy.mojom-blink.h"
	-@@ -26,7 +26,7 @@ std::unique_ptr<FontUniqueNameLookup>
	+ #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h"
	+@@ -23,7 +23,7 @@ std::unique_ptr<FontUniqueNameLookup>
	FontUniqueNameLookup::GetPlatformUniqueNameLookup() {
	#if defined(OS_ANDROID)
	return std::make_unique<FontUniqueNameLookupAndroid>();
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
	@@ -1,24 +1,24 @@
	---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-09-09 21:55:26 UTC
	+++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
	-@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) {
	+@@ -59,7 +59,7 @@ AtomicString ToAtomicString(const SkString& str) {
	return AtomicString::FromUTF8(str.c_str(), str.size());
	}

	--#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	- // Android special locale for retrieving the color emoji font
	- // based on the proposed changes in UTR #51 for introducing
	- // an Emoji script code:
	-@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter(
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	+ // This function is called on android or when we are emulating android fonts on
	+ // linux and the embedder has overriden the default fontManager with
	+ // WebFontRendering::setSkiaFontMgr.
	+@@ -82,7 +82,7 @@ AtomicString FontCache::GetFamilyNameForCharacter(
	typeface->getFamilyName(&skia_family_name);
	return ToAtomicString(skia_family_name);
	}
	--#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	-+#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX)
	++#endif // defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)

	void FontCache::PlatformInit() {}

	-@@ -249,7 +249,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
	+@@ -227,7 +227,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
	}
	#endif

	@@ -27,12 +27,12 @@
	// On linux if the fontManager has been overridden then we should be calling
	// the embedder provided font Manager rather than calling
	// SkTypeface::CreateFromName which may redirect the call to the default font
	-@@ -276,7 +276,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
	- CString name;
	+@@ -254,7 +254,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
	+ std::string name;

	sk_sp<SkTypeface> typeface;
	-#if defined(OS_ANDROID) \|\| defined(OS_LINUX)
	+#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	if (alternate_name == AlternateFontName::kLocalUniqueFace &&
	RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) {
	- typeface = CreateTypefaceFromUniqueName(creation_params, name);
	+ typeface = CreateTypefaceFromUniqueName(creation_params);
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
	@@ -1,14 +0,0 @@
	---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC
	-+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc
	-@@ -15,6 +15,11 @@
	- extern "C" void* __libc_stack_end; // NOLINT
	- #endif
	-
	-+#if defined(OS_FREEBSD)
	-+#include <sys/signal.h>
	-+#include <pthread_np.h>
	-+#endif
	-+
	- namespace blink {
	-
	- static const char* g_avoid_optimization = nullptr;
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
	@@ -1,16 +0,0 @@
	---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-03-11 22:01:04 UTC
	-+++ third_party/blink/renderer/platform/wtf/BUILD.gn
	-@@ -267,8 +267,12 @@ jumbo_component("wtf") {
	- if (is_android) {
	- libs = [ "log" ]
	- }
	-- if (is_linux) {
	-+ if (is_linux && !is_bsd) {
	- libs = [ "dl" ]
	-+ }
	-+
	-+ if (is_bsd) {
	-+ libs = [ "execinfo" ]
	- }
	-
	- if (is_mac) {
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
	@@ -1,11 +0,0 @@
	---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC
	-+++ third_party/blink/renderer/platform/wtf/assertions.cc
	-@@ -48,7 +48,7 @@
	- #include <windows.h>
	- #endif
	-
	--#if defined(OS_MACOSX) \|\| (defined(OS_LINUX) && !defined(__UCLIBC__))
	-+#if defined(OS_MACOSX) \|\| ((defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(__UCLIBC__))
	- #include <cxxabi.h>
	- #include <dlfcn.h>
	- #include <execinfo.h>
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
	@@ -1,4 +1,4 @@
	---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-06-04 18:55:30 UTC
	+++ third_party/blink/renderer/platform/wtf/container_annotations.h
	@@ -10,7 +10,7 @@

	@@ -9,3 +9,19 @@
	#define ANNOTATE_CONTIGUOUS_CONTAINER
	#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
	if (buffer) { \
	+@@ -35,13 +35,13 @@
	+ ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
	+ // Annotations require buffers to begin on an 8-byte boundary.
	+
	+-#else // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64
	++#else // ADDRESS_SANITIZER && (OS_LINUX \|\| OS_BSD) && ARCH_CPU_X86_64
	+
	+ #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)
	+ #define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize)
	+ #define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize)
	+ #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity)
	+
	+-#endif // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64
	++#endif // ADDRESS_SANITIZER && (OS_LINUX \|\| OS_BSD) && ARCH_CPU_X86_64
	+
	+ #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_CONTAINER_ANNOTATIONS_H_
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-06-04 18:55:30 UTC
	+++ third_party/blink/renderer/platform/wtf/stack_util.cc
	-@@ -18,6 +18,11 @@
	+@@ -17,6 +17,11 @@
	extern "C" void* __libc_stack_end; // NOLINT
	#endif

	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
	@@ -1,29 +0,0 @@
	---- third_party/blink/renderer/platform/wtf/threading.cc.orig 2019-03-11 22:01:04 UTC
	-+++ third_party/blink/renderer/platform/wtf/threading.cc
	-@@ -17,12 +17,16 @@
	- #error Blink does not support threading on your platform.
	- #endif
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include <sys/syscall.h>
	- #elif defined(OS_ANDROID)
	- #include <sys/types.h>
	- #endif
	-
	-+#if defined(OS_BSD)
	-+#include <pthread_np.h>
	-+#endif
	-+
	- namespace WTF {
	-
	- // Current thread identity
	-@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() {
	- return syscall(__NR_gettid);
	- #elif defined(OS_ANDROID)
	- return gettid();
	-+#elif defined(OS_BSD)
	-+ return pthread_getthreadid_np();
	- #else
	- return reinterpret_cast<uintptr_t>(pthread_self());
	- #endif
	Index: www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
	===================================================================
	--- www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
	+++ www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
	@@ -1,6 +1,6 @@
	---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-03-11 22:01:04 UTC
	+--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-10-21 19:06:45 UTC
	+++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc
	-@@ -52,12 +52,17 @@
	+@@ -51,12 +51,17 @@
	#include <objc/objc-auto.h>
	#endif

	Index: www/iridium/files/patch-third__party_boringssl_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_boringssl_BUILD.gn
	+++ www/iridium/files/patch-third__party_boringssl_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/boringssl/BUILD.gn.orig 2019-03-11 22:01:15 UTC
	+--- third_party/boringssl/BUILD.gn.orig 2019-04-30 22:23:27 UTC
	+++ third_party/boringssl/BUILD.gn
	-@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	+@@ -74,7 +74,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	} else if (current_cpu == "x64") {
	if (is_mac) {
	sources += crypto_sources_mac_x86_64
	@@ -9,7 +9,7 @@
	sources += crypto_sources_linux_x86_64
	} else {
	public_configs = [ ":no_asm_config" ]
	-@@ -79,13 +79,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	+@@ -82,13 +82,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	} else if (current_cpu == "x86") {
	if (is_mac) {
	sources += crypto_sources_mac_x86
	@@ -25,7 +25,7 @@
	sources += crypto_sources_linux_arm
	} else if (is_ios) {
	sources += crypto_sources_ios_arm
	-@@ -93,7 +93,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	+@@ -96,7 +96,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
	public_configs = [ ":no_asm_config" ]
	}
	} else if (current_cpu == "arm64") {
	Index: www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
	===================================================================
	--- www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
	+++ www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
	@@ -0,0 +1,63 @@
	+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2019-04-30 22:25:51 UTC
	++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
	+@@ -14,49 +14,35 @@
	+
	+ #include <openssl/cpu.h>
	+
	+-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
	+- !defined(OPENSSL_STATIC_ARMCAP)
	++#if defined(OPENSSL_AARCH64)
	+
	+-#include <sys/auxv.h>
	+-
	+ #include <openssl/arm_arch.h>
	+
	+ #include "internal.h"
	+
	+-
	+ extern uint32_t OPENSSL_armcap_P;
	+
	++#include <sys/types.h>
	++#include <machine/armreg.h>
	++
	+ void OPENSSL_cpuid_setup(void) {
	+- unsigned long hwcap = getauxval(AT_HWCAP);
	++ uint64_t id_aa64isar0;
	+
	+- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
	+- // these values.
	+- static const unsigned long kNEON = 1 << 1;
	+- static const unsigned long kAES = 1 << 3;
	+- static const unsigned long kPMULL = 1 << 4;
	+- static const unsigned long kSHA1 = 1 << 5;
	+- static const unsigned long kSHA256 = 1 << 6;
	++ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
	+
	+- if ((hwcap & kNEON) == 0) {
	+- // Matching OpenSSL, if NEON is missing, don't report other features
	+- // either.
	+- return;
	+- }
	+-
	+ OPENSSL_armcap_P \|= ARMV7_NEON;
	+
	+- if (hwcap & kAES) {
	++ if (ID_AA64ISAR0_AES(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) {
	+ OPENSSL_armcap_P \|= ARMV8_AES;
	+ }
	+- if (hwcap & kPMULL) {
	++ if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) {
	+ OPENSSL_armcap_P \|= ARMV8_PMULL;
	+ }
	+- if (hwcap & kSHA1) {
	++ if (ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) {
	+ OPENSSL_armcap_P \|= ARMV8_SHA1;
	+ }
	+- if (hwcap & kSHA256) {
	++ if(ID_AA64ISAR0_SHA2(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) {
	+ OPENSSL_armcap_P \|= ARMV8_SHA256;
	+ }
	+ }
	+-
	+-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
	++#endif // OPENSSL_AARCH64
	Index: www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
	===================================================================
	--- www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
	+++ www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
	@@ -1,19 +1,53 @@
	---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2019-03-11 22:07:59 UTC
	+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2019-04-30 22:25:51 UTC
	+++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
	-@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type)
	+@@ -7,8 +7,6 @@
	+ #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_
	+ #define CRC32C_CRC32C_ARM_LINUX_CHECK_H_
	+
	+-// X86-specific code checking for the availability of SSE4.2 instructions.
	+-
	+ #include <cstddef>
	+ #include <cstdint>
	+
	+@@ -16,30 +14,19 @@
	+
	+ #if HAVE_ARM64_CRC32C
	+
	+-#if HAVE_STRONG_GETAUXVAL
	+-#include <sys/auxv.h>
	+-#elif HAVE_WEAK_GETAUXVAL
	+-// getauxval() is not available on Android until API level 20. Link it as a weak
	+-// symbol.
	+-extern "C" unsigned long getauxval(unsigned long type) __attribute__((weak));
	+-
	+-#define AT_HWCAP 16
	+-#endif // HAVE_STRONG_GETAUXVAL \|\| HAVE_WEAK_GETAUXVAL
	+-
	++#include <machine/armreg.h>
	++#include <sys/types.h>
	namespace crc32c {

	- inline bool CanUseArm64Linux() {
	-+return false;
	-+#if 0
	- #if HAVE_STRONG_GETAUXVAL \|\| HAVE_WEAK_GETAUXVAL
	- // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
	- constexpr unsigned long kHWCAP_PMULL = 1 << 4;
	-@@ -39,6 +41,7 @@ inline bool CanUseArm64Linux() {
	- #else
	- return false;
	- #endif // HAVE_STRONG_GETAUXVAL \|\| HAVE_WEAK_GETAUXVAL
	-+#endif
	- }
	+-inline bool CanUseArm64Linux() {
	+-#if HAVE_STRONG_GETAUXVAL \|\| HAVE_WEAK_GETAUXVAL
	+- // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
	+- constexpr unsigned long kHWCAP_PMULL = 1 << 4;
	+- constexpr unsigned long kHWCAP_CRC32 = 1 << 7;
	+- unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0;
	+- return (hwcap & (kHWCAP_PMULL \| kHWCAP_CRC32)) ==
	+- (kHWCAP_PMULL \| kHWCAP_CRC32);
	+-#else
	+- return false;
	+-#endif // HAVE_STRONG_GETAUXVAL \|\| HAVE_WEAK_GETAUXVAL
	+-}
	++ inline bool CanUseArm64Linux() {
	++ uint64_t id_aa64isar0;
	++
	++ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
	++ if ((ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) && \
	++ (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE))
	++ return true;
	++ return false;
	++ }

	} // namespace crc32c
	+
	Index: www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
	===================================================================
	--- www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
	+++ www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
	@@ -1,11 +0,0 @@
	---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2019-03-11 22:08:00 UTC
	-+++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
	-@@ -623,7 +623,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
	- (GTEST_OS_WINDOWS \|\| GTEST_OS_CYGWIN \|\| GTEST_OS_AIX \|\| GTEST_OS_OS2)
	-
	- // Determines whether test results can be streamed to a socket.
	--#if GTEST_OS_LINUX
	-+#if GTEST_OS_LINUX \|\| GTEST_OS_FREEBSD
	- # define GTEST_CAN_STREAM_RESULTS_ 1
	- #endif
	-
	Index: www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
	===================================================================
	--- www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
	+++ www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
	@@ -1,8 +1,8 @@
	---- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2019-03-11 22:08:00 UTC
	+--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2019-04-30 22:25:52 UTC
	+++ third_party/googletest/src/googletest/src/gtest-port.cc
	-@@ -55,6 +55,11 @@
	- # include <mach/vm_map.h>
	- #endif // GTEST_OS_MAC
	+@@ -63,6 +63,11 @@
	+ # endif
	+ #endif

	+#if GTEST_OS_FREEBSD
	+#include <sys/sysctl.h>
	@@ -12,7 +12,7 @@
	#if GTEST_OS_QNX
	# include <devctl.h>
	# include <fcntl.h>
	-@@ -129,6 +134,28 @@ size_t GetThreadCount() {
	+@@ -137,6 +142,28 @@ size_t GetThreadCount() {
	} else {
	return 0;
	}
	@@ -40,4 +40,4 @@
	+ return KP_NLWP(info);
	}

	- #elif GTEST_OS_QNX
	+ #elif GTEST_OS_DRAGONFLY \|\| GTEST_OS_FREEBSD \|\| GTEST_OS_GNU_KFREEBSD \|\| \
	Index: www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
	===================================================================
	--- www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
	+++ www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
	@@ -1,11 +0,0 @@
	---- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2019-03-11 22:08:00 UTC
	-+++ third_party/googletest/src/googletest/test/googletest-port-test.cc
	-@@ -286,7 +286,7 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
	- EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1));
	- }
	-
	--#if GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\| GTEST_OS_QNX \|\| GTEST_OS_FUCHSIA
	-+#if GTEST_OS_LINUX \|\| GTEST_OS_MAC \|\| GTEST_OS_QNX \|\| GTEST_OS_FUCHSIA \|\| GTEST_OS_FREEBSD
	- void* ThreadFunc(void* data) {
	- internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
	- mutex->Lock();
	Index: www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
	===================================================================
	--- www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
	+++ www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni
	@@ -0,0 +1,20 @@
	+--- third_party/harfbuzz-ng/harfbuzz.gni.orig 2019-05-04 09:19:19 UTC
	++++ third_party/harfbuzz-ng/harfbuzz.gni
	+@@ -3,10 +3,11 @@
	+ # found in the LICENSE file.
	+
	+ declare_args() {
	+- # Blink uses a cutting-edge version of Harfbuzz; most Linux distros do not
	+- # contain a new enough version of the code to work correctly. However,
	+- # ChromeOS chroots (i.e, real ChromeOS builds for devices) do contain a
	+- # new enough version of the library, and so this variable exists so that
	+- # ChromeOS can build against the system lib and keep binary sizes smaller.
	+- use_system_harfbuzz = false
	++ # Blink uses a cutting-edge version of Harfbuzz (version listed in
	++ # third_party/harfbuzz-ng/README.chromium); most Linux distros do not contain
	++ # a new enough version of the code to work correctly. However, ChromeOS
	++ # chroots (i.e. real ChromeOS builds for devices) do contain a new enough
	++ # version of the library, and so this variable exists so that ChromeOS can
	++ # build against the system lib and keep binary sizes smaller.
	++ use_system_harfbuzz = true
	+ }
	Index: www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
	===================================================================
	--- www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
	+++ www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc
	@@ -1,6 +1,6 @@
	---- third_party/leveldatabase/env_chromium.cc.orig 2019-03-11 22:01:15 UTC
	+--- third_party/leveldatabase/env_chromium.cc.orig 2019-06-04 18:55:45 UTC
	+++ third_party/leveldatabase/env_chromium.cc
	-@@ -39,7 +39,11 @@
	+@@ -40,7 +40,11 @@
	#include "third_party/leveldatabase/leveldb_chrome.h"
	#include "third_party/leveldatabase/leveldb_features.h"
	#include "third_party/leveldatabase/src/include/leveldb/options.h"
	@@ -10,5 +10,5 @@
	#include "third_party/re2/src/re2/re2.h"
	+#endif

	- using base::FilePath;
	- using base::trace_event::MemoryAllocatorDump;
	+ #if defined(OS_WIN)
	+ #undef DeleteFile
	Index: www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
	===================================================================
	--- www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
	+++ www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
	@@ -1,11 +1,11 @@
	---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-03-11 22:08:01 UTC
	+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-10-21 19:09:13 UTC
	+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
	-@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock;
	+@@ -63,7 +63,7 @@ class Lock { (private)
	// Dummy lock implementation on non-POSIX platforms. If you are running on a
	// different platform and care about thread-safety, please compile with
	// -DI18N_PHONENUMBERS_USE_BOOST.
	--#if !defined(__linux__) && !defined(__APPLE__)
	-+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
	+-#elif !defined(__linux__) && !defined(__APPLE__)
	++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__)

	namespace i18n {
	namespace phonenumbers {
	Index: www/iridium/files/patch-third__party_nasm_config_config-linux.h
	===================================================================
	--- www/iridium/files/patch-third__party_nasm_config_config-linux.h
	+++ www/iridium/files/patch-third__party_nasm_config_config-linux.h
	@@ -0,0 +1,29 @@
	+--- third_party/nasm/config/config-linux.h.orig 2019-04-30 22:25:54 UTC
	++++ third_party/nasm/config/config-linux.h
	+@@ -117,7 +117,7 @@
	+ #define HAVE_ACCESS 1
	+
	+ /* Define to 1 if you have the `canonicalize_file_name' function. */
	+-#define HAVE_CANONICALIZE_FILE_NAME 1
	++/* #undef HAVE_CANONICALIZE_FILE_NAME */
	+
	+ /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
	+ /* #undef HAVE_CPU_TO_LE16 */
	+@@ -161,7 +161,7 @@
	+ #define HAVE_DECL_STRSEP 1
	+
	+ /* Define to 1 if you have the <endian.h> header file. */
	+-#define HAVE_ENDIAN_H 1
	++/* #undef HAVE_ENDIAN_H */
	+
	+ /* Define to 1 if you have the `faccessat' function. */
	+ #define HAVE_FACCESSAT 1
	+@@ -322,7 +322,7 @@
	+ #define HAVE_SYSCONF 1
	+
	+ /* Define to 1 if you have the <sys/endian.h> header file. */
	+-/* #undef HAVE_SYS_ENDIAN_H */
	++#define HAVE_SYS_ENDIAN_H 1
	+
	+ /* Define to 1 if you have the <sys/mman.h> header file. */
	+ #define HAVE_SYS_MMAN_H 1
	Index: www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
	+++ www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp
	@@ -0,0 +1,11 @@
	+--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC
	++++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp
	+@@ -9,7 +9,7 @@
	+ #include "build/build_config.h"
	+ #include "core/fxcrt/fx_system.h"
	+
	+-#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| \
	++#if defined(OS_ANDROID) \|\| defined(OS_LINUX) \|\| defined(OS_MACOSX) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_ASMJS) \|\| defined(__wasm__)
	+ #include <sys/time.h>
	+ #include <time.h>
	Index: www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
	+++ www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
	@@ -1,11 +1,11 @@
	---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-03-11 22:08:02 UTC
	+--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC
	+++ third_party/pdfium/core/fxcrt/fx_system.h
	-@@ -41,7 +41,7 @@
	+@@ -26,7 +26,7 @@
	+ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
	#elif defined(_WIN64)
	- #define _FX_OS_ _FX_OS_WIN64_
	#define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
	-#elif defined(__linux__)
	+#elif defined(__linux__) \|\| defined(__FreeBSD__)
	- #define _FX_OS_ _FX_OS_LINUX_
	#define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
	#elif defined(__APPLE__)
	+ #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_
	Index: www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
	+++ www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
	@@ -1,6 +1,6 @@
	---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-03-11 22:08:02 UTC
	+--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-07-24 19:03:29 UTC
	+++ third_party/pdfium/core/fxge/fx_ge_linux.cpp
	-@@ -146,9 +146,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa
	+@@ -151,9 +151,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa
	const char** pUserPaths) {
	auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
	if (!pInfo->ParseFontCfg(pUserPaths)) {
	Index: www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
	+++ www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
	@@ -1,6 +1,6 @@
	---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-03-11 22:08:02 UTC
	+--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-06-04 18:58:01 UTC
	+++ third_party/pdfium/fxjs/cjs_publicmethods.cpp
	-@@ -85,6 +85,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
	+@@ -86,6 +86,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
	constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
	L"h:MM:ss tt"};

	Index: www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
	+++ www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
	@@ -1,6 +1,6 @@
	---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC
	+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC
	+++ third_party/pdfium/fxjs/fx_date_helpers.cpp
	-@@ -34,6 +34,11 @@ double GetLocalTZA() {
	+@@ -35,6 +35,11 @@ double GetLocalTZA() {
	return 0;
	time_t t = 0;
	FXSYS_time(&t);
	@@ -10,11 +10,11 @@
	+ return (double)(-(lt.tm_gmtoff * 1000));
	+#else
	FXSYS_localtime(&t);
	- #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
	+ #if defined(OS_WIN)
	// In gcc 'timezone' is a global variable declared in time.h. In VC++, that
	-@@ -42,6 +47,7 @@ double GetLocalTZA() {
	+@@ -43,6 +48,7 @@ double GetLocalTZA() {
	_get_timezone(&timezone);
	- #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
	+ #endif
	return (double)(-(timezone * 1000));
	+#endif // __FreeBSD__
	}
	Index: www/iridium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
	+++ www/iridium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator.cc
	@@ -0,0 +1,11 @@
	+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc.orig 2019-06-04 18:58:01 UTC
	++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cc
	+@@ -117,7 +117,7 @@ void* AllocPages(void* address,
	+ uintptr_t align_base_mask = ~align_offset_mask;
	+ DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
	+
	+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && 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-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
	+++ www/iridium/files/patch-third__party_pdfium_third__party_base_allocator_partition__allocator_page__allocator__internals__posix.h
	@@ -0,0 +1,38 @@
	+--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:58:01 UTC
	++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
	+@@ -13,7 +13,7 @@
	+ #if defined(OS_MACOSX)
	+ #include <mach/mach.h>
	+ #endif
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include <sys/resource.h>
	+
	+ #include <algorithm>
	+@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
	+ }
	+ }
	+
	+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
	++#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && 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_LINUX) \|\| defined(OS_BSD)) && 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_LINUX) \|\| defined(OS_BSD)) && defined(ARCH_CPU_64_BITS)
	+ // Restore the address space limit.
	+ if (length >= kMinimumGuardedMemorySize) {
	+ CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));
	Index: www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
	+++ www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
	@@ -1,14 +1,14 @@
	---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-03-11 22:08:03 UTC
	+--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC
	+++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp
	-@@ -14,8 +14,9 @@ constexpr char kFolderSeparator = '/';
	+@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/';

	- constexpr const char* g_FontFolders[] = {
	+ constexpr const char* kFontFolders[] = {
	#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
	-- "/usr/share/fonts", "/usr/share/X11/fonts/Type1",
	-- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
	+- "/usr/share/fonts",
	+- "/usr/share/X11/fonts/Type1",
	+- "/usr/share/X11/fonts/TTF",
	+ "/usr/local/share/fonts/Type1",
	+ "/usr/local/share/fonts/TTF",
	-+ "/usr/local/share/fonts",
	- #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
	- "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts",
	- #elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
	+ "/usr/local/share/fonts",
	+ #elif defined(OS_MACOSX)
	+ "~/Library/Fonts",
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
	@@ -1,6 +1,6 @@
	---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-03-11 22:08:02 UTC
	+--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-10-21 19:09:14 UTC
	+++ third_party/perfetto/include/perfetto/base/build_config.h
	-@@ -28,6 +28,7 @@
	+@@ -40,6 +40,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
	@@ -8,7 +8,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
	-@@ -35,13 +36,15 @@
	+@@ -47,13 +48,15 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
	@@ -25,7 +25,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
	-@@ -49,6 +52,7 @@
	+@@ -61,6 +64,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
	@@ -33,7 +33,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
	-@@ -56,6 +60,7 @@
	+@@ -68,6 +72,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
	@@ -41,7 +41,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
	-@@ -63,6 +68,7 @@
	+@@ -75,6 +80,7 @@
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
	#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h
	@@ -1,14 +0,0 @@
	---- third_party/perfetto/include/perfetto/base/event.h.orig 2019-03-11 22:08:02 UTC
	-+++ third_party/perfetto/include/perfetto/base/event.h
	-@@ -20,8 +20,9 @@
	- #include "perfetto/base/build_config.h"
	- #include "perfetto/base/scoped_file.h"
	-
	--#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
	-- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
	-+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
	-+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
	-+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
	- #define PERFETTO_USE_EVENTFD() 1
	- #else
	- #define PERFETTO_USE_EVENTFD() 0
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h
	@@ -1,4 +1,4 @@
	---- third_party/perfetto/include/perfetto/base/time.h.orig 2019-03-11 22:08:02 UTC
	+--- third_party/perfetto/include/perfetto/base/time.h.orig 2019-10-21 19:09:14 UTC
	+++ third_party/perfetto/include/perfetto/base/time.h
	@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
	// Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h
	@@ -1,11 +0,0 @@
	---- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2019-03-11 22:08:02 UTC
	-+++ third_party/perfetto/include/perfetto/base/watchdog_posix.h
	-@@ -46,7 +46,7 @@ class Watchdog {
	- Timer(const Timer&) = delete;
	- Timer& operator=(const Timer&) = delete;
	-
	-- timer_t timerid_ = nullptr;
	-+ timer_t timerid_ = 0;
	- };
	- virtual ~Watchdog();
	-
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h
	@@ -0,0 +1,13 @@
	+--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2019-09-16 11:03:16 UTC
	++++ third_party/perfetto/include/perfetto/ext/base/event_fd.h
	+@@ -20,8 +20,8 @@
	+ #include "perfetto/base/build_config.h"
	+ #include "perfetto/ext/base/scoped_file.h"
	+
	+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
	+- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
	++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
	++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID))
	+ #define PERFETTO_USE_EVENTFD() 1
	+ #else
	+ #define PERFETTO_USE_EVENTFD() 0
	Index: www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
	+++ www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h
	@@ -0,0 +1,24 @@
	+--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2019-09-09 21:57:00 UTC
	++++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
	+@@ -33,6 +33,9 @@
	+ #include <sys/types.h>
	+ #include <unistd.h>
	+ #endif
	++#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
	++#include <pthread_np.h>
	++#endif
	+
	+ namespace perfetto {
	+ namespace base {
	+@@ -41,6 +44,11 @@ namespace base {
	+ using PlatformThreadID = pid_t;
	+ inline PlatformThreadID GetThreadId() {
	+ return gettid();
	++}
	++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
	++using PlatformThreadID = int;
	++inline PlatformThreadID GetThreadId() {
	++ return pthread_getthreadid_np();
	+ }
	+ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
	+ using PlatformThreadID = pid_t;
	Index: www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
	+++ www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc
	@@ -1,6 +1,6 @@
	---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-03-11 22:08:02 UTC
	+--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC
	+++ third_party/perfetto/src/base/unix_socket.cc
	-@@ -502,7 +502,8 @@ void UnixSocket::DoConnect(const std::string& socket_n
	+@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n

	void UnixSocket::ReadPeerCredentials() {
	#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) \|\| \
	Index: www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
	===================================================================
	--- www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
	+++ www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
	@@ -1,16 +1,6 @@
	---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-03-11 22:08:02 UTC
	+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-10-21 19:09:15 UTC
	+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
	-@@ -1494,7 +1494,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI
	-
	- void TracingServiceImpl::UpdateMemoryGuardrail() {
	- #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \
	-- !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX)
	-+ !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
	-+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
	- uint64_t total_buffer_bytes = 0;
	-
	- // Sum up all the shared memory buffers.
	-@@ -1545,7 +1546,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
	+@@ -2180,7 +2180,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
	protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();

	#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
	@@ -19,4 +9,4 @@
	+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
	struct {
	clockid_t id;
	- protos::ClockSnapshot::Clock::Type type;
	+ protos::ClockSnapshot::Clock::BuiltinClocks type;
	Index: www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
	===================================================================
	--- www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
	+++ www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
	@@ -1,6 +1,6 @@
	---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-03-11 22:01:16 UTC
	+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-10-21 19:07:25 UTC
	+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
	-@@ -117,7 +117,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
	+@@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR

	#undef GOOGLE_PROTOBUF_PLATFORM_ERROR

	Index: www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp
	+++ www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp
	@@ -1,6 +1,6 @@
	---- third_party/skia/src/core/SkCpu.cpp.orig 2019-03-11 22:08:22 UTC
	+--- third_party/skia/src/core/SkCpu.cpp.orig 2019-07-24 19:03:35 UTC
	+++ third_party/skia/src/core/SkCpu.cpp
	-@@ -74,6 +74,8 @@
	+@@ -76,6 +76,8 @@
	#include <sys/auxv.h>

	static uint32_t read_cpu_features() {
	@@ -9,9 +9,9 @@
	const uint32_t kHWCAP_CRC32 = (1<< 7),
	kHWCAP_ASIMDHP = (1<<10);

	-@@ -82,6 +84,7 @@
	- if (hwcaps & kHWCAP_CRC32 ) { features \|= SkCpu::CRC32; }
	- if (hwcaps & kHWCAP_ASIMDHP) { features \|= SkCpu::ASIMDHP; }
	+@@ -112,6 +114,7 @@
	+ }
	+ }
	return features;
	+#endif
	}
	Index: www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
	+++ www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
	@@ -1,6 +1,6 @@
	---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-03-11 22:08:28 UTC
	+--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-09-09 21:57:02 UTC
	+++ third_party/skia/src/images/SkJpegEncoder.cpp
	-@@ -75,9 +75,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	+@@ -76,9 +76,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	return (transform_scanline_proc) nullptr;
	};

	@@ -15,7 +15,7 @@
	case kRGBA_8888_SkColorType:
	fProc = chooseProc8888();
	jpegColorType = JCS_EXT_RGBA;
	-@@ -88,6 +93,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	+@@ -89,6 +94,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	jpegColorType = JCS_EXT_BGRA;
	numComponents = 4;
	break;
	@@ -23,7 +23,7 @@
	case kRGB_565_SkColorType:
	fProc = transform_scanline_565;
	jpegColorType = JCS_RGB;
	-@@ -107,6 +113,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	+@@ -108,6 +114,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	jpegColorType = JCS_GRAYSCALE;
	numComponents = 1;
	break;
	@@ -31,7 +31,7 @@
	case kRGBA_F16_SkColorType:
	if (kUnpremul_SkAlphaType == srcInfo.alphaType() &&
	options.fAlphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack) {
	-@@ -117,6 +124,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	+@@ -118,6 +125,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
	jpegColorType = JCS_EXT_RGBA;
	numComponents = 4;
	break;
	Index: www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h
	===================================================================
	--- www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h
	+++ www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h
	@@ -1,20 +0,0 @@
	---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2019-03-11 22:08:28 UTC
	-+++ third_party/skia/src/opts/SkRasterPipeline_opts.h
	-@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) {
	- }
	-
	- SI F from_half(U16 h) {
	--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
	-+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
	- return vcvt_f32_f16(h);
	-
	- #elif defined(JUMPER_IS_HSW) \|\| defined(JUMPER_IS_AVX512)
	-@@ -749,7 +749,7 @@ SI F from_half(U16 h) {
	- }
	-
	- SI U16 to_half(F f) {
	--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
	-+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
	- return vcvt_f16_f32(f);
	-
	- #elif defined(JUMPER_IS_HSW) \|\| defined(JUMPER_IS_AVX512)
	Index: www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
	+++ www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
	@@ -1,77 +0,0 @@
	---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-03-11 22:08:28 UTC
	-+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp
	-@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
	- : fGetVarDesignCoordinates(nullptr)
	- , fGetVarAxisFlags(nullptr)
	- , fLibrary(nullptr)
	-- , fIsLCDSupported(false)
	-- , fLCDExtra(0)
	- {
	- if (FT_New_Library(&gFTMemory, &fLibrary)) {
	- return;
	-@@ -183,12 +181,7 @@ class FreeTypeLibrary : SkNoncopyable { (public)
	- }
	- #endif
	-
	-- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
	-- // The default has changed over time, so this doesn't mean the same thing to all users.
	-- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
	-- fIsLCDSupported = true;
	-- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
	-- }
	-+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
	- }
	- ~FreeTypeLibrary() {
	- if (fLibrary) {
	-@@ -197,8 +190,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
	- }
	-
	- FT_Library library() { return fLibrary; }
	-- bool isLCDSupported() { return fIsLCDSupported; }
	-- int lcdExtra() { return fLCDExtra; }
	-
	- // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
	- // Prior to this there was no way to get the coordinates out of the FT_Face.
	-@@ -215,8 +206,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
	-
	- private:
	- FT_Library fLibrary;
	-- bool fIsLCDSupported;
	-- int fLCDExtra;
	-
	- // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
	- // The following platforms provide FreeType of at least 2.4.0.
	-@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR
	- rec->fTextSize = SkIntToScalar(1 << 14);
	- }
	-
	-- if (isLCD(*rec)) {
	-- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
	-- SkAutoMutexAcquire ama(gFTMutex);
	-- ref_ft_library();
	-- if (!gFTLibrary->isLCDSupported()) {
	-- // If the runtime Freetype library doesn't support LCD, disable it here.
	-- rec->fMaskFormat = SkMask::kA8_Format;
	-- }
	-- unref_ft_library();
	-- }
	--
	- SkFontHinting h = rec->getHinting();
	- if (kFull_SkFontHinting == h && !isLCD(*rec)) {
	- // collapse full->normal hinting if we're not doing LCD
	-@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l
	- void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
	- if (glyph->fMaskFormat == SkMask::kLCD16_Format) {
	- if (fLCDIsVert) {
	-- glyph->fHeight += gFTLibrary->lcdExtra();
	-- glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
	-+ glyph->fHeight += 2;
	-+ glyph->fTop -= 1;
	- } else {
	-- glyph->fWidth += gFTLibrary->lcdExtra();
	-- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
	-+ glyph->fWidth += 2;
	-+ glyph->fLeft -= 1;
	- }
	- }
	- }
	Index: www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h
	===================================================================
	--- www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h
	+++ www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h
	@@ -1,8 +1,8 @@
	---- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC
	+--- third_party/skia/src/sksl/SkSLString.h.orig 2019-09-09 21:57:02 UTC
	+++ third_party/skia/src/sksl/SkSLString.h
	-@@ -22,6 +22,8 @@
	- #include "SkString.h"
	- #endif
	+@@ -13,6 +13,8 @@
	+ #include <stdarg.h>
	+ #include <string>

	+#include <stdarg.h>
	+
	Index: www/iridium/files/patch-third__party_sqlite_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_sqlite_BUILD.gn
	+++ www/iridium/files/patch-third__party_sqlite_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC
	+--- third_party/sqlite/BUILD.gn.orig 2019-09-09 21:55:43 UTC
	+++ third_party/sqlite/BUILD.gn
	-@@ -251,7 +251,7 @@ config("sqlite_warnings") {
	+@@ -262,7 +262,7 @@ config("sqlite_warnings") {
	]
	}
	}
	Index: www/iridium/files/patch-third__party_swiftshader_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_BUILD.gn
	+++ www/iridium/files/patch-third__party_swiftshader_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/swiftshader/BUILD.gn.orig 2019-03-11 22:08:03 UTC
	+--- third_party/swiftshader/BUILD.gn.orig 2019-10-21 19:09:15 UTC
	+++ third_party/swiftshader/BUILD.gn
	-@@ -126,9 +126,6 @@ config("swiftshader_config") {
	+@@ -135,9 +135,6 @@ config("swiftshader_config") {
	ldflags = [ "-Wl,--gc-sections" ]

	if (target_cpu == "mipsel") {
	@@ -10,7 +10,7 @@
	if (mips_arch_variant == "r1") {
	ldflags += [
	"-mips32",
	-@@ -140,11 +137,8 @@ config("swiftshader_config") {
	+@@ -149,11 +146,8 @@ config("swiftshader_config") {
	}
	} else if (target_cpu == "mips64el") {
	ldflags += [
	Index: www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
	+++ www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
	@@ -1,6 +1,6 @@
	---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-03-11 22:08:03 UTC
	+--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-09-09 21:57:01 UTC
	+++ third_party/swiftshader/src/Main/SwiftConfig.cpp
	-@@ -762,7 +762,11 @@ namespace sw
	+@@ -764,7 +764,11 @@ namespace sw
	struct stat status;
	int lastModified = ini.getInteger("LastModified", "Time", 0);

	Index: www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
	+++ www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
	@@ -1,6 +1,6 @@
	---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-03-11 22:08:03 UTC
	+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-10-21 19:09:15 UTC
	+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp
	-@@ -686,7 +686,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
	+@@ -690,7 +690,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
	return status != 0;
	}
	return false;
	@@ -9,7 +9,7 @@
	return false; // Non X11 linux is headless only
	#elif defined(__APPLE__)
	return sw::OSX::IsValidWindow(window);
	-@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const
	+@@ -868,7 +868,7 @@ sw::Format Display::getDisplayFormat() const
	{
	return sw::FORMAT_X8R8G8B8;
	}
	Index: www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
	+++ www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
	@@ -1,6 +1,6 @@
	---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-03-11 22:08:03 UTC
	+--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-10-21 19:09:15 UTC
	+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp
	-@@ -352,7 +352,7 @@ bool WindowSurface::checkForResize()
	+@@ -362,7 +362,7 @@ bool WindowSurface::checkForResize()

	int windowWidth = windowAttributes.width;
	int windowHeight = windowAttributes.height;
	Index: www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
	+++ www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
	@@ -1,4 +1,4 @@
	---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-03-11 22:08:03 UTC
	+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-09-09 21:57:02 UTC
	+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
	@@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id)
	// FIXME: Check if display_id is the default display
	@@ -18,7 +18,7 @@
	"EGL_KHR_platform_gbm "
	#endif
	#if defined(USE_X11)
	-@@ -1248,7 +1248,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
	+@@ -1243,7 +1243,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
	{
	TRACE("(EGLenum platform = 0x%X, void native_display = %p, const EGLAttrib attrib_list = %p)", platform, native_display, attrib_list);

	Index: www/iridium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp
	+++ www/iridium/files/patch-third__party_swiftshader_src_Yarn_Thread.cpp
	@@ -0,0 +1,22 @@
	+--- third_party/swiftshader/src/Yarn/Thread.cpp.orig 2019-10-30 22:22:11 UTC
	++++ third_party/swiftshader/src/Yarn/Thread.cpp
	+@@ -27,6 +27,10 @@
	+ # include <pthread.h>
	+ # include <mach/thread_act.h>
	+ # include <unistd.h>
	++#elif defined(__FreeBSD__)
	++# include <pthread.h>
	++# include <pthread_np.h>
	++# include <unistd.h>
	+ #else
	+ # include <pthread.h>
	+ # include <unistd.h>
	+@@ -88,6 +92,8 @@ void Thread::setName(const char* fmt, ...)
	+
	+ #if defined(__APPLE__)
	+ pthread_setname_np(name);
	++#elif defined(__FreeBSD__)
	++ pthread_set_name_np(pthread_self(), name);
	+ #elif !defined(__Fuchsia__)
	+ pthread_setname_np(pthread_self(), name);
	+ #endif
	Index: www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
	+++ www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h
	@@ -0,0 +1,152 @@
	+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-09 21:57:03 UTC
	++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
	+@@ -8,15 +8,15 @@
	+ #define BUG_REPORT_URL "https://bugs.llvm.org/"
	+
	+ /* Define to 1 to enable backtraces, and to 0 otherwise. */
	+-/* #undef ENABLE_BACKTRACES */
	++#define ENABLE_BACKTRACES 1
	+
	+ /* Define to 1 to enable crash overrides, and to 0 otherwise. */
	+-/* #undef ENABLE_CRASH_OVERRIDES */
	++#define ENABLE_CRASH_OVERRIDES 1
	+
	+ /* Define to 1 if you have the `backtrace' function. */
	+-/* #undef HAVE_BACKTRACE */
	++#define HAVE_BACKTRACE TRUE
	+
	+-/* #undef BACKTRACE_HEADER */
	++#define BACKTRACE_HEADER <execinfo.h>
	+
	+ /* Define to 1 if you have the <CrashReporterClient.h> header file. */
	+ /* #undef HAVE_CRASHREPORTERCLIENT_H */
	+@@ -26,7 +26,7 @@
	+
	+ /* Define to 1 if you have the declaration of `arc4random', and to 0 if you
	+ don't. */
	+-#define HAVE_DECL_ARC4RANDOM 0
	++#define HAVE_DECL_ARC4RANDOM 1
	+
	+ /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you
	+ don't. */
	+@@ -50,7 +50,7 @@
	+ #define HAVE_DLOPEN 1
	+
	+ /* Define if dladdr() is available on this platform. */
	+-/* #undef HAVE_DLADDR */
	++#define HAVE_DLADDR 1
	+
	+ /* Define to 1 if you have the <errno.h> header file. */
	+ #define HAVE_ERRNO_H 1
	+@@ -89,7 +89,7 @@
	+ #define HAVE_ISATTY 1
	+
	+ /* Define to 1 if you have the `edit' library (-ledit). */
	+-/* #undef HAVE_LIBEDIT */
	++#define HAVE_LIBEDIT 1
	+
	+ /* Define to 1 if you have the `pfm' library (-lpfm). */
	+ /* #undef HAVE_LIBPFM */
	+@@ -107,25 +107,25 @@
	+ /* #undef HAVE_PTHREAD_SETNAME_NP */
	+
	+ /* Define to 1 if you have the `z' library (-lz). */
	+-/* #undef HAVE_LIBZ */
	++#define HAVE_LIBZ 1
	+
	+ /* Define to 1 if you have the <link.h> header file. */
	+ #define HAVE_LINK_H 1
	+
	+ /* Define to 1 if you have the `lseek64' function. */
	+-#define HAVE_LSEEK64 1
	++/* #undef HAVE_LSEEK64 */
	+
	+ /* Define to 1 if you have the <mach/mach.h> header file. */
	+ /* #undef HAVE_MACH_MACH_H */
	+
	+ /* Define to 1 if you have the `mallctl' function. */
	+-/* #undef HAVE_MALLCTL */
	++#define HAVE_MALLCTL 1
	+
	+ /* Define to 1 if you have the `mallinfo' function. */
	+-#define HAVE_MALLINFO 1
	++/* #undef HAVE_MALLINFO */
	+
	+ /* Define to 1 if you have the <malloc.h> header file. */
	+-#define HAVE_MALLOC_H 1
	++/* #undef HAVE_MALLOC_H */
	+
	+ /* Define to 1 if you have the <malloc/malloc.h> header file. */
	+ /* #undef HAVE_MALLOC_MALLOC_H */
	+@@ -137,7 +137,7 @@
	+ #define HAVE_POSIX_FALLOCATE 1
	+
	+ /* Define to 1 if you have the `posix_spawn' function. */
	+-/* #undef HAVE_POSIX_SPAWN */
	++#define HAVE_POSIX_SPAWN 1
	+
	+ /* Define to 1 if you have the `pread' function. */
	+ #define HAVE_PREAD 1
	+@@ -158,16 +158,16 @@
	+ #define HAVE_REALPATH 1
	+
	+ /* Define to 1 if you have the `sbrk' function. */
	+-#define HAVE_SBRK 1
	++/* #undef HAVE_SBRK */
	+
	+ /* Define to 1 if you have the `setenv' function. */
	+ #define HAVE_SETENV 1
	+
	+ /* Define to 1 if you have the `sched_getaffinity' function. */
	+-#define HAVE_SCHED_GETAFFINITY 1
	++/* #undef HAVE_SCHED_GETAFFINITY */
	+
	+ /* Define to 1 if you have the `CPU_COUNT' macro. */
	+-#define HAVE_CPU_COUNT 1
	++/* #undef HAVE_CPU_COUNT */
	+
	+ /* Define to 1 if you have the `setrlimit' function. */
	+ #define HAVE_SETRLIMIT 1
	+@@ -209,13 +209,13 @@
	+ #define HAVE_SYS_TYPES_H 1
	+
	+ /* Define if the setupterm() function is supported this platform. */
	+-/* #undef HAVE_TERMINFO */
	++#define HAVE_TERMINFO 1
	+
	+ /* Define if the xar_open() function is supported this platform. */
	+ /* #undef HAVE_LIBXAR */
	+
	+ /* Define to 1 if you have the <termios.h> header file. */
	+-/* #undef HAVE_TERMIOS_H */
	++#define HAVE_TERMIOS_H 1
	+
	+ /* Define to 1 if you have the <unistd.h> header file. */
	+ #define HAVE_UNISTD_H 1
	+@@ -224,7 +224,7 @@
	+ /* #undef HAVE_VALGRIND_VALGRIND_H */
	+
	+ /* Define to 1 if you have the <zlib.h> header file. */
	+-/* #undef HAVE_ZLIB_H */
	++#define HAVE_ZLIB_H 1
	+
	+ /* Have host's _alloca */
	+ /* #undef HAVE__ALLOCA */
	+@@ -298,7 +298,7 @@
	+ #elif defined(__arm__)
	+ #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf"
	+ #elif defined(__aarch64__)
	+-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu"
	++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd"
	+ #elif defined(__mips__)
	+ #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu"
	+ #elif defined(__mips64)
	+@@ -310,7 +310,7 @@
	+ #endif
	+
	+ /* Define if zlib compression is available */
	+-#define LLVM_ENABLE_ZLIB 0
	++#define LLVM_ENABLE_ZLIB 1
	+
	+ /* Define if overriding target triple is enabled */
	+ /* #undef LLVM_TARGET_TRIPLE_ENV */
	Index: www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
	===================================================================
	--- www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
	+++ www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h
	@@ -0,0 +1,20 @@
	+--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2019-09-09 21:57:03 UTC
	++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
	+@@ -38,7 +38,7 @@
	+ #elif defined(__arm__)
	+ #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf"
	+ #elif defined(__aarch64__)
	+-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu"
	++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd"
	+ #elif defined(__mips__)
	+ #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu"
	+ #elif defined(__mips64)
	+@@ -63,7 +63,7 @@
	+ #elif defined(__arm__)
	+ #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf"
	+ #elif defined(__aarch64__)
	+-#define LLVM_HOST_TRIPLE "aarch64-linux-gnu"
	++#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd"
	+ #elif defined(__mips__)
	+ #define LLVM_HOST_TRIPLE "mipsel-linux-gnu"
	+ #elif defined(__mips64)
	Index: www/iridium/files/patch-third__party_webrtc_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_BUILD.gn
	+++ www/iridium/files/patch-third__party_webrtc_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/webrtc/BUILD.gn.orig 2019-03-11 22:08:05 UTC
	+--- third_party/webrtc/BUILD.gn.orig 2019-09-09 21:57:03 UTC
	+++ third_party/webrtc/BUILD.gn
	-@@ -153,6 +153,9 @@ config("common_inherited_config") {
	+@@ -160,6 +160,9 @@ config("common_inherited_config") {
	if (is_linux) {
	defines += [ "WEBRTC_LINUX" ]
	}
	Index: www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
	+++ www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-03-11 22:08:06 UTC
	+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-10-21 19:09:18 UTC
	+++ third_party/webrtc/modules/audio_device/BUILD.gn
	-@@ -312,7 +312,7 @@ rtc_source_set("audio_device_impl") {
	+@@ -265,7 +265,7 @@ rtc_source_set("audio_device_impl") {
	if (rtc_use_dummy_audio_file_devices) {
	defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
	} else {
	Index: www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
	+++ www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
	@@ -1,10 +1,10 @@
	---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-03-11 22:08:10 UTC
	+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-09-09 21:57:05 UTC
	+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
	-@@ -12,6 +12,7 @@
	-
	+@@ -13,6 +13,7 @@
	#include <string.h>
	+
	#include <algorithm>
	+#include <cstdlib>
	#include <utility>

	- #include "modules/include/module_common_types_public.h"
	+ #include "absl/algorithm/container.h"
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
	@@ -1,20 +0,0 @@
	---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-03-11 22:08:15 UTC
	-+++ third_party/webrtc/rtc_base/BUILD.gn
	-@@ -1088,8 +1088,6 @@ rtc_static_library("rtc_base") {
	-
	- if (rtc_use_x11) {
	- libs += [
	-- "dl",
	-- "rt",
	- "Xext",
	- "X11",
	- "Xcomposite",
	-@@ -1097,7 +1095,7 @@ rtc_static_library("rtc_base") {
	- ]
	- }
	-
	-- if (is_linux) {
	-+ if (is_linux && !is_bsd) {
	- libs += [
	- "dl",
	- "rt",
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h
	@@ -1,11 +1,11 @@
	---- third_party/webrtc/rtc_base/byte_order.h.orig 2019-03-11 22:08:15 UTC
	+--- third_party/webrtc/rtc_base/byte_order.h.orig 2019-06-04 18:58:09 UTC
	+++ third_party/webrtc/rtc_base/byte_order.h
	-@@ -79,7 +79,7 @@
	- #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
	+@@ -89,7 +89,7 @@
	#endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
	+
	#elif defined(WEBRTC_POSIX)
	-#include <endian.h>
	+#include <sys/endian.h>
	- #endif
	-
	- namespace rtc {
	+ #else
	+ #error "Missing byte order functions for this arch."
	+ #endif // defined(WEBRTC_MAC)
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc
	@@ -1,4 +1,4 @@
	---- third_party/webrtc/rtc_base/network.cc.orig 2019-03-11 22:08:15 UTC
	+--- third_party/webrtc/rtc_base/network.cc.orig 2019-09-09 21:57:05 UTC
	+++ third_party/webrtc/rtc_base/network.cc
	@@ -14,7 +14,7 @@
	// linux/if.h can't be included at the same time as the posix sys/if.h, and
	@@ -9,7 +9,7 @@
	#include <linux/if.h>
	#include <linux/route.h>
	#elif !defined(__native_client__)
	-@@ -762,7 +762,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
	+@@ -765,7 +765,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
	}
	#endif // WEBRTC_WIN

	@@ -18,7 +18,7 @@
	bool IsDefaultRoute(const std::string& network_name) {
	FILE* f = fopen("/proc/net/route", "r");
	if (!f) {
	-@@ -805,7 +805,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
	+@@ -808,7 +808,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
	strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
	return true;
	}
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
	@@ -1,7 +1,16 @@
	---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC
	+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-07-24 19:03:36 UTC
	+++ third_party/webrtc/rtc_base/physical_socket_server.cc
	-@@ -66,7 +66,7 @@ typedef void* SockOptArg;
	+@@ -51,7 +51,7 @@
	+ #include "rtc_base/null_socket_server.h"
	+ #include "rtc_base/time_utils.h"

	+-#if defined(WEBRTC_LINUX)
	++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
	+ #include <linux/sockios.h>
	+ #endif
	+
	+@@ -70,7 +70,7 @@ typedef void* SockOptArg;
	+
	#endif // WEBRTC_POSIX

	-#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
	@@ -9,7 +18,7 @@

	int64_t GetSocketRecvTimestamp(int socket) {
	struct timeval tv_ioctl;
	-@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value)
	+@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value)
	socklen_t optlen = sizeof(*value);
	int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
	if (ret != -1 && opt == OPT_DONTFRAGMENT) {
	@@ -18,7 +27,7 @@
	value = (value != IP_PMTUDISC_DONT) ? 1 : 0;
	#endif
	}
	-@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
	+@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
	if (TranslateOption(opt, &slevel, &sopt) == -1)
	return -1;
	if (opt == OPT_DONTFRAGMENT) {
	@@ -27,7 +36,7 @@
	value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
	#endif
	}
	-@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
	+@@ -313,7 +313,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
	int PhysicalSocket::Send(const void* pv, size_t cb) {
	int sent = DoSend(
	s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
	@@ -36,7 +45,7 @@
	// Suppress SIGPIPE. Without this, attempting to send on a socket whose
	// other end is closed will result in a SIGPIPE signal being raised to
	// our process, which by default will terminate the process, which we
	-@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer,
	+@@ -342,7 +342,7 @@ int PhysicalSocket::SendTo(const void* buffer,
	size_t len = addr.ToSockAddrStorage(&saddr);
	int sent =
	DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
	@@ -45,7 +54,7 @@
	// Suppress SIGPIPE. See above for explanation.
	MSG_NOSIGNAL,
	#else
	-@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
	+@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
	*slevel = IPPROTO_IP;
	*sopt = IP_DONTFRAGMENT;
	break;
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
	@@ -1,28 +1,27 @@
	---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-03-11 22:08:16 UTC
	+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-09-09 21:57:05 UTC
	+++ third_party/webrtc/rtc_base/platform_thread_types.cc
	-@@ -11,7 +11,9 @@
	+@@ -11,7 +11,11 @@
	#include "rtc_base/platform_thread_types.h"

	#if defined(WEBRTC_LINUX)
	+#if !defined(__FreeBSD__)
	#include <sys/prctl.h>
	++#else
	++#include <pthread_np.h>
	+#endif
	#include <sys/syscall.h>
	#endif

	-@@ -27,8 +29,10 @@ PlatformThreadId CurrentThreadId() {
	+@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() {
	return gettid();
	#elif defined(WEBRTC_FUCHSIA)
	return zx_thread_self();
	--#elif defined(WEBRTC_LINUX)
	-+#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
	- return syscall(__NR_gettid);
	+#elif defined(__FreeBSD__)
	-+ return reinterpret_cast<uint64_t>(pthread_self());
	- #else
	- // Default implementation for nacl and solaris.
	- return reinterpret_cast<pid_t>(pthread_self());
	-@@ -55,6 +59,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
	++ return pthread_getthreadid_np();
	+ #elif defined(WEBRTC_LINUX)
	+ return syscall(__NR_gettid);
	+ #elif defined(__EMSCRIPTEN__)
	+@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
	}

	void SetCurrentThreadName(const char* name) {
	@@ -30,7 +29,7 @@
	#if defined(WEBRTC_WIN)
	struct {
	DWORD dwType;
	-@@ -72,6 +77,7 @@ void SetCurrentThreadName(const char* name) {
	+@@ -74,6 +81,7 @@ void SetCurrentThreadName(const char* name) {
	prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT
	#elif defined(WEBRTC_MAC) \|\| defined(WEBRTC_IOS)
	pthread_setname_np(name);
	Index: www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h
	+++ www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h
	@@ -1,17 +0,0 @@
	---- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC
	-+++ third_party/webrtc/rtc_base/string_utils.h
	-@@ -25,11 +25,11 @@
	- #endif // WEBRTC_WIN
	-
	- #if defined(WEBRTC_POSIX)
	--#ifdef BSD
	-+#if defined(WEBRTC_BSD) \|\| defined(BSD)
	- #include <stdlib.h>
	--#else // BSD
	-+#else // WEBRTC_BSD
	- #include <alloca.h>
	--#endif // !BSD
	-+#endif // !WEBRTC_BSD
	- #include <strings.h>
	- #endif // WEBRTC_POSIX
	-
	Index: www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
	+++ www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
	@@ -1,6 +1,6 @@
	---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-03-11 22:08:22 UTC
	+--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-09-09 21:57:06 UTC
	+++ third_party/webrtc/system_wrappers/BUILD.gn
	-@@ -59,8 +59,6 @@ rtc_static_library("system_wrappers") {
	+@@ -58,8 +58,6 @@ rtc_static_library("system_wrappers") {
	if (!build_with_chromium) {
	deps += [ ":cpu_features_linux" ]
	}
	Index: www/iridium/files/patch-third__party_zlib_arm__features.c
	===================================================================
	--- www/iridium/files/patch-third__party_zlib_arm__features.c
	+++ www/iridium/files/patch-third__party_zlib_arm__features.c
	@@ -1,28 +1,46 @@
	---- third_party/zlib/arm_features.c.orig 2019-03-11 22:01:18 UTC
	+--- third_party/zlib/arm_features.c.orig 2019-06-04 18:55:48 UTC
	+++ third_party/zlib/arm_features.c
	-@@ -21,9 +21,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
	- #include <asm/hwcap.h>
	- #include <sys/auxv.h>
	+@@ -16,6 +16,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
	+ #include <pthread.h>
	+ #endif
	+
	++#if defined(__FreeBSD__)
	++#include <machine/armreg.h>
	++#include <sys/types.h>
	++#else
	+ #if defined(ARMV8_OS_ANDROID)
	+ #include <cpu-features.h>
	+ #elif defined(ARMV8_OS_LINUX)
	+@@ -30,6 +34,7 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
	#else
	--#error ### No ARM CPU features detection in your platform/OS
	-+/* #error ### No ARM CPU features detection in your platform/OS */
	+ #error arm_features.c ARM feature detection in not defined for your platform
	#endif
	++#endif

	-+#ifdef ARMV8_OS_LINUX
	- static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
	+ static void _arm_check_features(void);

	- static void init_arm_features(void)
	-@@ -55,10 +56,13 @@ static void init_arm_features(void)
	- if (capabilities & flag_pmull)
	- arm_cpu_enable_pmull = 1;
	- }
	+@@ -68,14 +73,24 @@ static void _arm_check_features(void)
	+ arm_cpu_enable_crc32 = !!(features & ANDROID_CPU_ARM_FEATURE_CRC32);
	+ arm_cpu_enable_pmull = !!(features & ANDROID_CPU_ARM_FEATURE_PMULL);
	+ #elif defined(ARMV8_OS_LINUX) && defined(__aarch64__)
	++#if defined(__FreeBSD__)
	++ uint64_t id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1);
	++ if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL)
	++ arm_cpu_enable_pmull = 1;
	++ if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)
	++ arm_cpu_enable_crc32 = 1;
	++#else
	+ unsigned long features = getauxval(AT_HWCAP);
	+ arm_cpu_enable_crc32 = !!(features & HWCAP_CRC32);
	+ arm_cpu_enable_pmull = !!(features & HWCAP_PMULL);
	+#endif
	-
	- void ZLIB_INTERNAL arm_check_features(void)
	- {
	-+#ifdef ARMV8_OS_LINUX
	- pthread_once(&cpu_check_inited_once, init_arm_features);
	+ #elif defined(ARMV8_OS_LINUX) && (defined(__ARM_NEON) \|\| defined(__ARM_NEON__))
	++#if !defined(__FreeBSD__)
	+ /* Query HWCAP2 for ARMV8-A SoCs running in aarch32 mode */
	+ unsigned long features = getauxval(AT_HWCAP2);
	+ arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
	+ arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
	+#endif
	- }
	- #else
	- #include <windows.h>
	+ #elif defined(ARMV8_OS_FUCHSIA)
	+ uint32_t features;
	+ zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
	Index: www/iridium/files/patch-tools_gn_base_files_file__util.h
	===================================================================
	--- www/iridium/files/patch-tools_gn_base_files_file__util.h
	+++ www/iridium/files/patch-tools_gn_base_files_file__util.h
	@@ -0,0 +1,11 @@
	+--- tools/gn/base/files/file_util.h.orig 2019-06-04 19:02:25 UTC
	++++ tools/gn/base/files/file_util.h
	+@@ -361,7 +361,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath&
	+ // the directory \|path\|, in the number of FilePath::CharType, or -1 on failure.
	+ int GetMaximumPathComponentLength(const base::FilePath& path);
	+
	+-#if defined(OS_LINUX) \|\| defined(OS_AIX)
	++#if defined(OS_LINUX) \|\| defined(OS_AIX) \|\| defined(OS_BSD)
	+ // Broad categories of file systems as returned by statfs() on Linux.
	+ enum FileSystemType {
	+ FILE_SYSTEM_UNKNOWN, // statfs failed.
	Index: www/iridium/files/patch-tools_gn_base_files_file__util__posix.cc
	===================================================================
	--- www/iridium/files/patch-tools_gn_base_files_file__util__posix.cc
	+++ www/iridium/files/patch-tools_gn_base_files_file__util__posix.cc
	@@ -0,0 +1,11 @@
	+--- tools/gn/base/files/file_util_posix.cc.orig 2019-06-04 19:02:25 UTC
	++++ tools/gn/base/files/file_util_posix.cc
	+@@ -254,7 +254,7 @@ bool ReplaceFile(const FilePath& from_path,
	+ #endif // !defined(OS_NACL_NONSFI)
	+
	+ bool CreateLocalNonBlockingPipe(int fds[2]) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ return pipe2(fds, O_CLOEXEC \| O_NONBLOCK) == 0;
	+ #else
	+ int raw_fds[2];
	Index: www/iridium/files/patch-tools_gn_base_files_scoped__file.cc
	===================================================================
	--- www/iridium/files/patch-tools_gn_base_files_scoped__file.cc
	+++ www/iridium/files/patch-tools_gn_base_files_scoped__file.cc
	@@ -0,0 +1,11 @@
	+--- tools/gn/base/files/scoped_file.cc.orig 2019-06-04 19:02:25 UTC
	++++ tools/gn/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-tools_gn_build_gen.py
	===================================================================
	--- www/iridium/files/patch-tools_gn_build_gen.py
	+++ www/iridium/files/patch-tools_gn_build_gen.py
	@@ -1,15 +1,6 @@
	---- tools/gn/build/gen.py.orig 2019-03-11 22:12:13 UTC
	+--- tools/gn/build/gen.py.orig 2019-09-09 21:59:05 UTC
	+++ tools/gn/build/gen.py
	-@@ -44,7 +44,7 @@ class Platform(object):
	-
	- @staticmethod
	- def known_platforms():
	-- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia']
	-+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd']
	-
	- def platform(self):
	- return self._platform
	-@@ -67,6 +67,9 @@ class Platform(object):
	+@@ -69,6 +69,9 @@ class Platform(object):
	def is_aix(self):
	return self._platform == 'aix'

	@@ -17,9 +8,9 @@
	+ return self._platform == 'freebsd'
	+
	def is_posix(self):
	- return self._platform in ['linux', 'freebsd', 'darwin', 'aix']
	+ return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd']

	-@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options):
	+@@ -337,6 +340,11 @@ def WriteGNNinja(path, platform, host, options):
	elif platform.is_aix():
	cflags_cc.append('-maix64')
	ldflags.append('-maix64')
	Index: www/iridium/files/patch-tools_gn_util_sys__info.cc
	===================================================================
	--- www/iridium/files/patch-tools_gn_util_sys__info.cc
	+++ www/iridium/files/patch-tools_gn_util_sys__info.cc
	@@ -0,0 +1,11 @@
	+--- tools/gn/util/sys_info.cc.orig 2019-04-30 22:29:37 UTC
	++++ tools/gn/util/sys_info.cc
	+@@ -28,6 +28,8 @@ std::string OperatingSystemArchitecture() {
	+ arch = "x86";
	+ } else if (arch == "amd64") {
	+ arch = "x86_64";
	++ } else if (arch == "arm64") {
	++ arch = "aarch64";
	+ } else if (std::string(info.sysname) == "AIX") {
	+ arch = "ppc64";
	+ }
	Index: www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
	===================================================================
	--- www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
	+++ www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
	@@ -1,6 +1,6 @@
	---- tools/json_schema_compiler/feature_compiler.py.orig 2019-03-11 22:01:18 UTC
	+--- tools/json_schema_compiler/feature_compiler.py.orig 2019-09-09 21:55:45 UTC
	+++ tools/json_schema_compiler/feature_compiler.py
	-@@ -205,6 +205,7 @@ FEATURE_GRAMMAR = (
	+@@ -215,6 +215,7 @@ FEATURE_GRAMMAR = (
	'enum_map': {
	'chromeos': 'Feature::CHROMEOS_PLATFORM',
	'linux': 'Feature::LINUX_PLATFORM',
	Index: www/iridium/files/patch-tools_json__schema__compiler_model.py
	===================================================================
	--- www/iridium/files/patch-tools_json__schema__compiler_model.py
	+++ www/iridium/files/patch-tools_json__schema__compiler_model.py
	@@ -1,6 +1,6 @@
	---- tools/json_schema_compiler/model.py.orig 2019-03-11 22:01:18 UTC
	+--- tools/json_schema_compiler/model.py.orig 2019-10-21 19:07:27 UTC
	+++ tools/json_schema_compiler/model.py
	-@@ -602,7 +602,7 @@ class Platforms(object):
	+@@ -603,7 +603,7 @@ class Platforms(object):
	"""
	CHROMEOS = _PlatformInfo("chromeos")
	CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
	Index: www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
	+++ www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
	@@ -1,6 +1,6 @@
	---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-03-11 22:01:18 UTC
	+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-06-04 18:55:49 UTC
	+++ tools/perf/chrome_telemetry_build/BUILD.gn
	-@@ -40,7 +40,7 @@ group("telemetry_chrome_test") {
	+@@ -43,7 +43,7 @@ group("telemetry_chrome_test") {
	data_deps += [ "//chrome:reorder_imports" ]
	}

	Index: www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
	===================================================================
	--- www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
	+++ www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
	@@ -1,6 +1,6 @@
	---- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC
	+--- tools/variations/fieldtrial_to_struct.py.orig 2019-07-24 18:59:17 UTC
	+++ tools/variations/fieldtrial_to_struct.py
	-@@ -24,6 +24,7 @@ finally:
	+@@ -33,6 +33,7 @@ finally:
	_platforms = [
	'android',
	'android_webview',
	Index: www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
	+++ www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
	@@ -1,4 +1,4 @@
	---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC
	+++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
	@@ -8,7 +8,7 @@

	@@ -9,8 +9,8 @@
	#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
	#elif defined(OS_MACOSX)
	#include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h"
	-@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() {
	-
	+@@ -23,7 +23,7 @@ std::unique_ptr<OSExchangeData::Provider>
	+ OSExchangeDataProviderFactory::CreateProvider() {
	#if defined(USE_X11)
	return std::make_unique<OSExchangeDataProviderAuraX11>();
	-#elif defined(OS_LINUX)
	Index: www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
	===================================================================
	--- www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
	+++ www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
	@@ -1,11 +0,0 @@
	---- ui/base/ime/ime_engine_handler_interface.h.orig 2019-03-11 22:01:19 UTC
	-+++ ui/base/ime/ime_engine_handler_interface.h
	-@@ -166,7 +166,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
	- virtual void SetMirroringEnabled(bool mirroring_enabled) = 0;
	- virtual void SetCastingEnabled(bool casting_enabled) = 0;
	-
	--#elif defined(OS_LINUX) \|\| defined(OS_WIN)
	-+#elif defined(OS_LINUX) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	-
	- // Get the id of the IME extension.
	- virtual std::string GetExtensionId() const = 0;
	Index: www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
	+++ www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc
	@@ -0,0 +1,38 @@
	+--- ui/base/ime/init/input_method_initializer.cc.orig 2019-06-04 18:55:49 UTC
	++++ ui/base/ime/init/input_method_initializer.cc
	+@@ -8,7 +8,7 @@
	+
	+ #if defined(OS_CHROMEOS)
	+ #include "ui/base/ime/ime_bridge.h"
	+-#elif defined(USE_AURA) && defined(OS_LINUX)
	++#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ #include "base/logging.h"
	+ #include "ui/base/ime/linux/fake_input_method_context_factory.h"
	+ #elif defined(OS_WIN)
	+@@ -18,7 +18,7 @@
	+
	+ namespace {
	+
	+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
	++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ const ui::LinuxInputMethodContextFactory*
	+ g_linux_input_method_context_factory_for_testing;
	+ #endif
	+@@ -46,7 +46,7 @@ void ShutdownInputMethod() {
	+ void InitializeInputMethodForTesting() {
	+ #if defined(OS_CHROMEOS)
	+ IMEBridge::Initialize();
	+-#elif defined(USE_AURA) && defined(OS_LINUX)
	++#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ if (!g_linux_input_method_context_factory_for_testing)
	+ g_linux_input_method_context_factory_for_testing =
	+ new FakeInputMethodContextFactory();
	+@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() {
	+ void ShutdownInputMethodForTesting() {
	+ #if defined(OS_CHROMEOS)
	+ IMEBridge::Shutdown();
	+-#elif defined(USE_AURA) && defined(OS_LINUX)
	++#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ const LinuxInputMethodContextFactory* factory =
	+ LinuxInputMethodContextFactory::instance();
	+ CHECK(!factory \|\| factory == g_linux_input_method_context_factory_for_testing)
	Index: www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
	+++ www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
	@@ -1,38 +0,0 @@
	---- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC
	-+++ ui/base/ime/input_method_initializer.cc
	-@@ -8,7 +8,7 @@
	-
	- #if defined(OS_CHROMEOS)
	- #include "ui/base/ime/ime_bridge.h"
	--#elif defined(USE_AURA) && defined(OS_LINUX)
	-+#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	- #include "base/logging.h"
	- #include "ui/base/ime/linux/fake_input_method_context_factory.h"
	- #elif defined(OS_WIN)
	-@@ -18,7 +18,7 @@
	-
	- namespace {
	-
	--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
	-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	- const ui::LinuxInputMethodContextFactory*
	- g_linux_input_method_context_factory_for_testing;
	- #endif
	-@@ -46,7 +46,7 @@ void ShutdownInputMethod() {
	- void InitializeInputMethodForTesting() {
	- #if defined(OS_CHROMEOS)
	- IMEBridge::Initialize();
	--#elif defined(USE_AURA) && defined(OS_LINUX)
	-+#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	- if (!g_linux_input_method_context_factory_for_testing)
	- g_linux_input_method_context_factory_for_testing =
	- new FakeInputMethodContextFactory();
	-@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() {
	- void ShutdownInputMethodForTesting() {
	- #if defined(OS_CHROMEOS)
	- IMEBridge::Shutdown();
	--#elif defined(USE_AURA) && defined(OS_LINUX)
	-+#elif defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	- const LinuxInputMethodContextFactory* factory =
	- LinuxInputMethodContextFactory::instance();
	- CHECK(!factory \|\| factory == g_linux_input_method_context_factory_for_testing)
	Index: www/iridium/files/patch-ui_base_resource_resource__bundle.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_resource_resource__bundle.cc
	+++ www/iridium/files/patch-ui_base_resource_resource__bundle.cc
	@@ -1,6 +1,6 @@
	---- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/base/resource/resource_bundle.cc.orig 2019-10-21 19:07:28 UTC
	+++ ui/base/resource/resource_bundle.cc
	-@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() {
	+@@ -793,7 +793,7 @@ void ResourceBundle::ReloadFonts() {
	}

	ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
	@@ -9,7 +9,7 @@
	return max_scale_factor_;
	#else
	return GetSupportedScaleFactors().back();
	-@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
	+@@ -846,7 +846,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
	// On platforms other than iOS, 100P is always a supported scale factor.
	// For Windows we have a separate case in this function.
	supported_scale_factors.push_back(SCALE_FACTOR_100P);
	Index: www/iridium/files/patch-ui_base_ui__base__features.h
	===================================================================
	--- www/iridium/files/patch-ui_base_ui__base__features.h
	+++ www/iridium/files/patch-ui_base_ui__base__features.h
	@@ -1,14 +1,15 @@
	---- ui/base/ui_base_features.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/base/ui_base_features.h.orig 2019-10-21 19:07:28 UTC
	+++ ui/base/ui_base_features.h
	-@@ -46,9 +46,9 @@ UI_BASE_EXPORT bool IsUsingWMPointerForTouch();
	- UI_BASE_EXPORT extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
	+@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES)
	+ extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)

	-#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#if defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	- UI_BASE_EXPORT extern const base::Feature kDirectManipulationStylus;
	+ COMPONENT_EXPORT(UI_BASE_FEATURES)
	+ extern const base::Feature kDirectManipulationStylus;
	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)

	- // Used to have ash (Chrome OS system UI) run in its own process.
	- // TODO(jamescook): Make flag only available in Chrome OS.
	+ // Used to enable the new controls UI.
	+ COMPONENT_EXPORT(UI_BASE_FEATURES)
	Index: www/iridium/files/patch-ui_base_ui__base__features.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_ui__base__features.cc
	+++ www/iridium/files/patch-ui_base_ui__base__features.cc
	@@ -1,6 +1,6 @@
	---- ui/base/ui_base_features.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/base/ui_base_features.cc.orig 2019-10-21 19:07:28 UTC
	+++ ui/base/ui_base_features.cc
	-@@ -111,7 +111,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
	+@@ -112,7 +112,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
	"EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
	#endif // defined(OS_WIN) \|\| defined(OS_CHROMEOS)

	@@ -9,12 +9,12 @@
	// Enables stylus appearing as touch when in contact with digitizer.
	const base::Feature kDirectManipulationStylus = {
	"DirectManipulationStylus",
	-@@ -121,7 +121,7 @@ const base::Feature kDirectManipulationStylus = {
	+@@ -122,7 +122,7 @@ const base::Feature kDirectManipulationStylus = {
	base::FEATURE_DISABLED_BY_DEFAULT
	#endif
	};
	-#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX)
	+#endif // defined(OS_WIN) \|\| defined(OS_MACOSX) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)

	- const base::Feature kMash = {"Mash", base::FEATURE_DISABLED_BY_DEFAULT};
	-
	+ const base::Feature kFormControlsRefresh = {"FormControlsRefresh",
	+ base::FEATURE_DISABLED_BY_DEFAULT};
	Index: www/iridium/files/patch-ui_base_webui_web__ui__util.cc
	===================================================================
	--- www/iridium/files/patch-ui_base_webui_web__ui__util.cc
	+++ www/iridium/files/patch-ui_base_webui_web__ui__util.cc
	@@ -1,6 +1,6 @@
	---- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/base/webui/web_ui_util.cc.orig 2019-07-24 18:59:19 UTC
	+++ ui/base/webui/web_ui_util.cc
	-@@ -217,7 +217,7 @@ std::string GetFontFamily() {
	+@@ -215,7 +215,7 @@ std::string GetFontFamily() {

	// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
	// into Ozone: crbug.com/320050
	Index: www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
	===================================================================
	--- www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
	+++ www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
	@@ -1,6 +1,6 @@
	---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-09-09 21:55:46 UTC
	+++ ui/events/devices/x11/device_data_manager_x11.cc
	-@@ -828,6 +828,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
	+@@ -826,6 +826,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
	}

	void DeviceDataManagerX11::DisableDevice(int deviceid) {
	@@ -9,7 +9,7 @@
	blocked_devices_.set(deviceid, true);
	// TODO(rsadam@): Support blocking touchscreen devices.
	std::vector<InputDevice> keyboards = GetKeyboardDevices();
	-@@ -838,6 +840,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
	+@@ -836,6 +838,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
	keyboards.erase(it);
	DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
	}
	Index: www/iridium/files/patch-ui_gfx_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-ui_gfx_BUILD.gn
	+++ www/iridium/files/patch-ui_gfx_BUILD.gn
	@@ -1,6 +1,6 @@
	---- ui/gfx/BUILD.gn.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/BUILD.gn.orig 2019-10-21 19:07:29 UTC
	+++ ui/gfx/BUILD.gn
	-@@ -532,7 +532,7 @@ jumbo_source_set("memory_buffer_sources") {
	+@@ -573,7 +573,7 @@ jumbo_source_set("memory_buffer_sources") {
	deps += [ "//build/config/linux/libdrm" ]
	}

	Index: www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
	+++ www/iridium/files/patch-ui_gfx_font__fallback__linux.cc
	@@ -1,7 +1,7 @@
	---- ui/gfx/font_fallback_linux.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/font_fallback_linux.cc.orig 2019-09-09 21:55:46 UTC
	+++ ui/gfx/font_fallback_linux.cc
	-@@ -15,6 +15,10 @@
	- #include "base/memory/ptr_util.h"
	+@@ -18,6 +18,10 @@
	+ #include "base/trace_event/trace_event.h"
	#include "ui/gfx/font.h"

	+#if defined(OS_BSD)
	Index: www/iridium/files/patch-ui_gfx_font__render__params.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_font__render__params.h
	+++ www/iridium/files/patch-ui_gfx_font__render__params.h
	@@ -1,4 +1,4 @@
	---- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC
	+++ ui/gfx/font_render_params.h
	@@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams(
	const FontRenderParamsQuery& query,
	@@ -11,8 +11,8 @@
	GFX_EXPORT void ClearFontRenderParamsCacheForTest();
	#endif

	--#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA)
	-+#if defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	+-#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| \
	++#if defined(OS_WIN) \|\| defined(OS_LINUX) \|\| defined(OS_ANDROID) \|\| defined(OS_BSD) \|\| \
	+ defined(OS_FUCHSIA)
	// Gets the device scale factor to query the FontRenderParams.
	GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
	-
	Index: www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
	+++ www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h
	@@ -1,11 +1,11 @@
	---- ui/gfx/gpu_memory_buffer.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/gpu_memory_buffer.h.orig 2019-06-04 18:55:50 UTC
	+++ ui/gfx/gpu_memory_buffer.h
	@@ -16,7 +16,7 @@
	#include "ui/gfx/geometry/rect.h"
	#include "ui/gfx/gfx_export.h"

	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if defined(USE_OZONE) \|\| defined(OS_LINUX)
	++#if defined(USE_OZONE) \|\| defined(OS_LINUX) \|\| defined(OS_BSD)
	#include "ui/gfx/native_pixmap_handle.h"
	#elif defined(OS_MACOSX) && !defined(OS_IOS)
	#include "ui/gfx/mac/io_surface.h"
	@@ -13,8 +13,8 @@
	base::UnsafeSharedMemoryRegion region;
	uint32_t offset;
	int32_t stride;
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- // TODO(crbug.com/863011): convert this to a scoped handle.
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	NativePixmapHandle native_pixmap_handle;
	#elif defined(OS_MACOSX) && !defined(OS_IOS)
	+ ScopedRefCountedIOSurfaceMachPort mach_port;
	Index: www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
	+++ www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
	@@ -1,4 +1,4 @@
	---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-10-21 19:07:29 UTC
	+++ ui/gfx/ipc/gfx_param_traits_macros.h
	@@ -18,7 +18,7 @@
	#include "ui/gfx/selection_bound.h"
	@@ -13,17 +13,32 @@
	IPC_STRUCT_TRAITS_MEMBER(region)
	IPC_STRUCT_TRAITS_MEMBER(offset)
	IPC_STRUCT_TRAITS_MEMBER(stride)
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
	#elif defined(OS_MACOSX)
	IPC_STRUCT_TRAITS_MEMBER(mach_port)
	-@@ -66,7 +66,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
	+@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
	IPC_STRUCT_TRAITS_MEMBER(id)
	IPC_STRUCT_TRAITS_END()

	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+-#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA)
	++#if defined(OS_LINUX) \|\| defined(OS_FUCHSIA) \|\| defined(OS_BSD)
	IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
	IPC_STRUCT_TRAITS_MEMBER(stride)
	IPC_STRUCT_TRAITS_MEMBER(offset)
	+ IPC_STRUCT_TRAITS_MEMBER(size)
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ IPC_STRUCT_TRAITS_MEMBER(fd)
	+ #elif defined(OS_FUCHSIA)
	+ IPC_STRUCT_TRAITS_MEMBER(vmo)
	+@@ -80,7 +80,7 @@ IPC_STRUCT_TRAITS_END()
	+
	+ IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle)
	+ IPC_STRUCT_TRAITS_MEMBER(planes)
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ IPC_STRUCT_TRAITS_MEMBER(modifier)
	+ #endif
	+ #if defined(OS_FUCHSIA)
	Index: www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
	+++ www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
	@@ -1,4 +1,4 @@
	---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-07-24 18:59:22 UTC
	+++ ui/gfx/linux/client_native_pixmap_dmabuf.cc
	@@ -5,7 +5,9 @@
	#include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
	@@ -10,9 +10,9 @@
	#include <stddef.h>
	#include <sys/ioctl.h>
	#include <sys/mman.h>
	-@@ -18,11 +20,7 @@
	- #include "base/trace_event/trace_event.h"
	+@@ -24,11 +26,7 @@
	#include "build/build_config.h"
	+ #include "ui/gfx/switches.h"

	-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
	-#include <linux/dma-buf.h>
	Index: www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
	+++ www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
	@@ -1,20 +0,0 @@
	---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-03-11 22:01:19 UTC
	-+++ ui/gfx/mojo/buffer_types_struct_traits.h
	-@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
	- }
	- };
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- template <>
	- struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
	- gfx::NativePixmapPlane> {
	-@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
	- static bool Read(gfx::mojom::NativePixmapHandleDataView data,
	- gfx::NativePixmapHandle* out);
	- };
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	-
	- template <>
	- struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
	Index: www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
	+++ www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
	@@ -1,38 +0,0 @@
	---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-03-11 22:01:19 UTC
	-+++ ui/gfx/mojo/buffer_types_struct_traits.cc
	-@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
	- return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
	- }
	-
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- std::vector<mojo::ScopedHandle>
	- StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
	- fds(const gfx::NativePixmapHandle& pixmap_handle) {
	-@@ -55,7 +55,7 @@ bool StructTraits<
	- }
	- return data.ReadPlanes(&out->planes);
	- }
	--#endif // defined(OS_LINUX)
	-+#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	-
	- gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
	- gfx::mojom::GpuMemoryBufferHandleDataView,
	-@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
	- return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
	- std::move(handle.region));
	- case gfx::NATIVE_PIXMAP:
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
	- handle.native_pixmap_handle);
	- #else
	-@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
	- out->type = gfx::SHARED_MEMORY_BUFFER;
	- out->region = std::move(platform_handle->get_shared_memory_handle());
	- return true;
	--#if defined(OS_LINUX)
	-+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
	- NATIVE_PIXMAP_HANDLE:
	- out->type = gfx::NATIVE_PIXMAP;
	Index: www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
	+++ www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h
	@@ -0,0 +1,29 @@
	+--- ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2019-10-30 16:35:23 UTC
	++++ ui/gfx/mojom/buffer_types_mojom_traits.h
	+@@ -191,7 +191,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
	+ }
	+ };
	+
	+-#if defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+ template <>
	+ struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
	+ gfx::NativePixmapPlane> {
	+@@ -217,7 +217,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
	+ return pixmap_handle.planes;
	+ }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
	+ return pixmap_handle.modifier;
	+ }
	+@@ -241,7 +241,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
	+ static bool Read(gfx::mojom::NativePixmapHandleDataView data,
	+ gfx::NativePixmapHandle* out);
	+ };
	+-#endif // defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+
	+ template <>
	+ struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
	Index: www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
	+++ www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc
	@@ -0,0 +1,75 @@
	+--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2019-10-30 16:33:03 UTC
	++++ ui/gfx/mojom/buffer_types_mojom_traits.cc
	+@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
	+ return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
	+ }
	+
	+-#if defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+ mojo::ScopedHandle StructTraits<
	+ gfx::mojom::NativePixmapPlaneDataView,
	+ gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ return mojo::WrapPlatformFile(plane.fd.release());
	+ #elif defined(OS_FUCHSIA)
	+ return mojo::WrapPlatformHandle(mojo::PlatformHandle(std::move(plane.vmo)));
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+ }
	+
	+ bool StructTraits<
	+@@ -45,7 +45,7 @@ bool StructTraits<
	+
	+ mojo::PlatformHandle handle =
	+ mojo::UnwrapPlatformHandle(data.TakeBufferHandle());
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ if (!handle.is_fd())
	+ return false;
	+ out->fd = handle.TakeFD();
	+@@ -53,7 +53,7 @@ bool StructTraits<
	+ if (!handle.is_handle())
	+ return false;
	+ out->vmo = zx::vmo(handle.TakeHandle());
	+-#endif // defined(OS_LINUX)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD)
	+
	+ return true;
	+ }
	+@@ -62,7 +62,7 @@ bool StructTraits<
	+ gfx::mojom::NativePixmapHandleDataView,
	+ gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
	+ gfx::NativePixmapHandle* out) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ out->modifier = data.modifier();
	+ #endif
	+
	+@@ -75,7 +75,7 @@ bool StructTraits<
	+
	+ return data.ReadPlanes(&out->planes);
	+ }
	+-#endif // defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#endif // defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+
	+ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
	+ gfx::mojom::GpuMemoryBufferHandleDataView,
	+@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
	+ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
	+ std::move(handle.region));
	+ case gfx::NATIVE_PIXMAP:
	+-#if defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
	+ std::move(handle.native_pixmap_handle));
	+ #else
	+@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
	+ out->type = gfx::SHARED_MEMORY_BUFFER;
	+ out->region = std::move(platform_handle->get_shared_memory_handle());
	+ return true;
	+-#if defined(OS_LINUX) \|\| defined(USE_OZONE)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD) \|\| defined(USE_OZONE)
	+ case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
	+ NATIVE_PIXMAP_HANDLE:
	+ out->type = gfx::NATIVE_PIXMAP;
	Index: www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
	===================================================================
	--- www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
	+++ www/iridium/files/patch-ui_gfx_native__pixmap__handle.h
	@@ -1,28 +1,38 @@
	---- ui/gfx/native_pixmap_handle.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/native_pixmap_handle.h.orig 2019-10-21 19:07:29 UTC
	+++ ui/gfx/native_pixmap_handle.h
	-@@ -13,7 +13,7 @@
	+@@ -15,7 +15,7 @@
	#include "build/build_config.h"
	#include "ui/gfx/gfx_export.h"

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- #include "base/file_descriptor_posix.h"
	+ #include "base/files/scoped_file.h"
	#endif

	-@@ -54,14 +54,14 @@ struct GFX_EXPORT NativePixmapHandle {
	+@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane {
	+ NativePixmapPlane(int stride,
	+ int offset,
	+ uint64_t size
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ ,
	+ base::ScopedFD fd
	+ #elif defined(OS_FUCHSIA)
	+@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane {
	+ // This is necessary to map the buffers.
	+ uint64_t size;

	- ~NativePixmapHandle();
	-
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- // File descriptors for the underlying memory objects (usually dmabufs).
	- std::vector<base::FileDescriptor> fds;
	- #endif
	+ // File descriptor for the underlying memory object (usually dmabuf).
	+ base::ScopedFD fd;
	+ #elif defined(OS_FUCHSIA)
	+@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle {
	+
	std::vector<NativePixmapPlane> planes;
	- };

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- // Returns an instance of \|handle\| which can be sent over IPC. This duplicates
	- // the file-handles, so that the IPC code take ownership of them, without
	- // invalidating \|handle\|.
	+ // The modifier is retrieved from GBM library and passed to EGL driver.
	+ // Generally it's platform specific, and we don't need to modify it in
	+ // Chromium code. Also one per plane per entry.
	Index: www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
	+++ www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc
	@@ -1,28 +1,56 @@
	---- ui/gfx/native_pixmap_handle.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/native_pixmap_handle.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/gfx/native_pixmap_handle.cc
	-@@ -4,14 +4,14 @@
	+@@ -8,7 +8,7 @@

	- #include "ui/gfx/native_pixmap_handle.h"
	+ #include "build/build_config.h"

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	#include <drm_fourcc.h>
	#include "base/posix/eintr_wrapper.h"
	#endif
	+@@ -20,7 +20,7 @@

	namespace gfx {

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	- static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID,
	- "gfx::NativePixmapPlane::kNoModifier should be an alias for"
	+ static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID,
	+ "gfx::NativePixmapHandle::kNoModifier should be an alias for"
	"DRM_FORMAT_MOD_INVALID");
	-@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix
	-
	- NativePixmapHandle::~NativePixmapHandle() {}
	-
	+@@ -31,7 +31,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of
	+ NativePixmapPlane::NativePixmapPlane(int stride,
	+ int offset,
	+ uint64_t size
	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ ,
	+ base::ScopedFD fd
	+ #elif defined(OS_FUCHSIA)
	+@@ -42,7 +42,7 @@ NativePixmapPlane::NativePixmapPlane(int stride,
	+ : stride(stride),
	+ offset(offset),
	+ size(size)
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ ,
	+ fd(std::move(fd))
	+ #elif defined(OS_FUCHSIA)
	+@@ -70,7 +70,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati
	NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
	NativePixmapHandle clone;
	- std::vector<base::ScopedFD> scoped_fds;
	+ for (auto& plane : handle.planes) {
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ DCHECK(plane.fd.is_valid());
	+ base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get())));
	+ if (!fd_dup.is_valid()) {
	+@@ -96,7 +96,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma
	+ #endif
	+ }
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ clone.modifier = handle.modifier;
	+ #endif
	+
	Index: www/iridium/files/patch-ui_gfx_render__text.cc
	===================================================================
	--- www/iridium/files/patch-ui_gfx_render__text.cc
	+++ www/iridium/files/patch-ui_gfx_render__text.cc
	@@ -1,6 +1,6 @@
	---- ui/gfx/render_text.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/gfx/render_text.cc.orig 2019-09-09 21:55:46 UTC
	+++ ui/gfx/render_text.cc
	-@@ -934,32 +934,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
	+@@ -983,32 +983,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
	const int extra_content = GetContentWidth() - display_rect_.width();
	const int cursor_width = cursor_enabled_ ? 1 : 0;

	Index: www/iridium/files/patch-ui_gl_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-ui_gl_BUILD.gn
	+++ www/iridium/files/patch-ui_gl_BUILD.gn
	@@ -1,6 +1,6 @@
	---- ui/gl/BUILD.gn.orig 2019-03-11 22:01:19 UTC
	+--- ui/gl/BUILD.gn.orig 2019-10-21 19:07:29 UTC
	+++ ui/gl/BUILD.gn
	-@@ -212,7 +212,7 @@ jumbo_component("gl") {
	+@@ -219,7 +219,7 @@ jumbo_component("gl") {
	]
	}

	Index: www/iridium/files/patch-ui_gl_generate__bindings.py
	===================================================================
	--- www/iridium/files/patch-ui_gl_generate__bindings.py
	+++ www/iridium/files/patch-ui_gl_generate__bindings.py
	@@ -1,6 +1,6 @@
	---- ui/gl/generate_bindings.py.orig 2019-03-11 22:01:19 UTC
	+--- ui/gl/generate_bindings.py.orig 2019-10-21 19:07:29 UTC
	+++ ui/gl/generate_bindings.py
	-@@ -2624,6 +2624,9 @@ GLX_FUNCTIONS = [
	+@@ -2721,6 +2721,9 @@ GLX_FUNCTIONS = [
	'arguments':
	'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
	'int32_t* denominator' },
	Index: www/iridium/files/patch-ui_gl_gl__surface__glx.cc
	===================================================================
	--- www/iridium/files/patch-ui_gl_gl__surface__glx.cc
	+++ www/iridium/files/patch-ui_gl_gl__surface__glx.cc
	@@ -0,0 +1,14 @@
	+--- ui/gl/gl_surface_glx.cc.orig 2019-09-09 21:55:47 UTC
	++++ ui/gl/gl_surface_glx.cc
	+@@ -461,7 +461,10 @@ bool GLSurfaceGLX::InitializeOneOff() {
	+ return false;
	+ }
	+
	+- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual();
	++ const auto& visual_info =
	++ ui::IsCompositingManagerPresent()
	++ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual()
	++ : gl::GLVisualPickerGLX::GetInstance()->system_visual();
	+ g_visual = visual_info.visual;
	+ g_depth = visual_info.depth;
	+ g_colormap =
	Index: www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
	===================================================================
	--- www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
	+++ www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
	@@ -1,4 +1,4 @@
	---- ui/gl/sync_control_vsync_provider.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/gl/sync_control_vsync_provider.cc.orig 2019-04-30 22:23:42 UTC
	+++ ui/gl/sync_control_vsync_provider.cc
	@@ -11,7 +11,7 @@
	#include "base/trace_event/trace_event.h"
	@@ -27,7 +27,7 @@
	// The actual clock used for the system time returned by glXGetSyncValuesOML
	// is unspecified. In practice, the clock used is likely to be either
	// CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the
	-@@ -157,11 +157,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
	+@@ -156,11 +156,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
	return true;
	#else
	return false;
	Index: www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h
	===================================================================
	--- www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h
	+++ www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h
	@@ -1,6 +1,6 @@
	---- ui/message_center/public/cpp/message_center_constants.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/message_center/public/cpp/message_center_constants.h.orig 2019-06-04 18:55:50 UTC
	+++ ui/message_center/public/cpp/message_center_constants.h
	-@@ -101,7 +101,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
	+@@ -105,7 +105,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
	const int kButtonIconTopPadding = 11; // In DIPs.
	const int kButtonIconToTitlePadding = 16; // In DIPs.

	Index: www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
	===================================================================
	--- www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
	+++ www/iridium/files/patch-ui_message__center_views_message__popup__view.cc
	@@ -1,11 +1,11 @@
	---- ui/message_center/views/message_popup_view.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/message_center/views/message_popup_view.cc.orig 2019-09-09 21:55:47 UTC
	+++ ui/message_center/views/message_popup_view.cc
	-@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() {
	+@@ -106,7 +106,7 @@ void MessagePopupView::AutoCollapse() {
	void MessagePopupView::Show() {
	views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
	- params.keep_on_top = true;
	+ params.z_order = ui::ZOrderLevel::kFloatingWindow;
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_BSD) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)
	- params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
	- #else
	- params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ // Make the widget explicitly activatable as TYPE_POPUP is not activatable by
	+ // default but we need focus for the inline reply textarea.
	+ params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
	Index: www/iridium/files/patch-ui_native__theme_native__theme.h
	===================================================================
	--- www/iridium/files/patch-ui_native__theme_native__theme.h
	+++ www/iridium/files/patch-ui_native__theme_native__theme.h
	@@ -1,6 +1,6 @@
	---- ui/native_theme/native_theme.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/native_theme/native_theme.h.orig 2019-10-21 19:07:29 UTC
	+++ ui/native_theme/native_theme.h
	-@@ -48,7 +48,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
	+@@ -49,7 +49,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
	// The part to be painted / sized.
	enum Part {
	kCheckbox,
	Index: www/iridium/files/patch-ui_native__theme_native__theme__base.cc
	===================================================================
	--- www/iridium/files/patch-ui_native__theme_native__theme__base.cc
	+++ www/iridium/files/patch-ui_native__theme_native__theme__base.cc
	@@ -1,11 +1,11 @@
	---- ui/native_theme/native_theme_base.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/native_theme/native_theme_base.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/native_theme/native_theme_base.cc
	-@@ -172,7 +172,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
	+@@ -177,7 +177,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
	case kCheckbox:
	- PaintCheckbox(canvas, state, rect, extra.button);
	+ PaintCheckbox(canvas, state, rect, extra.button, color_scheme);
	break;
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
	case kFrameTopArea:
	- PaintFrameTopArea(canvas, state, rect, extra.frame_top_area);
	- break;
	+ PaintFrameTopArea(canvas, state, rect, extra.frame_top_area,
	+ color_scheme);
	Index: www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
	===================================================================
	--- www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
	+++ www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
	@@ -0,0 +1,20 @@
	+--- ui/platform_window/platform_window_delegate.h.orig 2019-10-30 16:37:03 UTC
	++++ ui/platform_window/platform_window_delegate.h
	+@@ -9,7 +9,7 @@
	+
	+ // By default, PlatformWindowDelegateBase is used. However, different platforms
	+ // should specify what delegate they would like to use if needed.
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "ui/platform_window/platform_window_delegate_linux.h"
	+ #else
	+ #include "ui/platform_window/platform_window_delegate_base.h"
	+@@ -17,7 +17,7 @@
	+
	+ namespace ui {
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ using PlatformWindowDelegate = PlatformWindowDelegateLinux;
	+ #else
	+ using PlatformWindowDelegate = PlatformWindowDelegateBase;
	Index: www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
	===================================================================
	--- www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
	+++ www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h
	@@ -0,0 +1,11 @@
	+--- ui/platform_window/platform_window_init_properties.h.orig 2019-10-30 16:37:28 UTC
	++++ ui/platform_window/platform_window_init_properties.h
	+@@ -73,7 +73,7 @@ struct PlatformWindowInitProperties {
	+ bool remove_standard_frame = false;
	+ std::string workspace;
	+
	+-#if defined(OS_LINUX)
	++#if defined(OS_LINUX) \|\| defined(OS_BSD)
	+ bool prefer_dark_theme = false;
	+ gfx::ImageSkia* icon = nullptr;
	+ base::Optional<int> background_color;
	Index: www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
	+++ www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
	@@ -1,6 +1,6 @@
	---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/bubble/bubble_dialog_delegate_view.cc
	-@@ -112,7 +112,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
	+@@ -135,7 +135,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
	bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
	Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);

	Index: www/iridium/files/patch-ui_views_controls_label.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_controls_label.cc
	+++ www/iridium/files/patch-ui_views_controls_label.cc
	@@ -1,6 +1,6 @@
	---- ui/views/controls/label.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/controls/label.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/controls/label.cc
	-@@ -542,7 +542,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
	+@@ -691,7 +691,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
	GetFocusManager()->SetFocusedView(this);
	}

	@@ -9,12 +9,12 @@
	if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
	GetFocusManager()->SetFocusedView(this);
	#endif
	-@@ -727,7 +727,7 @@ bool Label::PasteSelectionClipboard() {
	+@@ -876,7 +876,7 @@ bool Label::PasteSelectionClipboard() {
	}

	void Label::UpdateSelectionClipboard() {
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
	- if (!obscured()) {
	- ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	+ if (!GetObscured()) {
	+ ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection)
	.WriteText(GetSelectedText());
	Index: www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
	+++ www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
	@@ -1,6 +1,6 @@
	---- ui/views/controls/textfield/textfield.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/controls/textfield/textfield.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/controls/textfield/textfield.cc
	-@@ -59,7 +59,7 @@
	+@@ -60,7 +60,7 @@
	#include "base/win/win_util.h"
	#endif

	@@ -9,7 +9,7 @@
	#include "base/strings/utf_string_conversions.h"
	#include "ui/base/ime/linux/text_edit_command_auralinux.h"
	#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
	-@@ -162,14 +162,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
	+@@ -178,14 +178,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
	case ui::VKEY_BACK:
	if (!control)
	return ui::TextEditCommand::DELETE_BACKWARD;
	@@ -26,7 +26,7 @@
	// Only erase by line break on Linux and ChromeOS.
	if (shift && control)
	return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
	-@@ -228,7 +228,7 @@ bool IsControlKeyModifier(int flags) {
	+@@ -253,7 +253,7 @@ bool IsControlKeyModifier(int flags) {
	// Control-modified key combination, but we cannot extend it to other platforms
	// as Control has different meanings and behaviors.
	// https://crrev.com/2580483002/#msg46
	@@ -35,7 +35,7 @@
	return flags & ui::EF_CONTROL_DOWN;
	#else
	return false;
	-@@ -682,7 +682,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
	+@@ -725,7 +725,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
	#endif
	}

	@@ -44,7 +44,7 @@
	if (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
	RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE);
	#endif
	-@@ -726,7 +726,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
	+@@ -771,7 +771,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
	if (!textfield)
	return handled;

	@@ -53,7 +53,7 @@
	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
	ui::GetTextEditKeyBindingsDelegate();
	std::vector<ui::TextEditCommandAuraLinux> commands;
	-@@ -894,7 +894,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
	+@@ -918,7 +918,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
	}

	bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
	@@ -62,12 +62,12 @@
	// Skip any accelerator handling that conflicts with custom keybindings.
	ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
	ui::GetTextEditKeyBindingsDelegate();
	-@@ -2076,7 +2076,7 @@ bool Textfield::PasteSelectionClipboard() {
	+@@ -2170,7 +2170,7 @@ bool Textfield::PasteSelectionClipboard() {
	}

	void Textfield::UpdateSelectionClipboard() {
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
	if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) {
	- ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION)
	+ ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection)
	.WriteText(GetSelectedText());
	Index: www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
	+++ www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
	@@ -1,11 +1,11 @@
	---- ui/views/corewm/tooltip_aura.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/corewm/tooltip_aura.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/corewm/tooltip_aura.cc
	-@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;
	+@@ -42,7 +42,7 @@ constexpr int kVerticalPaddingBottom = 5;

	// TODO(varkha): Update if native widget can be transparent on Linux.
	bool CanUseTranslucentTooltipWidget() {
	--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
	+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_WIN)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_WIN) \|\| defined(OS_BSD)
	return false;
	#else
	return true;
	Index: www/iridium/files/patch-ui_views_examples_widget__example.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_examples_widget__example.cc
	+++ www/iridium/files/patch-ui_views_examples_widget__example.cc
	@@ -1,4 +1,4 @@
	---- ui/views/examples/widget_example.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/examples/widget_example.cc.orig 2019-09-09 21:55:47 UTC
	+++ ui/views/examples/widget_example.cc
	@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container)
	BuildButton(container, "Popup widget", POPUP);
	Index: www/iridium/files/patch-ui_views_selection__controller.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_selection__controller.cc
	+++ www/iridium/files/patch-ui_views_selection__controller.cc
	@@ -1,6 +1,6 @@
	---- ui/views/selection_controller.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/selection_controller.cc.orig 2019-06-04 18:55:50 UTC
	+++ ui/views/selection_controller.cc
	-@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont
	+@@ -21,7 +21,7 @@ SelectionController::SelectionController(SelectionCont
	delegate_(delegate),
	handles_selection_clipboard_(false) {
	// On Linux, update the selection clipboard on a text selection.
	Index: www/iridium/files/patch-ui_views_style_platform__style.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_style_platform__style.cc
	+++ www/iridium/files/patch-ui_views_style_platform__style.cc
	@@ -1,6 +1,6 @@
	---- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/style/platform_style.cc.orig 2019-07-24 18:59:23 UTC
	+++ ui/views/style/platform_style.cc
	-@@ -18,7 +18,7 @@
	+@@ -17,7 +17,7 @@

	#if defined(OS_CHROMEOS)
	#include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
	Index: www/iridium/files/patch-ui_views_views__delegate.h
	===================================================================
	--- www/iridium/files/patch-ui_views_views__delegate.h
	+++ www/iridium/files/patch-ui_views_views__delegate.h
	@@ -1,6 +1,6 @@
	---- ui/views/views_delegate.h.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC
	+++ ui/views/views_delegate.h
	-@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate {
	+@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate {
	// Returns true if the window passed in is in the Windows 8 metro
	// environment.
	virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
	Index: www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
	===================================================================
	--- www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
	+++ www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
	@@ -1,8 +1,8 @@
	---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-03-17 17:59:02 UTC
	+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
	-@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
	+@@ -146,7 +146,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform

	- bool is_active_ = false;
	+ base::string16 window_title_;

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	Index: www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
	+++ www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
	@@ -1,15 +1,15 @@
	---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-03-17 17:58:04 UTC
	+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
	-@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
	- const Widget::InitParams& params) {
	- native_widget_delegate_->OnNativeWidgetCreated();
	+@@ -137,7 +137,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
	+ Widget::InitParams::TYPE_WINDOW &&
	+ !params.remove_standard_frame);

	-#if defined(OS_LINUX)
	+#if defined(OS_LINUX) \|\| defined(OS_BSD)
	// Setup a non_client_window_event_filter, which handles resize/move, double
	// click and other events.
	DCHECK(!non_client_window_event_filter_);
	-@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
	+@@ -668,7 +668,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
	}

	void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() {
	Index: www/iridium/files/patch-ui_views_window_custom__frame__view.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_window_custom__frame__view.cc
	+++ www/iridium/files/patch-ui_views_window_custom__frame__view.cc
	@@ -1,6 +1,6 @@
	---- ui/views/window/custom_frame_view.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/window/custom_frame_view.cc.orig 2019-09-09 21:55:47 UTC
	+++ ui/views/window/custom_frame_view.cc
	-@@ -305,7 +305,7 @@ int CustomFrameView::NonClientTopBorderHeight() const
	+@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const
	int CustomFrameView::CaptionButtonY() const {
	// Maximized buttons start at window top so that even if their images aren't
	// drawn flush with the screen edge, they still obey Fitts' Law.
	Index: www/iridium/files/patch-ui_views_window_dialog__delegate.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_window_dialog__delegate.cc
	+++ www/iridium/files/patch-ui_views_window_dialog__delegate.cc
	@@ -1,11 +1,11 @@
	---- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/window/dialog_delegate.cc.orig 2019-10-21 19:07:29 UTC
	+++ ui/views/window/dialog_delegate.cc
	-@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
	- params.bounds = bounds;
	- DialogDelegate* dialog = delegate->AsDialogDelegate();
	+@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg

	+ // static
	+ bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
	-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
	-+#if (defined(OS_LINUX) \|\| defined(OS_BSD)) && !defined(OS_CHROMEOS)
	++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) \|\| defined(OS_BSD)
	// The new style doesn't support unparented dialogs on Linux desktop.
	- if (dialog)
	- dialog->supports_custom_frame_ &= parent != NULL;
	+ return parent != nullptr;
	+ #elif defined(OS_WIN)
	Index: www/iridium/files/patch-ui_views_window_frame__background.cc
	===================================================================
	--- www/iridium/files/patch-ui_views_window_frame__background.cc
	+++ www/iridium/files/patch-ui_views_window_frame__background.cc
	@@ -1,6 +1,6 @@
	---- ui/views/window/frame_background.cc.orig 2019-03-11 22:01:19 UTC
	+--- ui/views/window/frame_background.cc.orig 2019-06-04 18:55:50 UTC
	+++ ui/views/window/frame_background.cc
	-@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
	+@@ -106,7 +106,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
	const View* view) const {
	// Fill the top with the frame color first so we have a constant background
	// for areas not covered by the theme image.
	Index: www/iridium/files/patch-ui_webui_resources_js_cr.js
	===================================================================
	--- www/iridium/files/patch-ui_webui_resources_js_cr.js
	+++ www/iridium/files/patch-ui_webui_resources_js_cr.js
	@@ -1,6 +1,6 @@
	---- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC
	+--- ui/webui/resources/js/cr.js.orig 2019-09-09 21:55:47 UTC
	+++ ui/webui/resources/js/cr.js
	-@@ -463,6 +463,11 @@ var cr = cr \|\| function(global) {
	+@@ -436,6 +436,11 @@ var cr = cr \|\| function(global) {
	get doc() {
	return document;
	},
	Index: www/iridium/files/patch-ui_webui_resources_js_icon.js
	===================================================================
	--- www/iridium/files/patch-ui_webui_resources_js_icon.js
	+++ www/iridium/files/patch-ui_webui_resources_js_icon.js
	@@ -1,6 +1,6 @@
	---- ui/webui/resources/js/icon.js.orig 2019-03-11 22:01:19 UTC
	+--- ui/webui/resources/js/icon.js.orig 2019-10-21 19:07:29 UTC
	+++ ui/webui/resources/js/icon.js
	-@@ -14,7 +14,7 @@ cr.define('cr.icon', function() {
	+@@ -16,7 +16,7 @@ cr.define('cr.icon', function() {
	// supports SCALE_FACTOR_100P on all non-iOS platforms.
	supportedScaleFactors.push(1);
	}
	Index: www/iridium/files/patch-v8_BUILD.gn
	===================================================================
	--- www/iridium/files/patch-v8_BUILD.gn
	+++ www/iridium/files/patch-v8_BUILD.gn
	@@ -1,6 +1,6 @@
	---- v8/BUILD.gn.orig 2019-03-11 22:08:08 UTC
	+--- v8/BUILD.gn.orig 2019-10-21 19:09:21 UTC
	+++ v8/BUILD.gn
	-@@ -3160,7 +3160,7 @@ v8_component("v8_libbase") {
	+@@ -3588,7 +3588,7 @@ v8_component("v8_libbase") {
	}
	}

	@@ -9,7 +9,7 @@
	sources += [
	"src/base/debug/stack_trace_posix.cc",
	"src/base/platform/platform-linux.cc",
	-@@ -3180,6 +3180,12 @@ v8_component("v8_libbase") {
	+@@ -3608,6 +3608,12 @@ v8_component("v8_libbase") {
	"dl",
	"rt",
	]
	@@ -22,8 +22,8 @@
	} else if (is_android) {
	if (current_toolchain == host_toolchain) {
	libs = [
	-@@ -3384,6 +3390,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
	- "src/snapshot/embedded-file-writer.h",
	+@@ -3859,6 +3865,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
	+ "src/snapshot/embedded/platform-embedded-file-writer-win.h",
	"src/snapshot/mksnapshot.cc",
	]
	+ libs = ["execinfo"]
	Index: www/iridium/files/patch-v8_src_api.cc
	===================================================================
	--- www/iridium/files/patch-v8_src_api.cc
	+++ www/iridium/files/patch-v8_src_api.cc
	@@ -1,20 +0,0 @@
	---- v8/src/api.cc.orig 2019-03-11 22:08:08 UTC
	-+++ v8/src/api.cc
	-@@ -107,7 +107,7 @@
	- #include "src/wasm/wasm-result.h"
	- #include "src/wasm/wasm-serialization.h"
	-
	--#if V8_OS_LINUX \|\| V8_OS_MACOSX
	-+#if V8_OS_LINUX \|\| V8_OS_MACOSX \|\| V8_OS_OPENBSD \|\| V8_OS_FREEBSD
	- #include <signal.h>
	- #include "include/v8-wasm-trap-handler-posix.h"
	- #include "src/trap-handler/handler-inside-posix.h"
	-@@ -5759,7 +5759,7 @@ bool v8::V8::Initialize() {
	- return true;
	- }
	-
	--#if V8_OS_LINUX \|\| V8_OS_MACOSX
	-+#if V8_OS_LINUX \|\| V8_OS_MACOSX \|\| V8_OS_OPENBSD \|\| V8_OS_FREEBSD
	- bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,
	- void* context) {
	- #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID
	Index: www/iridium/files/patch-v8_src_api_api.cc
	===================================================================
	--- www/iridium/files/patch-v8_src_api_api.cc
	+++ www/iridium/files/patch-v8_src_api_api.cc
	@@ -0,0 +1,20 @@
	+--- v8/src/api/api.cc.orig 2019-10-21 19:09:21 UTC
	++++ v8/src/api/api.cc
	+@@ -111,7 +111,7 @@
	+ #include "src/wasm/wasm-result.h"
	+ #include "src/wasm/wasm-serialization.h"
	+
	+-#if V8_OS_LINUX \|\| V8_OS_MACOSX
	++#if V8_OS_LINUX \|\| V8_OS_MACOSX \|\| V8_OS_OPENBSD \|\| V8_OS_FREEBSD
	+ #include <signal.h>
	+ #include "include/v8-wasm-trap-handler-posix.h"
	+ #include "src/trap-handler/handler-inside-posix.h"
	+@@ -5573,7 +5573,7 @@ bool v8::V8::Initialize() {
	+ return true;
	+ }
	+
	+-#if V8_OS_LINUX \|\| V8_OS_MACOSX
	++#if V8_OS_LINUX \|\| V8_OS_MACOSX \|\| V8_OS_OPENBSD \|\| V8_OS_FREEBSD
	+ bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info,
	+ void* context) {
	+ #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID
	Index: www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
	===================================================================
	--- www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
	+++ www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
	@@ -1,6 +1,6 @@
	---- v8/src/base/platform/platform-posix.cc.orig 2019-04-05 00:55:20 UTC
	+--- v8/src/base/platform/platform-posix.cc.orig 2019-09-09 21:57:07 UTC
	+++ v8/src/base/platform/platform-posix.cc
	-@@ -376,7 +376,7 @@ bool OS::DiscardSystemPages(void* address, size_t size
	+@@ -382,7 +382,7 @@ bool OS::DiscardSystemPages(void* address, size_t size

	// static
	bool OS::HasLazyCommits() {
	@@ -9,7 +9,7 @@
	return true;
	#else
	// TODO(bbudge) Return true for all POSIX platforms.
	-@@ -501,6 +501,12 @@ int OS::GetCurrentThreadId() {
	+@@ -513,6 +513,12 @@ int OS::GetCurrentThreadId() {
	return static_cast<int>(syscall(__NR_gettid));
	#elif V8_OS_ANDROID
	return static_cast<int>(gettid());
	Index: www/iridium/files/patch-v8_src_external-reference-table.cc
	===================================================================
	--- www/iridium/files/patch-v8_src_external-reference-table.cc
	+++ www/iridium/files/patch-v8_src_external-reference-table.cc
	@@ -1,11 +0,0 @@
	---- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC
	-+++ v8/src/external-reference-table.cc
	-@@ -9,7 +9,7 @@
	- #include "src/external-reference.h"
	- #include "src/ic/stub-cache.h"
	-
	--#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
	-+#if defined(DEBUG) && (defined(V8_OS_LINUX) \|\| defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID)
	- #define SYMBOLIZE_FUNCTION
	- #include <execinfo.h>
	- #include <vector>
	Index: www/iridium/files/patch-v8_src_log-utils.h
	===================================================================
	--- www/iridium/files/patch-v8_src_log-utils.h
	+++ www/iridium/files/patch-v8_src_log-utils.h
	@@ -1,11 +0,0 @@
	---- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC
	-+++ v8/src/log-utils.h
	-@@ -16,6 +16,8 @@
	- #include "src/flags.h"
	- #include "src/ostreams.h"
	-
	-+#include <stdarg.h>
	-+
	- namespace v8 {
	- namespace internal {
	-
	Index: www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc
	===================================================================
	--- www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc
	+++ www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc
	@@ -0,0 +1,20 @@
	+--- weblayer/browser/browser_main_parts_impl.cc.orig 2019-10-30 16:40:04 UTC
	++++ weblayer/browser/browser_main_parts_impl.cc
	+@@ -34,7 +34,7 @@
	+ #if defined(USE_AURA) && defined(USE_X11)
	+ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
	+ #endif
	+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
	++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ #include "ui/base/ime/init/input_method_initializer.h"
	+ #endif
	+
	+@@ -70,7 +70,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
	+ #if defined(USE_X11)
	+ ui::SetDefaultX11ErrorHandlers();
	+ #endif
	+-#if defined(USE_AURA) && defined(OS_LINUX)
	++#if defined(USE_AURA) && (defined(OS_LINUX) \|\| defined(OS_BSD))
	+ ui::InitializeInputMethodForTesting();
	+ #endif
	+ #if defined(OS_ANDROID)
	Index: www/iridium/files/patch-weblayer_shell_app_shell__main.cc
	===================================================================
	--- www/iridium/files/patch-weblayer_shell_app_shell__main.cc
	+++ www/iridium/files/patch-weblayer_shell_app_shell__main.cc
	@@ -0,0 +1,20 @@
	+--- weblayer/shell/app/shell_main.cc.orig 2019-10-30 16:41:17 UTC
	++++ weblayer/shell/app/shell_main.cc
	+@@ -18,7 +18,7 @@
	+
	+ #if defined(OS_WIN)
	+ #include "base/base_paths_win.h"
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ #include "base/nix/xdg_util.h"
	+ #endif
	+
	+@@ -65,7 +65,7 @@ class MainDelegateImpl : public weblayer::MainDelegate
	+ #if defined(OS_WIN)
	+ CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path));
	+ path = path.AppendASCII("web_shell");
	+-#elif defined(OS_LINUX)
	++#elif defined(OS_LINUX) \|\| defined(OS_BSD)
	+ std::unique_ptr<base::Environment> env(base::Environment::Create());
	+ base::FilePath config_dir(base::nix::GetXDGDirectory(
	+ env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir));
	Index: www/iridium/files/pkg-message.in
	===================================================================
	--- www/iridium/files/pkg-message.in
	+++ www/iridium/files/pkg-message.in
	@@ -0,0 +1,13 @@
	+[
	+{ type: install
	+ message: <<EOM
	+Chromium has a known problem of hanging tabs. The bug has been fixed
	+in r337328. Therefore, it is recommended to upgrade the system after
	+the correction date.
	+
	+ # svn diff -c337328 --summarize svn://svn.freebsd.org/base
	+
	+See PR 212812 for further details.
	+EOM
	+}
	+]
	Index: www/iridium/files/sndio_input.h
	===================================================================
	--- www/iridium/files/sndio_input.h
	+++ www/iridium/files/sndio_input.h
	@@ -22,19 +22,7 @@

	class AudioManagerBase;

	-// call-backs invoked from C libraries, thus requiring C linkage
	-extern "C" {
	- // Invoked (on the real-time thread) at each sound card clock tick
	- void sndio_in_onmove(void *arg, int delta);
	- // Invoked (on the real-time thread) whenever the volume changes
	- void sndio_in_onvol(void *arg, unsigned int vol);
	- // Real-time thread entry point
	- void sndio_in_threadstart(void arg);
	-}
	-
	-// Provides an input stream for audio capture based on the SNDIO PCM interface.
	-// This object is not thread safe and all methods should be invoked in the
	-// thread that created the object.
	+// Implementation of AudioOutputStream using sndio(7)
	class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
	public:
	// Pass this to the constructor if you want to attempt auto-selection
	@@ -61,45 +49,39 @@
	bool IsMuted() override;
	void SetOutputDeviceForAec(const std::string& output_device_id) override;

	- // C-linkage call-backs are friends to access private data
	- friend void sndio_in_onmove(void *arg, int delta);
	- friend void sndio_in_onvol(void *arg, unsigned int vol);
	- friend void sndio_in_threadstart(void arg);
	-
	private:
	- // Logs the error and invokes any registered callbacks.
	- void HandleError(const char* method, int error);

	- // Reads one or more buffers of audio from the device, passes on to the
	- // registered callback and schedules the next read.
	- void ReadAudio();
	+ enum StreamState {
	+ kClosed, // Not opened yet
	+ kStopped, // Device opened, but not started yet
	+ kRunning, // Started, device playing
	+ kStopWait // Stopping, waiting for the real-time thread to exit
	+ };

	- // Recovers from any device errors if possible.
	- bool Recover(int error);
	+ // C-style call-backs
	+ static void OnMoveCallback(void *arg, int delta);
	+ static void* ThreadEntry(void *arg);

	- // Non-refcounted pointer back to the audio manager.
	- // The AudioManager indirectly holds on to stream objects, so we don't
	- // want circular references. Additionally, stream objects live on the audio
	- // thread, which is owned by the audio manager and we don't want to addref
	- // the manager from that thread.
	- AudioManagerBase* audio_manager_;
	- std::string device_name_;
	- AudioParameters params_;
	- int bytes_per_buffer_;
	- base::TimeDelta buffer_duration_; // Length of each recorded buffer.
	- AudioInputCallback* callback_; // Valid during a recording session.
	- base::TimeTicks next_read_time_; // Scheduled time for next read callback.
	- struct sio_hdl* device_handle_; // Handle to the SNDIO PCM recording device.
	- std::unique_ptr<uint8_t[]> audio_buffer_; // Buffer used for reading audio data.
	- bool read_callback_behind_schedule_;
	- std::unique_ptr<AudioBus> audio_bus_;
	-
	- int hw_delay_;
	- int sndio_rec_bufsize_;
	- int sndio_rec_bufsz_;
	-
	- // High priority thread running RealTimeThread()
	- pthread_t thread_;
	+ // Continuously moves data from the device to the consumer
	+ void ThreadLoop();
	+ // Our creator, the audio manager needs to be notified when we close.
	+ AudioManagerBase* manager;
	+ // Parameters of the source
	+ AudioParameters params;
	+ // We store data here for consumer
	+ std::unique_ptr<AudioBus> audio_bus;
	+ // Call-back that consumes recorded data
	+ AudioInputCallback* callback; // Valid during a recording session.
	+ // Handle of the audio device
	+ struct sio_hdl* hdl;
	+ // Current state of the stream
	+ enum StreamState state;
	+ // High priority thread running ThreadLoop()
	+ pthread_t thread;
	+ // Number of frames buffered in the hardware
	+ int hw_delay;
	+ // Temporary buffer where data is stored sndio-compatible format
	+ char* buffer;

	DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
	};
	Index: www/iridium/files/sndio_input.cc
	===================================================================
	--- www/iridium/files/sndio_input.cc
	+++ www/iridium/files/sndio_input.cc
	@@ -2,169 +2,200 @@
	// Use of this source code is governed by a BSD-style license that can be
	// found in the LICENSE file.

	-#include "media/audio/sndio/sndio_input.h"
	-
	-#include <stddef.h>
	-
	#include "base/bind.h"
	#include "base/logging.h"
	#include "base/macros.h"
	#include "base/message_loop/message_loop.h"
	+#include "media/base/audio_timestamp_helper.h"
	#include "media/audio/openbsd/audio_manager_openbsd.h"
	#include "media/audio/audio_manager.h"
	+#include "media/audio/sndio/sndio_input.h"

	namespace media {

	static const SampleFormat kSampleFormat = kSampleFormatS16;

	-void sndio_in_onmove(void *arg, int delta) {
	- NOTIMPLEMENTED();
	+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
	+{
	SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);

	- self->hw_delay_ = delta - self->params_.GetBytesPerFrame(kSampleFormat);
	+ self->hw_delay += delta;
	}

	-void sndio_in_threadstart(void arg) {
	- NOTIMPLEMENTED();
	+void SndioAudioInputStream::ThreadEntry(void arg) {
	SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);

	- self->ReadAudio();
	+ self->ThreadLoop();
	return NULL;
	}

	-SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* audio_manager,
	- const std::string& device_name,
	- const AudioParameters& params)
	- : audio_manager_(audio_manager),
	- device_name_(device_name),
	- params_(params),
	- bytes_per_buffer_(params.GetBytesPerBuffer(kSampleFormat)),
	- buffer_duration_(base::TimeDelta::FromMicroseconds(
	- params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
	- static_cast<float>(params.sample_rate()))),
	- callback_(NULL),
	- device_handle_(NULL),
	- read_callback_behind_schedule_(false),
	- audio_bus_(AudioBus::Create(params)) {
	+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
	+ const std::string& device_name,
	+ const AudioParameters& params)
	+ : manager(manager),
	+ params(params),
	+ audio_bus(AudioBus::Create(params)),
	+ state(kClosed) {
	}

	-SndioAudioInputStream::~SndioAudioInputStream() {}
	+SndioAudioInputStream::~SndioAudioInputStream() {
	+ if (state != kClosed)
	+ Close();
	+}

	bool SndioAudioInputStream::Open() {
	struct sio_par par;
	int sig;

	- if (device_handle_)
	- return false; // Already open.
	+ if (state != kClosed)
	+ return false;

	- if (params_.format() != AudioParameters::AUDIO_PCM_LINEAR &&
	- params_.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
	+ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
	+ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
	LOG(WARNING) << "Unsupported audio format.";
	return false;
	}

	sio_initpar(&par);
	- par.rate = params_.sample_rate();
	- par.pchan = params_.channels();
	- par.bits = SampleFormatToBytesPerChannel(kSampleFormat);
	+ par.rate = params.sample_rate();
	+ par.rchan = params.channels();
	+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
	par.bps = par.bits / 8;
	par.sig = sig = par.bits != 8 ? 1 : 0;
	par.le = SIO_LE_NATIVE;
	- par.appbufsz = params_.frames_per_buffer();
	- sndio_rec_bufsz_ = par.bufsz;
	- sndio_rec_bufsize_ = par.round * par.bps * par.rchan;
	+ par.appbufsz = params.frames_per_buffer();

	- device_handle_ = sio_open(SIO_DEVANY, SIO_REC, 0);
	+ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);

	- if (device_handle_ == NULL) {
	+ if (hdl == NULL) {
	LOG(ERROR) << "Couldn't open audio device.";
	return false;
	}

	- if (!sio_setpar(device_handle_, &par) \|\| !sio_getpar(device_handle_, &par)) {
	+ if (!sio_setpar(hdl, &par) \|\| !sio_getpar(hdl, &par)) {
	LOG(ERROR) << "Couldn't set audio parameters.";
	goto bad_close;
	}

	- if (par.rate != (unsigned int)params_.sample_rate() \|\|
	- par.pchan != (unsigned int)params_.channels() \|\|
	- par.bits != (unsigned int)SampleFormatToBytesPerChannel(kSampleFormat) \|\|
	+ if (par.rate != (unsigned int)params.sample_rate() \|\|
	+ par.rchan != (unsigned int)params.channels() \|\|
	+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) \|\|
	par.sig != (unsigned int)sig \|\|
	(par.bps > 1 && par.le != SIO_LE_NATIVE) \|\|
	(par.bits != par.bps * 8)) {
	LOG(ERROR) << "Unsupported audio parameters.";
	goto bad_close;
	}
	- sio_onmove(device_handle_, sndio_in_onmove, this);
	-
	- audio_buffer_.reset(new uint8_t[bytes_per_buffer_]);
	-
	+ state = kStopped;
	+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
	+ sio_onmove(hdl, &OnMoveCallback, this);
	return true;
	bad_close:
	- sio_close(device_handle_);
	+ sio_close(hdl);
	return false;
	}

	-void SndioAudioInputStream::Start(AudioInputCallback* callback) {
	- DCHECK(!callback_ && callback);
	- callback_ = callback;
	+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
	+
	StartAgc();

	- // We start reading data half \|buffer_duration_\| later than when the
	- // buffer might have got filled, to accommodate some delays in the audio
	- // driver. This could also give us a smooth read sequence going forward.
	- base::TimeDelta delay = buffer_duration_ + buffer_duration_ / 2;
	- next_read_time_ = base::TimeTicks::Now() + delay;
	- if (pthread_create(&thread_, NULL, sndio_in_threadstart, this) != 0)
	- LOG(ERROR) << "Failed to create real-time thread.";
	+ state = kRunning;
	+ hw_delay = 0;
	+ callback = cb;
	+ sio_start(hdl);
	+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
	+ LOG(ERROR) << "Failed to create real-time thread for recording.";
	+ sio_stop(hdl);
	+ state = kStopped;
	+ }
	}

	-void SndioAudioInputStream::ReadAudio() {
	- NOTIMPLEMENTED();
	-}
	-
	void SndioAudioInputStream::Stop() {
	- if (!device_handle_ \|\| !callback_)
	+
	+ if (state == kStopped)
	return;

	- StopAgc();
	+ state = kStopWait;
	+ pthread_join(thread, NULL);
	+ sio_stop(hdl);
	+ state = kStopped;

	- pthread_join(thread_, NULL);
	- sio_stop(device_handle_);
	-
	- callback_ = NULL;
	+ StopAgc();
	}

	void SndioAudioInputStream::Close() {
	- if (device_handle_) {
	- sio_close(device_handle_);
	- audio_buffer_.reset();
	- device_handle_ = NULL;
	- }

	- audio_manager_->ReleaseInputStream(this);
	+ if (state == kClosed)
	+ return;
	+
	+ if (state == kRunning)
	+ Stop();
	+
	+ state = kClosed;
	+ delete [] buffer;
	+ sio_close(hdl);
	+
	+ manager->ReleaseInputStream(this);
	}

	double SndioAudioInputStream::GetMaxVolume() {
	- return static_cast<double>(SIO_MAXVOL);
	+ // Not supported
	+ return 0.0;
	}

	void SndioAudioInputStream::SetVolume(double volume) {
	- NOTIMPLEMENTED();
	+ // Not supported. Do nothing.
	}

	double SndioAudioInputStream::GetVolume() {
	- long current_volume = 0;
	- return static_cast<double>(current_volume);
	+ // Not supported.
	+ return 0.0;
	}

	bool SndioAudioInputStream::IsMuted() {
	+ // Not supported.
	return false;
	}

	void SndioAudioInputStream::SetOutputDeviceForAec(
	const std::string& output_device_id) {
	-// Not supported. Do nothing.
	+ // Not supported.
	+}
	+
	+void SndioAudioInputStream::ThreadLoop(void) {
	+ size_t todo, n;
	+ char *data;
	+ unsigned int nframes;
	+ double normalized_volume = 0.0;
	+
	+ nframes = audio_bus->frames();
	+
	+ while (state == kRunning && !sio_eof(hdl)) {
	+
	+ GetAgcVolume(&normalized_volume);
	+
	+ // read one block
	+ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
	+ data = buffer;
	+ while (todo > 0) {
	+ n = sio_read(hdl, data, todo);
	+ if (n == 0)
	+ return; // unrecoverable I/O error
	+ todo -= n;
	+ data += n;
	+ }
	+ hw_delay -= nframes;
	+
	+ // convert frames count to TimeDelta
	+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
	+ params.sample_rate());
	+
	+ // push into bus
	+ audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
	+
	+ // invoke callback
	+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
	+ }
	}

	} // namespace media
	Index: www/iridium/files/sndio_output.h
	===================================================================
	--- www/iridium/files/sndio_output.h
	+++ www/iridium/files/sndio_output.h
	@@ -12,22 +12,10 @@
	#include "base/time/time.h"
	#include "media/audio/audio_io.h"

	-
	namespace media {

	-class AudioParameters;
	class AudioManagerBase;

	-// call-backs invoked from C libraries, thus requiring C linkage
	-extern "C" {
	- // Invoked (on the real-time thread) at each sound card clock tick
	- void sndio_onmove(void *arg, int delta);
	- // Invoked (on the real-time thread) whenever the volume changes
	- void sndio_onvol(void *arg, unsigned int vol);
	- // Real-time thread entry point
	- void sndio_threadstart(void arg);
	-}
	-
	// Implementation of AudioOutputStream using sndio(7)
	class SndioAudioOutputStream : public AudioOutputStream {
	public:
	@@ -37,14 +25,14 @@
	virtual ~SndioAudioOutputStream();

	// Implementation of AudioOutputStream.
	- virtual bool Open() override;
	- virtual void Close() override;
	- virtual void Start(AudioSourceCallback* callback) override;
	- virtual void Stop() override;
	- virtual void SetVolume(double volume) override;
	- virtual void GetVolume(double* volume) override;
	+ bool Open() override;
	+ void Close() override;
	+ void Start(AudioSourceCallback* callback) override;
	+ void Stop() override;
	+ void SetVolume(double volume) override;
	+ void GetVolume(double* volume) override;
	+ void Flush() override;

	- // C-linkage call-backs are friends to access private data
	friend void sndio_onmove(void *arg, int delta);
	friend void sndio_onvol(void *arg, unsigned int vol);
	friend void sndio_threadstart(void arg);
	@@ -56,22 +44,28 @@
	kRunning, // Started, device playing
	kStopWait // Stopping, waiting for the real-time thread to exit
	};
	- // Continuously moves data from the audio bus to the device
	- void RealTimeThread(void);
	+
	+ // C-style call-backs
	+ static void OnMoveCallback(void *arg, int delta);
	+ static void OnVolCallback(void *arg, unsigned int vol);
	+ static void* ThreadEntry(void *arg);
	+
	+ // Continuously moves data from the producer to the device
	+ void ThreadLoop(void);
	+
	// Our creator, the audio manager needs to be notified when we close.
	AudioManagerBase* manager;
	// Parameters of the source
	AudioParameters params;
	// Source stores data here
	std::unique_ptr<AudioBus> audio_bus;
	- int bytes_per_frame;
	// Call-back that produces data to play
	AudioSourceCallback* source;
	// Handle of the audio device
	struct sio_hdl* hdl;
	// Current state of the stream
	enum StreamState state;
	- // High priority thread running RealTimeThread()
	+ // High priority thread running ThreadLoop()
	pthread_t thread;
	// Protects vol, volpending and hw_delay
	pthread_mutex_t mutex;
	@@ -79,7 +73,7 @@
	int vol;
	// Set to 1 if volumes must be refreshed in the realtime thread
	int volpending;
	- // Number of bytes buffered in the hardware
	+ // Number of frames buffered in the hardware
	int hw_delay;
	// Temporary buffer where data is stored sndio-compatible format
	char* buffer;
	Index: www/iridium/files/sndio_output.cc
	===================================================================
	--- www/iridium/files/sndio_output.cc
	+++ www/iridium/files/sndio_output.cc
	@@ -13,22 +13,22 @@

	static const SampleFormat kSampleFormat = kSampleFormatS16;

	-void sndio_onmove(void *arg, int delta) {
	+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
	SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

	- self->hw_delay = delta;
	+ self->hw_delay -= delta;
	}

	-void sndio_onvol(void *arg, unsigned int vol) {
	+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
	SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

	self->vol = vol;
	}

	-void sndio_threadstart(void arg) {
	+void SndioAudioOutputStream::ThreadEntry(void arg) {
	SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);

	- self->RealTimeThread();
	+ self->ThreadLoop();
	return NULL;
	}

	@@ -37,7 +37,6 @@
	: manager(manager),
	params(params),
	audio_bus(AudioBus::Create(params)),
	- bytes_per_frame(params.GetBytesPerFrame(kSampleFormat)),
	state(kClosed),
	mutex(PTHREAD_MUTEX_INITIALIZER) {
	}
	@@ -87,8 +86,8 @@
	volpending = 0;
	vol = 0;
	buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
	- sio_onmove(hdl, sndio_onmove, this);
	- sio_onvol(hdl, sndio_onvol, this);
	+ sio_onmove(hdl, &OnMoveCallback, this);
	+ sio_onvol(hdl, &OnVolCallback, this);
	return true;
	bad_close:
	sio_close(hdl);
	@@ -111,7 +110,7 @@
	hw_delay = 0;
	source = callback;
	sio_start(hdl);
	- if (pthread_create(&thread, NULL, sndio_threadstart, this) != 0) {
	+ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
	LOG(ERROR) << "Failed to create real-time thread.";
	sio_stop(hdl);
	state = kStopped;
	@@ -140,9 +139,13 @@
	pthread_mutex_unlock(&mutex);
	}

	-void SndioAudioOutputStream::RealTimeThread(void) {
	- int avail, count;
	+// This stream is always used with sub second buffer sizes, where it's
	+// sufficient to simply always flush upon Start().
	+void SndioAudioOutputStream::Flush() {}

	+void SndioAudioOutputStream::ThreadLoop(void) {
	+ int avail, count, result;
	+
	while (state == kRunning) {
	// Update volume if needed
	pthread_mutex_lock(&mutex);
	@@ -153,7 +156,8 @@
	pthread_mutex_unlock(&mutex);

	// Get data to play
	- const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, params.sample_rate() * 1000);
	+ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
	+ params.sample_rate());
	count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
	audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
	if (count == 0) {
	@@ -165,8 +169,8 @@

	// Submit data to the device
	avail = count * params.GetBytesPerFrame(kSampleFormat);
	- count = sio_write(hdl, buffer, avail);
	- if (count == 0) {
	+ result = sio_write(hdl, buffer, avail);
	+ if (result == 0) {
	LOG(WARNING) << "Audio device disconnected.";
	break;
	}
	Index: www/iridium/pkg-plist
	===================================================================
	--- www/iridium/pkg-plist
	+++ www/iridium/pkg-plist
	@@ -1,11 +1,20 @@
	bin/iridium
	-%%DATADIR%%/iridium
	+libdata/ldconfig/iridium-browser
	+man/man1/iridium.1.gz
	+share/applications/iridium-browser.desktop
	+share/icons/hicolor/128x128/apps/iridium.png
	+share/icons/hicolor/24x24/apps/iridium.png
	+share/icons/hicolor/256x256/apps/iridium.png
	+share/icons/hicolor/48x48/apps/iridium.png
	+share/icons/hicolor/64x64/apps/iridium.png
	%%DATADIR%%/chrome_100_percent.pak
	%%DATADIR%%/chrome_200_percent.pak
	%%DATADIR%%/headless_lib.pak
	%%DATADIR%%/icudtl.dat
	+%%DATADIR%%/iridium
	%%DATADIR%%/libEGL.so
	%%DATADIR%%/libGLESv2.so
	+%%DATADIR%%/libVkICD_mock_icd.so
	%%DATADIR%%/locales/am.pak
	%%DATADIR%%/locales/am.pak.info
	%%DATADIR%%/locales/ar.pak
	@@ -125,11 +134,11 @@
	%%DATADIR%%/resources/inspector/Images/accelerometer-right.png
	%%DATADIR%%/resources/inspector/Images/accelerometer-top.png
	%%DATADIR%%/resources/inspector/Images/audits_logo.svg
	-%%DATADIR%%/resources/inspector/Images/breakpoint.png
	-%%DATADIR%%/resources/inspector/Images/breakpointConditional.png
	-%%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png
	-%%DATADIR%%/resources/inspector/Images/breakpoint_2x.png
	+%%DATADIR%%/resources/inspector/Images/breakpoint.svg
	+%%DATADIR%%/resources/inspector/Images/breakpointConditional.svg
	+%%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg
	%%DATADIR%%/resources/inspector/Images/checker.png
	+%%DATADIR%%/resources/inspector/Images/chevrons.svg
	%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png
	%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png
	%%DATADIR%%/resources/inspector/Images/chromeLeft.png
	@@ -137,14 +146,11 @@
	%%DATADIR%%/resources/inspector/Images/chromeRight.png
	%%DATADIR%%/resources/inspector/Images/chromeSelect.png
	%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
	-%%DATADIR%%/resources/inspector/Images/errorWave.png
	-%%DATADIR%%/resources/inspector/Images/errorWave_2x.png
	+%%DATADIR%%/resources/inspector/Images/errorWave.svg
	%%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
	%%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg
	-%%DATADIR%%/resources/inspector/Images/largeIcons.png
	-%%DATADIR%%/resources/inspector/Images/largeIcons_2x.png
	-%%DATADIR%%/resources/inspector/Images/mediumIcons.png
	-%%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png
	+%%DATADIR%%/resources/inspector/Images/largeIcons.svg
	+%%DATADIR%%/resources/inspector/Images/mediumIcons.svg
	%%DATADIR%%/resources/inspector/Images/navigationControls.png
	%%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
	%%DATADIR%%/resources/inspector/Images/nodeIcon.png
	@@ -168,16 +174,13 @@
	%%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
	%%DATADIR%%/resources/inspector/Images/searchNext.png
	%%DATADIR%%/resources/inspector/Images/searchPrev.png
	-%%DATADIR%%/resources/inspector/Images/securityIcons.png
	-%%DATADIR%%/resources/inspector/Images/securityIcons_2x.png
	-%%DATADIR%%/resources/inspector/Images/smallIcons.png
	-%%DATADIR%%/resources/inspector/Images/smallIcons_2x.png
	+%%DATADIR%%/resources/inspector/Images/securityIcons.svg
	+%%DATADIR%%/resources/inspector/Images/smallIcons.svg
	%%DATADIR%%/resources/inspector/Images/speech.png
	%%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png
	%%DATADIR%%/resources/inspector/Images/touchCursor.png
	%%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
	-%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png
	-%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png
	+%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg
	%%DATADIR%%/resources/inspector/Images/whatsnew.png
	%%DATADIR%%/resources/inspector/InspectorBackendCommands.js
	%%DATADIR%%/resources/inspector/SupportedCSSProperties.js
	@@ -187,10 +190,11 @@
	%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
	%%DATADIR%%/resources/inspector/animation/animation_module.js
	%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
	-%%DATADIR%%/resources/inspector/audits2/audits2_module.js
	-%%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js
	-%%DATADIR%%/resources/inspector/audits2_worker.js
	-%%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js
	+%%DATADIR%%/resources/inspector/audits/audits_module.js
	+%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js
	+%%DATADIR%%/resources/inspector/audits_worker.js
	+%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js
	+%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js
	%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
	%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
	%%DATADIR%%/resources/inspector/changes/changes_module.js
	@@ -253,8 +257,8 @@
	%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
	%%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
	%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
	-%%DATADIR%%/resources/inspector/formatter_worker.js
	%%DATADIR%%/resources/inspector/formatter/formatter_module.js
	+%%DATADIR%%/resources/inspector/formatter_worker.js
	%%DATADIR%%/resources/inspector/har_importer/har_importer_module.js
	%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js
	%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
	@@ -305,26 +309,9 @@
	%%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
	%%DATADIR%%/resources/inspector/toolbox.html
	%%DATADIR%%/resources/inspector/toolbox.js
	+%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js
	%%DATADIR%%/resources/inspector/worker_app.html
	%%DATADIR%%/resources/inspector/worker_app.js
	%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
	%%DATADIR%%/snapshot_blob.bin
	-%%DATADIR%%/swiftshader/libEGL.so
	-%%DATADIR%%/swiftshader/libGLESv2.so
	%%DATADIR%%/v8_context_snapshot.bin
	-%%DATADIR%%/views_mus_resources.pak
	-%%DEBUG%%%%DATADIR%%/character_data_generator
	-%%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so
	-%%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so
	-%%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so
	-%%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so
	-%%DEBUG%%%%DATADIR%%/libVkLayer_threading.so
	-%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so
	-man/man1/iridium.1.gz
	-share/applications/iridium-browser.desktop
	-share/icons/hicolor/128x128/apps/iridium.png
	-share/icons/hicolor/22x22/apps/iridium.png
	-share/icons/hicolor/24x24/apps/iridium.png
	-share/icons/hicolor/256x256/apps/iridium.png
	-share/icons/hicolor/48x48/apps/iridium.png
	-share/icons/hicolor/64x64/apps/iridium.png

File Metadata

Mime Type: text/plain
Expires: Fri, Sep 18, 2:13 PM (10 h, 42 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29757171
Default Alt Text: D23181.1789740788.diff (851 KB)

D23181.1789740788.diffNo OneTemporaryActions

D23181.1789740788.diffView Options

File Metadata

Event Timeline

D23181.1789740788.diff
No OneTemporary
Actions

D23181.1789740788.diff
View Options