www/iridium: Update to 2018.5.67

743 files changed, 8671 insertions, 7705 deletions

diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index fa69f209867f..39028065490d 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	iridium
-PORTVERSION=	58.0
-PORTREVISION=	19
+PORTVERSION=	2018.5.67
 CATEGORIES=	www
 MASTER_SITES=	https://downloads.iridiumbrowser.de/source/
 PKGNAMESUFFIX=	-browser
@@ -27,9 +26,11 @@ BUILD_DEPENDS=	gperf:devel/gperf \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
 
-LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
+LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
+		libspeechd.so:accessibility/speech-dispatcher \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
+		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
@@ -44,22 +45,22 @@ LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
-		libcups.so:print/cups \
+		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
-		libgnome-keyring.so:security/libgnome-keyring \
+		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
-		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
+		noto-lite>0:x11-fonts/noto-lite
 
 ONLY_FOR_ARCHS=	amd64 i386
-USES=		bison desktop-file-utils jpeg ninja perl5 \
-		pkgconfig python:2.7,build shebangfix tar:xz
+USES=		bison desktop-file-utils jpeg ninja perl5 pkgconfig \
+		python:2.7,build shebangfix tar:xz
 
 USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xcursor xext xdamage xfixes xi \
@@ -77,37 +78,40 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
-		enable_media_router=true \
 		enable_nacl=false \
 		enable_one_click_signin=true \
 		enable_remoting=false \
-		enable_webrtc=false \
 		fieldtrial_testing_like_official_build=true \
 		is_clang=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator="none" \
+		use_allocator_shim=false \
 		use_aura=true \
-		use_cups=true \
-		use_experimental_allocator_shim=false \
+		use_bundled_fontconfig=false \
+		use_custom_libcxx=false \
+		use_gnome_keyring=false \
 		use_gtk3=true \
 		use_lld=true \
 		use_sysroot=false \
+		use_system_freetype=true \
+		use_system_harfbuzz=true \
 		use_system_libjpeg=true \
-		use_system_sqlite=false   # chrome has additional patches
+		extra_cxxflags="-I${LOCALBASE}/include" \
+		extra_ldflags="-L${LOCALBASE}/lib"
 # TODO: investigate building with these options:
-# use_system_harfbuzz use_system_minigbm
+# use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
 
-SUB_FILES=	iridium-browser.desktop iridium
+SUB_FILES=	iridium-browser.desktop iridium pkg-message
 SUB_LIST+=	COMMENT="${COMMENT}"
 
-OPTIONS_DEFINE=	CODECS DEBUG GCONF KERBEROS
+OPTIONS_DEFINE=	CODECS CUPS DEBUG KERBEROS
 CODECS_DESC=	Compile and enable patented codecs like H.264
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 
-OPTIONS_DEFAULT=	ALSA CODECS GCONF KERBEROS
+OPTIONS_DEFAULT=	ALSA CODECS CUPS KERBEROS
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -123,19 +127,21 @@ CODECS_VARS_OFF=	GN_ARGS+=ffmpeg_branding="Chromium" \
 			GN_ARGS+=proprietary_codecs=false \
 			GN_ARGS+=enable_hevc_demuxing=false
 
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
+CUPS_VARS=		GN_ARGS+=use_cups=true
+CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
+
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
+			GN_ARGS+=is_component_buils=false \
 			GN_BOOTSTRAP_FLAGS+=--debug \
-			WANTSPACE="lots of free diskspace (~ 8.5GB)"
+			WANTSPACE="lots of free diskspace (~ 13GB)"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			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 (~ 3.7GB)"
-
-GCONF_USE=		GNOME=gconf2
-GCONF_VARS=		GN_ARGS+=use_gconf=true
-GCONF_VARS_OFF=		GN_ARGS+=use_gconf=false
+			WANTSPACE="a fair amount of free diskspace (~ 6.5GB)"
 
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
@@ -176,6 +182,11 @@ pre-everything::
 	@${ECHO_MSG} "and ${WANTSPACE}."
 	@${ECHO_MSG}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|@@PACKAGE@@|iridium|' \
+			-e 's|@@MENUNAME@@|Iridium Web Browser|' \
+			${WRKSRC}/chrome/app/resources/manpage.1.in
+
 post-patch-SNDIO-on:
 	@${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd
 	@${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio
@@ -189,7 +200,7 @@ pre-configure:
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
-		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
+		ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
@@ -200,28 +211,23 @@ do-configure:
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
-	@${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin
-	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node
+	@${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
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-.for m in font_service test_ime_driver ui
-	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \
-		${STAGEDIR}${DATADIR}
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1/iridium.1
+	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${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
 	@${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
-.for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \
-	resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \
-	views_mus_resources
-	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \
-		${STAGEDIR}${DATADIR}
-.endfor
-.for d in icudtl.dat natives_blob.bin snapshot_blob.bin
+	${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
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
@@ -232,7 +238,19 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/iridium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
+.for f in libEGL.so libGLESv2.so
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
+.endfor
+	@${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
+.for g in libEGL.so libGLESv2.so
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \
+		${STAGEDIR}${DATADIR}/swiftshader
+.endfor
+
+post-install-DEBUG-on:
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index 845958b63719..d47b0563f28c 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493328523
-SHA256 (iridium-browser-58.0.tar.xz) = ec59bf66b1d686c85172c7b9dade6bbda10600df25b17f86a1847d29d8bb9d62
-SIZE (iridium-browser-58.0.tar.xz) = 552368772
+TIMESTAMP = 1534375076
+SHA256 (iridium-browser-2018.5.67.tar.xz) = fd9631aa338954928a96bc9f3711e0273bf5b616dddeb792e303cecd22bba367
+SIZE (iridium-browser-2018.5.67.tar.xz) = 610734108
diff --git a/www/iridium/files/audio_manager_openbsd.cc b/www/iridium/files/audio_manager_openbsd.cc
index dd4a30fa4669..ee293b9d3791 100644
--- a/www/iridium/files/audio_manager_openbsd.cc
+++ b/www/iridium/files/audio_manager_openbsd.cc
@@ -3,14 +3,12 @@
 // found in the LICENSE file.
 
 #include "base/metrics/histogram_macros.h"
+#include "base/memory/ptr_util.h"
 
 #include "media/audio/openbsd/audio_manager_openbsd.h"
 
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_output_dispatcher.h"
-#if defined(USE_PULSEAUDIO)
-#include "media/audio/pulse/audio_manager_pulse.h"
-#endif
 #if defined(USE_SNDIO)
 #include "media/audio/sndio/sndio_input.h"
 #include "media/audio/sndio/sndio_output.h"
@@ -48,10 +46,6 @@ bool AudioManagerOpenBSD::HasAudioInputDevices() {
   return true;
 }
 
-void AudioManagerOpenBSD::ShowAudioInputSettings() {
-  NOTIMPLEMENTED();
-}
-
 void AudioManagerOpenBSD::GetAudioInputDeviceNames(
     AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
@@ -79,15 +73,12 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
 
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
-      kDefaultSampleRate, 16, buffer_size);
+      kDefaultSampleRate, buffer_size);
 }
 
-AudioManagerOpenBSD::AudioManagerOpenBSD(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
-    AudioLogFactory* audio_log_factory)
-    : AudioManagerBase(std::move(task_runner),
-                       std::move(worker_task_runner),
+AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+                                         AudioLogFactory* audio_log_factory)
+    : AudioManagerBase(std::move(audio_thread),
                        audio_log_factory) {
   DLOG(WARNING) << "AudioManagerOpenBSD";
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
@@ -139,10 +130,8 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int sample_rate = kDefaultSampleRate;
   int buffer_size = kDefaultOutputBufferSize;
-  int bits_per_sample = 16;
   if (input_params.IsValid()) {
     sample_rate = input_params.sample_rate();
-    bits_per_sample = input_params.bits_per_sample();
     channel_layout = input_params.channel_layout();
     buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
   }
@@ -153,7 +142,7 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
 
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
-      sample_rate, bits_per_sample, buffer_size);
+      sample_rate, buffer_size);
 }
 
 AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
@@ -170,34 +159,17 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
 }
 #endif
 
-ScopedAudioManagerPtr CreateAudioManager(
-    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+std::unique_ptr<media::AudioManager> CreateAudioManager(
+    std::unique_ptr<AudioThread> audio_thread,
     AudioLogFactory* audio_log_factory) {
   DLOG(WARNING) << "CreateAudioManager";
-#if defined(USE_PULSEAUDIO)
-  // Do not move task runners when creating AudioManagerPulse.
-  // If the creation fails, we need to use the task runners to create other
-  // AudioManager implementations.
-  std::unique_ptr<AudioManagerPulse, AudioManagerDeleter> manager(
-      new AudioManagerPulse(task_runner, worker_task_runner,
-                            audio_log_factory));
-  if (manager->Init()) {
-    UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kPulse, kAudioIOMax + 1);
-    return std::move(manager);
-  }
-  DVLOG(1) << "PulseAudio is not available on the OS";
-#endif
-
 #if defined(USE_SNDIO)
   UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1);
-  return ScopedAudioManagerPtr(
-      new AudioManagerOpenBSD(std::move(task_runner),
-                              std::move(worker_task_runner),audio_log_factory));
+  return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
+                                            audio_log_factory);
 #else
-  return ScopedAudioManagerPtr(
-      new FakeAudioManager(std::move(task_runner),
-                           std::move(worker_task_runner), audio_log_factory));
+  return std::make_unique<FakeAudioManager>(std::move(audio_thread),
+                                            audio_log_factory);
 #endif
 
 }
diff --git a/www/iridium/files/audio_manager_openbsd.h b/www/iridium/files/audio_manager_openbsd.h
index 2972e3661d0d..8c99db966d65 100644
--- a/www/iridium/files/audio_manager_openbsd.h
+++ b/www/iridium/files/audio_manager_openbsd.h
@@ -17,15 +17,13 @@ namespace media {
 
 class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
  public:
-  AudioManagerOpenBSD(
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
-      AudioLogFactory* audio_log_factory);
+  AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+                   AudioLogFactory* audio_log_factory);
+  ~AudioManagerOpenBSD() override;
 
   // Implementation of AudioManager.
   bool HasAudioOutputDevices() override;
   bool HasAudioInputDevices() override;
-  void ShowAudioInputSettings() override;
   void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
   void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
   AudioParameters GetInputStreamParameters(
@@ -50,8 +48,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
       const LogCallback& log_callback) override;
 
  protected:
-  ~AudioManagerOpenBSD() override;
-
   AudioParameters GetPreferredOutputStreamParameters(
       const std::string& output_device_id,
       const AudioParameters& input_params) override;
diff --git a/www/iridium/files/extra-patch-clang b/www/iridium/files/extra-patch-clang
index 1d9997e05468..7f469754bb19 100644
--- a/www/iridium/files/extra-patch-clang
+++ b/www/iridium/files/extra-patch-clang
@@ -27,20 +27,6 @@
    if (*ptr == kFinalTlsValue)
      return;  // We've been called enough times.
    ASSERT_LT(kFinalTlsValue, *ptr);
---- base/tracked_objects_unittest.cc.orig   2015-08-22 15:01:51.000000000 -0400
-+++ base/tracked_objects_unittest.cc    2015-09-03 09:20:53.370191000 -0400
-@@ -58,9 +58,9 @@
-     Births* birth = ThreadData::TallyABirthIfActive(location);
-
-     if (ThreadData::status() == ThreadData::DEACTIVATED)
--      EXPECT_EQ(reinterpret_cast<Births*>(NULL), birth);
-+      EXPECT_EQ(static_cast<Births*>(NULL), birth);
-     else
--      EXPECT_NE(reinterpret_cast<Births*>(NULL), birth);
-+      EXPECT_NE(static_cast<Births*>(NULL), birth);
-   }
-
-   // Helper function to verify the most common test expectations.
 --- media/audio/audio_output_proxy_unittest.cc	2015-04-15 00:18:55.000000000 +0200
 +++ media/audio/audio_output_proxy_unittest.cc	2015-04-18 22:02:38.000000000 +0200
 @@ -387,7 +387,7 @@
diff --git a/www/iridium/files/extra-patch-llvm-base b/www/iridium/files/extra-patch-llvm-base
index 3e117b37257d..434eeac7b442 100644
--- a/www/iridium/files/extra-patch-llvm-base
+++ b/www/iridium/files/extra-patch-llvm-base
@@ -1,8 +1,8 @@
---- build/toolchain/gcc_toolchain.gni.orig	2017-04-19 21:06:28.000000000 +0200
-+++ build/toolchain/gcc_toolchain.gni	2018-06-19 17:35:48.967441000 +0200
-@@ -12,6 +12,11 @@
- import("//build/toolchain/goma.gni")
- import("//build/toolchain/toolchain.gni")
+--- build/toolchain/gcc_toolchain.gni.orig	2018-03-20 23:05:14.000000000 +0100
++++ build/toolchain/gcc_toolchain.gni	2018-06-18 20:55:17.080248000 +0200
+@@ -25,6 +25,11 @@
+     rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
+                 root_build_dir) + " --mode=clang"
  
 +declare_args() {
 +  extra_cxxflags = ""
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -483,10 +488,23 @@
+@@ -596,13 +601,23 @@
    }
  
    gcc_toolchain(target_name) {
@@ -20,6 +20,9 @@
 -    cc = "$prefix/clang"
 -    cxx = "$prefix/clang++"
 -    ld = cxx
+-    readelf = "${toolprefix}readelf"
+-    ar = "${prefix}/llvm-ar"
+-    nm = "${toolprefix}nm"
 +    if (is_bsd) {
 +      prefix = "/usr/local/bin"
 +      cc = "cc"
@@ -34,20 +37,85 @@
 +      cxx = "$prefix/clang++"
 +      ld = cxx
 +      readelf = "${toolprefix}readelf"
-+      ar = "${toolprefix}ar"
++      ar = "${prefix}/llvm-ar"
 +      nm = "${toolprefix}nm"
 +    }
  
-     if (use_clang_static_analyzer) {
-       # Static analysis isn't supported under GOMA. See crbug.com/687245
-@@ -506,10 +524,6 @@
-             rebase_path("//third_party/scan-build/src/libexec/c++-analyzer",
-                         root_build_dir)
-     }
+     forward_variables_from(invoker,
+                            [
+--- build/config/compiler/BUILD.gn.orig	2018-06-13 00:10:02.000000000 +0200
++++ build/config/compiler/BUILD.gn	2018-07-21 13:05:54.418405000 +0200
+@@ -51,7 +51,7 @@
+   # 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 =
+-      linux_use_bundled_binutils_override && is_linux &&
++      linux_use_bundled_binutils_override && (is_linux && !is_bsd) &&
+       (current_cpu == "x64" || current_cpu == "x86")
+   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
+                               root_build_dir)
+@@ -375,8 +375,6 @@
+       "-Wl,-z,relro",
+     ]
+     if (!using_sanitizer) {
+-      ldflags += [ "-Wl,-z,defs" ]
 -
--    readelf = "${toolprefix}readelf"
--    ar = "${toolprefix}ar"
--    nm = "${toolprefix}nm"
- 
-     forward_variables_from(invoker, [ "strip" ])
+       # Functions interposed by the sanitizers can make ld think
+       # that some libraries aren't needed when they actually are,
+       # http://crbug.com/234010. As workaround, disable --as-needed.
+@@ -467,7 +465,7 @@
+   # TODO(hans): Remove this once Clang generates better optimized debug info by
+   # default. https://crbug.com/765793
+   if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
+-      target_os != "chromeos") {
++      target_os != "chromeos" && !is_bsd) {
+     cflags += [
+       "-Xclang",
+       "-mllvm",
+@@ -708,7 +706,7 @@
+         cflags += [ "-mtune=$arm_tune" ]
+       }
+     } else if (current_cpu == "arm64") {
+-      if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
++      if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) {
+         cflags += [ "--target=aarch64-linux-gnu" ]
+         ldflags += [ "--target=aarch64-linux-gnu" ]
+       }
+@@ -1387,10 +1385,6 @@
  
+         # TODO(hans): https://crbug.com/766891
+         "-Wno-null-pointer-arithmetic",
+-
+-        # Ignore warnings about MSVC optimization pragmas.
+-        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+-        "-Wno-ignored-pragma-optimize",
+       ]
+       if (llvm_force_head_revision) {
+         cflags += [
+@@ -2096,7 +2090,7 @@
+         # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
+         cflags += [ "-gdwarf-3" ]
+       }
+-      cflags += [ "-g2" ]
++      cflags += [ "-g0" ]
+     }
+     if (use_debug_fission && !is_nacl) {
+       cflags += [ "-gsplit-dwarf" ]
+@@ -2110,7 +2104,7 @@
+     # 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 && target_cpu != "x86" &&
+-        (use_gold || use_lld)) {
++        (use_gold || use_lld) && !is_bsd) {
+       if (is_clang) {
+         # This flag enables the GNU-format pubnames and pubtypes sections,
+         # which lld needs in order to generate a correct GDB index.
+@@ -2207,7 +2201,7 @@
+   if (!is_win && 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) {
+     # 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
diff --git a/www/iridium/files/extra-patch-llvm-port b/www/iridium/files/extra-patch-llvm-port
index 7130a5a5fa8f..a1ef24de0b17 100644
--- a/www/iridium/files/extra-patch-llvm-port
+++ b/www/iridium/files/extra-patch-llvm-port
@@ -1,8 +1,8 @@
---- build/toolchain/gcc_toolchain.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/toolchain/gcc_toolchain.gni
-@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a
- import("//build/toolchain/goma.gni")
- import("//build/toolchain/toolchain.gni")
+--- build/toolchain/gcc_toolchain.gni.orig	2018-06-13 00:10:02.000000000 +0200
++++ build/toolchain/gcc_toolchain.gni	2018-07-21 12:38:45.107087000 +0200
+@@ -25,6 +25,11 @@
+     rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
+                 root_build_dir) + " --mode=clang"
  
 +declare_args() {
 +  extra_cxxflags = ""
@@ -12,7 +12,22 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -483,10 +488,22 @@ template("clang_toolchain") {
+@@ -343,12 +348,12 @@
+         # We use slightly different arflags for AIX.
+         extra_arflags = "-r -c -s"
+       } else {
+-        extra_arflags = "-r -c -s -D"
++        extra_arflags = "rcsD"
+       }
+ 
+       # Almost all targets build with //build/config/compiler:thin_archive which
+       # adds -T to arflags.
+-      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\""
++      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" {{arflags}} $extra_arflags @\"$rspfile\""
+       description = "AR {{output}}"
+       rspfile_content = "{{inputs}}"
+       outputs = [
+@@ -608,13 +613,22 @@
    }
  
    gcc_toolchain(target_name) {
@@ -20,6 +35,9 @@
 -    cc = "$prefix/clang"
 -    cxx = "$prefix/clang++"
 -    ld = cxx
+-    readelf = "${toolprefix}readelf"
+-    ar = "${prefix}/llvm-ar"
+-    nm = "${toolprefix}nm"
 +    if (is_bsd) {
 +      cc = "${toolprefix}clang60"
 +      cxx = "${toolprefix}clang++60"
@@ -33,20 +51,98 @@
 +      cxx = "$prefix/clang++"
 +      ld = cxx
 +      readelf = "${toolprefix}readelf"
-+      ar = "${toolprefix}ar"
++      ar = "${prefix}/llvm-ar"
 +      nm = "${toolprefix}nm"
 +    }
  
-     if (use_clang_static_analyzer) {
-       # Static analysis isn't supported under GOMA. See crbug.com/687245
-@@ -507,10 +524,6 @@ template("clang_toolchain") {
-                         root_build_dir)
-     }
+     forward_variables_from(invoker,
+                            [
+--- build/config/compiler/BUILD.gn.orig	2018-06-13 00:10:02.000000000 +0200
++++ build/config/compiler/BUILD.gn	2018-07-21 12:57:03.823912000 +0200
+@@ -51,7 +51,7 @@
+   # 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 =
+-      linux_use_bundled_binutils_override && is_linux &&
++      linux_use_bundled_binutils_override && (is_linux && !is_bsd) &&
+       (current_cpu == "x64" || current_cpu == "x86")
+   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
+                               root_build_dir)
+@@ -375,8 +375,6 @@
+       "-Wl,-z,relro",
+     ]
+     if (!using_sanitizer) {
+-      ldflags += [ "-Wl,-z,defs" ]
+-
+       # Functions interposed by the sanitizers can make ld think
+       # that some libraries aren't needed when they actually are,
+       # http://crbug.com/234010. As workaround, disable --as-needed.
+@@ -467,7 +465,7 @@
+   # TODO(hans): Remove this once Clang generates better optimized debug info by
+   # default. https://crbug.com/765793
+   if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
+-      target_os != "chromeos") {
++      target_os != "chromeos" && !is_bsd) {
+     cflags += [
+       "-Xclang",
+       "-mllvm",
+@@ -708,7 +706,7 @@
+         cflags += [ "-mtune=$arm_tune" ]
+       }
+     } else if (current_cpu == "arm64") {
+-      if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
++      if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) {
+         cflags += [ "--target=aarch64-linux-gnu" ]
+         ldflags += [ "--target=aarch64-linux-gnu" ]
+       }
+@@ -1387,10 +1385,6 @@
  
--    readelf = "${toolprefix}readelf"
--    ar = "${toolprefix}ar"
--    nm = "${toolprefix}nm"
+         # TODO(hans): https://crbug.com/766891
+         "-Wno-null-pointer-arithmetic",
 -
-     forward_variables_from(invoker, [ "strip" ])
+-        # Ignore warnings about MSVC optimization pragmas.
+-        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+-        "-Wno-ignored-pragma-optimize",
+       ]
+       if (llvm_force_head_revision) {
+         cflags += [
+@@ -1572,9 +1566,9 @@
+   if ((is_posix && !is_nacl) || is_fuchsia) {
+     # TODO(thomasanderson): Enable on ChromeOS builds once
+     # https://crbug.com/829956 is fixed.
+-    if (default_toolchain != "//build/toolchain/cros:target") {
+-      arflags = [ "-T" ]
+-    }
++    # if (default_toolchain != "//build/toolchain/cros:target") {
++    # arflags = [ "-T" ]
++    # }
+   }
+ }
  
-     toolchain_args = {
+@@ -2096,7 +2090,7 @@
+         # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f
+         cflags += [ "-gdwarf-3" ]
+       }
+-      cflags += [ "-g2" ]
++      cflags += [ "-g0" ]
+     }
+     if (use_debug_fission && !is_nacl) {
+       cflags += [ "-gsplit-dwarf" ]
+@@ -2110,7 +2104,7 @@
+     # 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 && target_cpu != "x86" &&
+-        (use_gold || use_lld)) {
++        (use_gold || use_lld) && !is_bsd) {
+       if (is_clang) {
+         # This flag enables the GNU-format pubnames and pubtypes sections,
+         # which lld needs in order to generate a correct GDB index.
+@@ -2207,7 +2201,7 @@
+   if (!is_win && 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) {
+     # 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
diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn
index 7ca8be9b23be..1d5eff6a4857 100644
--- a/www/iridium/files/patch-BUILD.gn
+++ b/www/iridium/files/patch-BUILD.gn
@@ -1,173 +1,87 @@
---- BUILD.gn.orig	2017-04-19 19:06:27 UTC
-+++ BUILD.gn
-@@ -220,7 +220,7 @@ group("both_gn_and_gyp") {
-     ]
-   }
- 
--  if (!is_ios && !is_android && !is_chromecast) {
-+  if (!is_ios && !is_android && !is_bsd && !is_chromecast) {
-     deps += [
-       "//chrome",
-       "//chrome/test:browser_tests",
-@@ -277,7 +277,7 @@ group("both_gn_and_gyp") {
-     ]
+--- BUILD.gn.orig	2018-06-13 00:09:58.000000000 +0200
++++ BUILD.gn	2018-07-14 12:26:56.482016000 +0200
+@@ -359,7 +359,7 @@
+     }
    }
  
--  if (!is_ios) {
-+  if (!is_ios && !is_bsd) {
-     # TODO(GYP): Figure out which of these should actually build on iOS,
-     # and whether there should be other targets that are iOS-only and missing.
+-  if (is_linux || is_android) {
++  if ((is_linux && !is_bsd) || is_android) {
      deps += [
-@@ -322,7 +322,7 @@ group("both_gn_and_gyp") {
-       "//ui/touch_selection:ui_touch_selection_unittests",
-       "//url/ipc:url_ipc_unittests",
+       "//third_party/breakpad:breakpad_unittests",
+       "//third_party/breakpad:core-2-minidump",
+@@ -401,8 +401,6 @@
+       "//net:disk_cache_memory_test",
+       "//net:quic_client",
+       "//net:quic_server",
+-      "//sandbox/linux:chrome_sandbox",
+-      "//sandbox/linux:sandbox_linux_unittests",
+       "//testing:empty_main",
      ]
--  } else {
-+  } else if (!is_bsd) {
-     deps += [ "//ios:all" ]
-   }
  
-@@ -482,7 +482,7 @@ group("both_gn_and_gyp") {
+@@ -460,10 +458,6 @@
+         "//chrome/test/chromedriver:chromedriver",
+         "//chrome/test/chromedriver:chromedriver_tests",
+         "//components/sync:run_sync_testserver",
+-        "//courgette:courgette",
+-        "//courgette:courgette_fuzz",
+-        "//courgette:courgette_minimal_tool",
+-        "//courgette:courgette_unittests",
+         "//media/cast:generate_barcode_video",
+         "//media/cast:generate_timecode_audio",
+         "//net:crash_cache",
+@@ -519,10 +513,6 @@
+       "//mojo:mojo_perftests",
+       "//services/service_manager/public/cpp",
+       "//testing/gmock:gmock_main",
+-      "//third_party/breakpad:dump_syms($host_toolchain)",
+-      "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
+-      "//third_party/breakpad:minidump_dump($host_toolchain)",
+-      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
      ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     # The following are definitely linux-only.
-     deps += [
-       "//chrome:manpage",
-@@ -505,9 +505,16 @@ group("both_gn_and_gyp") {
-       # TODO(dpranke): add the linux_dump_symbols flag?
-       deps += [ "//chrome:linux_symbols" ]
-     }
-+
-+    if (is_bsd) {
-+      deps -= [
-+        "//sandbox/linux:chrome_sandbox",
-+        "//sandbox/linux:sandbox_linux_unittests",
-+      ]
-+    }
-   }
- 
--  if (is_ios || is_win || (is_linux && !is_chromeos)) {
-+  if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) {
-     deps += [
-       "//base:base_i18n_perftests",
-       "//base:base_perftests",
-@@ -578,7 +585,7 @@ group("both_gn_and_gyp") {
-     if (enable_nacl) {
-       deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
  
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         # TODO(dpranke): Figure out what platforms should actually have this.
-         deps += [ "//components/nacl/loader:nacl_helper" ]
- 
-@@ -684,7 +691,7 @@ group("both_gn_and_gyp") {
-       deps +=
-           [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
+     if (!is_android) {
+@@ -598,7 +588,7 @@
+         host_os == "win") {
+       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
      }
--  } else if (!is_android && !is_ios) {
-+  } else if (!is_android && !is_ios && !is_bsd) {
-     deps += [ "//breakpad:symupload($host_toolchain)" ]
+-  } else if (!is_android && !is_ios && !is_fuchsia) {
++  } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+     deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -728,7 +735,7 @@ group("gn_only") {
-     deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
-   }
+@@ -818,7 +808,6 @@
+       "//ppapi/examples/video_decode",
+       "//sandbox/linux:chrome_sandbox",
+       "//sandbox/linux:sandbox_linux_unittests",
+-      "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
  
--  if (is_win || is_linux) {
-+  if (is_win || is_linux || is_bsd) {
-     deps += [
-       "//mash:all",
-       "//media/mojo/services:media_service_unittests",
-@@ -754,7 +761,7 @@ group("gn_only") {
-     }
-   }
- 
--  if (is_linux && !is_chromeos && !is_chromecast) {
-+  if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) {
-     # TODO(GYP): Figure out if any of these should be in gn_all
-     # and figure out how cross-platform they are
-     deps += [
-@@ -794,7 +801,7 @@ group("gn_only") {
-     }
- 
-     if (target_cpu == "x86" || target_cpu == "x64") {
--      if (!is_android) {
-+      if (!is_android && !is_bsd) {
-         deps += [ "//chrome/test:load_library_perf_tests" ]
-       }
-       deps += [
-@@ -802,7 +809,7 @@ group("gn_only") {
-         "//third_party/libjpeg_turbo:simd_asm",
+       # Blocked on https://github.com/catapult-project/catapult/issues/2297
+       #"//third_party/catapult/telemetry:bitmaptools",
+@@ -921,7 +910,7 @@
        ]
      }
--    if (is_linux && current_toolchain == host_toolchain) {
-+    if ((is_linux || is_bsd) && current_toolchain == host_toolchain) {
-       deps += [ "//v8:v8_shell" ]
-     }
-   }
-@@ -812,7 +819,7 @@ group("gn_only") {
-   }
- 
-   if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
--      (use_libfuzzer && is_mac)) {
-+      (use_libfuzzer && is_mac) || is_bsd) {
-     deps += [
-       "//testing/libfuzzer/fuzzers",
-       "//testing/libfuzzer/tests:libfuzzer_tests",
-@@ -844,7 +851,7 @@ group("gn_only") {
- 
- group("gn_mojo_targets") {
-   testonly = true
--  if (is_linux && !is_chromeos) {
-+  if ((is_linux || is_bsd) && !is_chromeos) {
-     # TODO(GYP): Figure out if any of these should be in gn_all
-     # and figure out how cross-platform they are
-     deps = [
-@@ -870,7 +877,7 @@ group("gn_visibility") {
-   }
- }
- 
--if (!is_ios) {
-+if (!is_ios || !is_bsd) {
-   # This group includes all of the targets needed to build and test Blink,
-   # including running the layout tests (see below).
-   group("blink_tests") {
-@@ -935,7 +942,7 @@ if (!is_ios) {
-       data_deps += [ "//content/shell:content_shell_crash_service" ]
-     }
  
 -    if (!is_win && !is_android) {
 +    if (!is_win && !is_android && !is_bsd) {
-       data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+       data_deps +=
+           [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
- 
-@@ -943,7 +950,7 @@ if (!is_ios) {
-       data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
+@@ -930,7 +919,7 @@
+       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
 -    if (is_linux) {
 +    if (is_linux && !is_bsd) {
-       data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
+       data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -979,7 +986,7 @@ group("chromium_swarm_tests") {
- group("chromium_builder_perf") {
-   testonly = true
+@@ -1055,9 +1044,6 @@
  
--  if (!is_ios && !is_android && !is_chromecast) {
-+  if (!is_ios && !is_android && !is_chromecast && !is_bsd) {
-     data_deps = [
-       "//cc:cc_perftests",
-       "//chrome/test:load_library_perf_tests",
-@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") {
-         "//chrome/installer/mini_installer:mini_installer",
-         "//chrome/test:angle_perftests",
-       ]
+     if (is_win) {
+       data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
 -    } else {
-+    } else if (!is_bsd) {
-       data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+-      data_deps +=
+-          [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-   }
+     if (is_win || is_android) {
+       data_deps += [
diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc
index debd179f357f..fc573f16a19b 100644
--- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/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	2017-04-19 19:06:27 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2017-06-05 19:03:00 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF
+@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
  gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
      const gfx::Rect& client_bounds) const {
    gfx::Rect window_bounds = client_bounds;
diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
index b70a8c5891db..03fc836a74a3 100644
--- a/www/iridium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2017-04-19 19:06:27 UTC
+--- ash/display/mirror_window_controller.cc.orig	2017-06-05 19:03:00 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo
+@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow(
                           return info.id() == iter->first;
                         }) == display_info_list.end()) {
          CloseAndDeleteHost(iter->second, true);
diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn
index 010bdec48c24..725a7d08b332 100644
--- a/www/iridium/files/patch-base_BUILD.gn
+++ b/www/iridium/files/patch-base_BUILD.gn
@@ -1,33 +1,52 @@
---- base/BUILD.gn.orig	2017-04-19 21:06:28.000000000 +0200
-+++ base/BUILD.gn	2017-06-15 22:17:54.935972000 +0200
-@@ -1156,6 +1156,9 @@
+--- base/BUILD.gn.orig	2017-12-15 02:04:05.000000000 +0100
++++ base/BUILD.gn	2017-12-30 01:18:00.438461000 +0100
+@@ -1125,7 +1125,7 @@
+   # 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.
+-  if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
++  if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) &&
+       host_toolchain != "//build/toolchain/cros:host") {
+     libs = [ "atomic" ]
+   }
+@@ -1151,7 +1151,7 @@
+         "allocator/allocator_shim_override_glibc_weak_symbols.h",
+       ]
        deps += [ "//base/allocator:tcmalloc" ]
-     } else if (is_linux && use_allocator == "none") {
+-    } else if (is_linux && use_allocator == "none") {
++    } else if ((is_linux && !is_bsd) && use_allocator == "none") {
        sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
-+    } else if (is_bsd && use_allocator == "none") {
-+      # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc"
-+      sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
      } else if (is_android && use_allocator == "none") {
        sources += [
-         "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
-@@ -1171,6 +1174,33 @@
+@@ -1539,7 +1539,7 @@
+       "//base/third_party/xdg_user_dirs",
+     ]
+   } else {
+-    # Non-Linux.
++    # Non-Linux/BSD.
+     sources -= [
+       "nix/mime_util_xdg.cc",
+       "nix/mime_util_xdg.h",
+@@ -1555,6 +1555,33 @@
      }
    }
  
 +  if (is_bsd) {
 +    sources -= [
-+      "files/file_util_linux.cc",
 +      "files/file_path_watcher_linux.cc",
++      "files/file_util_linux.cc",
++      "process/memory_linux.cc",
 +      "process/process_linux.cc",
++      "process/process_handle_linux.cc",
 +      "process/process_iterator_linux.cc",
 +      "process/process_metrics_linux.cc",
-+      "process/process_handle_linux.cc",
-+      "sys_info_linux.cc",
-+      "trace_event/malloc_dump_provider.cc",
-+      "trace_event/malloc_dump_provider.h",
++      "sys_info_linux.cc"
 +    ]
 +    sources += [
++      "files/file_path_watcher_kqueue.cc",
++      "files/file_path_watcher_kqueue.h",
 +      "files/file_path_watcher_stub.cc",
++      "process/memory_stubs.cc",
 +      "process/process_handle_freebsd.cc",
 +      "process/process_iterator_freebsd.cc",
 +      "process/process_metrics_freebsd.cc",
@@ -39,53 +58,19 @@
 +    ]
 +  }
 +
-+
-+
-   # Allow more direct string conversions on platforms with native utf8
-   # strings
-   if (is_mac || is_ios || is_chromeos || is_chromecast) {
-@@ -1467,7 +1497,7 @@
-   }
- 
-   # Linux.
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (is_asan || is_lsan || is_msan || is_tsan) {
-       # For llvm-sanitizer.
-       data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-@@ -1492,7 +1522,7 @@
-       "//base/third_party/xdg_user_dirs",
-     ]
-   } else {
--    # Non-Linux.
-+    # Non-Linux/BSD.
-     sources -= [
-       "nix/mime_util_xdg.cc",
-       "nix/mime_util_xdg.h",
-@@ -1508,6 +1538,13 @@
-     }
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "threading/platform_thread_linux.cc",
-+    ]
-+    sources += [ "threading/platform_thread_freebsd.cc" ]
-+  }
-+
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -2307,6 +2344,12 @@
-       "trace_event/trace_event_android_unittest.cc",
+@@ -2389,6 +2416,12 @@
      ]
      set_sources_assignment_filter(sources_assignment_filter)
-+  }
+   }
 +
 +  if (is_bsd) {
 +    sources -= [
 +      "debug/proc_maps_linux_unittest.cc",
 +    ]
-   }
++  } 
  
    if (is_win) {
+     deps += [ "//base:scoped_handle_test_dll" ]
diff --git a/www/iridium/files/patch-base_allocator_allocator__shim.cc b/www/iridium/files/patch-base_allocator_allocator__shim.cc
index 511d90c292b4..ec8cc2627508 100644
--- a/www/iridium/files/patch-base_allocator_allocator__shim.cc
+++ b/www/iridium/files/patch-base_allocator_allocator__shim.cc
@@ -1,6 +1,6 @@
---- base/allocator/allocator_shim.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim.cc
-@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc
+@@ -83,7 +83,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
    // 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*>(
diff --git a/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
index 3c57e6577f92..7b1ac77664ac 100644
--- a/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
+++ b/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
@@ -1,15 +1,15 @@
---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
 @@ -3,19 +3,28 @@
  // found in the LICENSE file.
  
  #include "base/allocator/allocator_shim.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.
diff --git a/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc
index a27e4d210171..f51926bd0edf 100644
--- a/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc
+++ b/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc
@@ -1,6 +1,6 @@
---- base/allocator/allocator_shim_unittest.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim_unittest.cc
-@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
  #endif  // !OS_WIN
  
@@ -9,7 +9,7 @@
    void* memalign_ptr = memalign(128, 53);
    ASSERT_NE(nullptr, memalign_ptr);
    ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
-@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
    // pvalloc rounds the size up to the next page.
    ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
@@ -18,7 +18,7 @@
  
    char* realloc_ptr = static_cast<char*>(malloc(10));
    strcpy(realloc_ptr, "foobar");
-@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
    free(zero_alloc_ptr);
    ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
  
diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc
deleted file mode 100644
index 6db3a847061c..000000000000
--- a/www/iridium/files/patch-base_base__paths__posix.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/base_paths_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/base_paths_posix.cc
-@@ -67,13 +67,13 @@ bool PathProviderPosix(int key, FilePath
-       }
-       *result = FilePath(bin_dir);
-       return true;
--#elif defined(OS_OPENBSD)
--      // There is currently no way to get the executable path on OpenBSD
-+#elif defined(OS_BSD)
-+      // There is currently no way to get the executable path on FreeBSD
-       char* cpath;
--      if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
-+      if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL)
-         *result = FilePath(cpath);
-       else
--        *result = FilePath("/usr/local/chrome/chrome");
-+        *result = FilePath("/usr/local/iridium/iridium");
-       return true;
- #endif
-     }
diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc
new file mode 100644
index 000000000000..4eb799c2d27a
--- /dev/null
+++ b/www/iridium/files/patch-base_debug_debugger__posix.cc
@@ -0,0 +1,57 @@
+--- base/debug/debugger_posix.cc.orig	2017-06-18 01:23:49.065175000 +0200
++++ base/debug/debugger_posix.cc	2017-06-18 01:58:29.603481000 +0200
+@@ -84,7 +84,7 @@
+     KERN_PROC,
+     KERN_PROC_PID,
+     getpid()
+-#if defined(OS_OPENBSD)
++#if defined(OS_BSD) 
+     , sizeof(struct kinfo_proc),
+     0
+ #endif
+@@ -92,33 +92,36 @@
+ 
+   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
+   // binary interfaces may change.
+-  struct kinfo_proc info;
+-  size_t info_size = sizeof(info);
++  struct kinfo_proc *info;
++  size_t info_size;
+ 
+-#if defined(OS_OPENBSD)
+   if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0)
+     return -1;
+ 
++  info = (struct kinfo_proc *)malloc(info_size);
++
+   mib[5] = (info_size / sizeof(struct kinfo_proc));
+-#endif
+ 
+-  int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
++  int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0);
+   DCHECK_EQ(sysctl_result, 0);
+   if (sysctl_result != 0) {
+     is_set = true;
+     being_debugged = false;
+-    return being_debugged;
++    goto out;
+   }
+ 
+   // This process is being debugged if the P_TRACED flag is set.
+   is_set = true;
+ #if defined(OS_FREEBSD)
+-  being_debugged = (info.ki_flag & P_TRACED) != 0;
++  being_debugged = (info->ki_flag & P_TRACED) != 0;
+ #elif defined(OS_BSD)
+-  being_debugged = (info.p_flag & P_TRACED) != 0;
++  being_debugged = (info->p_flag & P_TRACED) != 0;
+ #else
+-  being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
++  being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0;
+ #endif
++
++out:
++  free(info);
+   return being_debugged;
+ }
+ 
diff --git a/www/iridium/files/patch-base_debug_stack__trace.h b/www/iridium/files/patch-base_debug_stack__trace.h
new file mode 100644
index 000000000000..c7cc7169d472
--- /dev/null
+++ b/www/iridium/files/patch-base_debug_stack__trace.h
@@ -0,0 +1,10 @@
+--- base/debug/stack_trace.h.orig	2017-08-02 19:09:58.400190000 +0200
++++ base/debug/stack_trace.h	2017-08-02 19:10:33.950334000 +0200
+@@ -16,6 +16,7 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_POSIX)
++#include <sys/stdint.h>
+ #include <unistd.h>
+ #endif
+ 
diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc
index 6b2420bb7915..c7f4c8235310 100644
--- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,5 +1,5 @@
---- base/debug/stack_trace_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/debug/stack_trace_posix.cc
+--- base/debug/stack_trace_posix.cc.orig	2017-07-25 21:04:48.000000000 +0200
++++ base/debug/stack_trace_posix.cc	2017-08-02 18:45:42.071358000 +0200
 @@ -34,7 +34,7 @@
  #include <AvailabilityMacros.h>
  #endif
@@ -9,18 +9,19 @@
  #include "base/debug/proc_maps_linux.h"
  #endif
  
-@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper {
+@@ -574,6 +574,11 @@
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
-+#if defined(OS_FREEBSD)
++#if defined(OS_BSD)
 +    // TODO (rene) avoid link error, implement something?
++    NOTIMPLEMENTED();
 +    return false;
 +#else
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper {
+@@ -589,6 +594,7 @@
  
      is_initialized_ = true;
      return true;
@@ -28,3 +29,12 @@
    }
  
    // Opens all object files and caches their file descriptors.
+@@ -721,7 +727,7 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD)
+   count = std::min(arraysize(trace_), count);
+ 
+   // Though the backtrace API man page does not list any possible negative
diff --git a/www/iridium/files/patch-base_debug_thread__heap__usage__tracker.cc b/www/iridium/files/patch-base_debug_thread__heap__usage__tracker.cc
index 3c59be9ba720..3e3a6eadd277 100644
--- a/www/iridium/files/patch-base_debug_thread__heap__usage__tracker.cc
+++ b/www/iridium/files/patch-base_debug_thread__heap__usage__tracker.cc
@@ -1,6 +1,6 @@
---- base/debug/thread_heap_usage_tracker.cc.orig	2017-04-19 19:06:28 UTC
+--- base/debug/thread_heap_usage_tracker.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/debug/thread_heap_usage_tracker.cc
-@@ -16,11 +16,13 @@
+@@ -16,10 +16,12 @@
  #include "base/threading/thread_local_storage.h"
  #include "build/build_config.h"
  
@@ -9,8 +9,7 @@
  #include <malloc/malloc.h>
  #else
  #include <malloc.h>
- #endif
 +#endif
+ #endif
  
  namespace base {
- namespace debug {
diff --git a/www/iridium/files/patch-base_files_file__path__unittest.cc b/www/iridium/files/patch-base_files_file__path__unittest.cc
index 167644ac3dd2..a0c6dcdd6524 100644
--- a/www/iridium/files/patch-base_files_file__path__unittest.cc
+++ b/www/iridium/files/patch-base_files_file__path__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_path_unittest.cc.orig	2017-04-19 19:06:28 UTC
+--- base/files/file_path_unittest.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/files/file_path_unittest.cc
-@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_
+@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) 
        "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
    };
  
diff --git a/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h b/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
index e8e9425641b5..3b88d7a9fc62 100644
--- a/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
+++ b/www/iridium/files/patch-base_files_file__path__watcher__kqueue.h
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_kqueue.h.orig	2017-04-19 19:06:28 UTC
+--- base/files/file_path_watcher_kqueue.h.orig	2017-06-05 19:03:00 UTC
 +++ base/files/file_path_watcher_kqueue.h
 @@ -5,6 +5,10 @@
  #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
diff --git a/www/iridium/files/patch-base_files_file__path__watcher__stub.cc b/www/iridium/files/patch-base_files_file__path__watcher__stub.cc
new file mode 100644
index 000000000000..cba69a675117
--- /dev/null
+++ b/www/iridium/files/patch-base_files_file__path__watcher__stub.cc
@@ -0,0 +1,51 @@
+--- base/files/file_path_watcher_stub.cc.orig	2018-07-19 23:00:07.807326000 +0200
++++ base/files/file_path_watcher_stub.cc	2018-07-19 23:05:24.785603000 +0200
+@@ -1,14 +1,15 @@
+-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// 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.
+ 
+-// This file exists for Unix systems which don't have the inotify headers, and
+-// thus cannot build file_watcher_inotify.cc
+ 
+-#include "base/files/file_path_watcher.h"
++#include <memory>
+ 
++#include "base/files/file_path_watcher.h"
++#include "base/files/file_path_watcher_kqueue.h"
+ #include "base/macros.h"
+ #include "base/memory/ptr_util.h"
++#include "build/build_config.h"
+ 
+ namespace base {
+ 
+@@ -22,12 +23,26 @@
+   bool Watch(const FilePath& path,
+              bool recursive,
+              const FilePathWatcher::Callback& callback) override {
+-    return false;
++    DCHECK(!impl_.get());
++    if (recursive) {
++      if (!FilePathWatcher::RecursiveWatchAvailable())
++        return false;
++    } else {
++     impl_ = std::make_unique<FilePathWatcherKQueue>();
++    }
++    DCHECK(impl_.get());
++    return impl_->Watch(path, recursive, callback);
+   }
+ 
+-  void Cancel() override {}
++  void Cancel() override {
++    if (impl_.get())
++      impl_->Cancel();
++    set_cancelled();
++  }
+ 
+  private:
++  std::unique_ptr<PlatformDelegate> impl_;
++
+   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
+ };
+ 
diff --git a/www/iridium/files/patch-base_files_file__util.h b/www/iridium/files/patch-base_files_file__util.h
index 9600826a55db..1027e7be6f85 100644
--- a/www/iridium/files/patch-base_files_file__util.h
+++ b/www/iridium/files/patch-base_files_file__util.h
@@ -1,11 +1,11 @@
---- base/files/file_util.h.orig	2017-04-19 19:06:28 UTC
-+++ base/files/file_util.h
-@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA
+--- base/files/file_util.h.orig	2017-07-25 21:04:48.000000000 +0200
++++ base/files/file_util.h	2017-07-29 00:57:11.269678000 +0200
+@@ -406,7 +406,7 @@
  // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
  BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#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.
diff --git a/www/iridium/files/patch-base_files_memory_mapped_file_posix.cc b/www/iridium/files/patch-base_files_memory_mapped_file_posix.cc
new file mode 100644
index 000000000000..e81ed7ae1746
--- /dev/null
+++ b/www/iridium/files/patch-base_files_memory_mapped_file_posix.cc
@@ -0,0 +1,11 @@
+--- base/files/memory_mapped_file_posix.cc.orig	2018-02-24 16:25:08.000000000 +0100
++++ base/files/memory_mapped_file_posix.cc	2018-03-03 19:01:12.448678000 +0100
+@@ -110,6 +110,8 @@
+       // 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
diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc
new file mode 100644
index 000000000000..22780040969d
--- /dev/null
+++ b/www/iridium/files/patch-base_i18n_icu__util.cc
@@ -0,0 +1,20 @@
+--- base/i18n/icu_util.cc.orig	2017-09-05 21:05:11.000000000 +0200
++++ base/i18n/icu_util.cc	2017-09-06 16:47:26.158180000 +0200
+@@ -20,7 +20,7 @@
+ #include "build/build_config.h"
+ #include "third_party/icu/source/common/unicode/putil.h"
+ #include "third_party/icu/source/common/unicode/udata.h"
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
+ #include "third_party/icu/source/i18n/unicode/timezone.h"
+ #endif
+ 
+@@ -312,7 +312,7 @@
+ // 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.
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   if (result)
+     std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
+ #endif
diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc
new file mode 100644
index 000000000000..8cd0a56dcf8a
--- /dev/null
+++ b/www/iridium/files/patch-base_logging__unittest.cc
@@ -0,0 +1,11 @@
+--- base/logging_unittest.cc.orig	2017-06-21 19:47:24.089128000 +0200
++++ base/logging_unittest.cc	2017-06-21 20:02:08.177123000 +0200
+@@ -272,7 +272,7 @@
+   // 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;
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
+ #else  // OS_POSIX && !OS_MACOSX
+   struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr);
diff --git a/www/iridium/files/patch-base_native__library__posix.cc b/www/iridium/files/patch-base_native__library__posix.cc
index b1db681350d3..a853d1d48eff 100644
--- a/www/iridium/files/patch-base_native__library__posix.cc
+++ b/www/iridium/files/patch-base_native__library__posix.cc
@@ -1,11 +1,11 @@
---- base/native_library_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/native_library_posix.cc
-@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio
+--- base/native_library_posix.cc.orig	2017-07-25 21:04:48.000000000 +0200
++++ base/native_library_posix.cc	2017-08-02 21:02:05.991380000 +0200
+@@ -30,7 +30,7 @@
+   // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
+   // and http://crbug.com/40794.
+   int flags = RTLD_LAZY;
+-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND)
++#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD)
+   // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
    // further investigation, as it might vary across versions. Crash here to
    // warn developers that they're trying to rely on uncertain behavior.
-   CHECK(!options.prefer_own_symbols);
--#else
-+#elif !defined(OS_BSD)
-   if (options.prefer_own_symbols)
-     flags |= RTLD_DEEPBIND;
- #endif
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket.cc b/www/iridium/files/patch-base_posix_unix__domain__socket.cc
new file mode 100644
index 000000000000..31324d592776
--- /dev/null
+++ b/www/iridium/files/patch-base_posix_unix__domain__socket.cc
@@ -0,0 +1,49 @@
+--- base/posix/unix_domain_socket.cc.orig	2018-01-04 21:05:38.000000000 +0100
++++ base/posix/unix_domain_socket.cc	2018-01-06 12:44:56.681201000 +0100
+@@ -5,7 +5,10 @@
+ #include "base/posix/unix_domain_socket.h"
+ 
+ #include <errno.h>
++#include <sys/param.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
++#include <sys/ucred.h>
+ #if !defined(OS_NACL_NONSFI)
+ #include <sys/un.h>
+ #endif
+@@ -28,6 +31,14 @@
+ 
+ const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
+ 
++#ifndef SCM_CREDENTIALS
++#  define SCM_CREDENTIALS  0x9001
++#endif
++
++#ifndef SO_PASSCRED
++#  define SO_PASSCRED      0x9002
++#endif
++
+ #if !defined(OS_NACL_NONSFI)
+ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
+   int raw_socks[2];
+@@ -150,7 +161,7 @@
+ #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
+       // The PNaCl toolchain for Non-SFI binary build and macOS do not support
+       // ucred. macOS supports xucred, but this structure is insufficient.
+-      + CMSG_SPACE(sizeof(struct ucred))
++      + CMSG_SPACE(sizeof(struct cmsgcred))
+ #endif  // OS_NACL_NONSFI or OS_MACOSX
+       ;
+   char control_buffer[kControlBufferSize];
+@@ -180,9 +191,9 @@
+       // SCM_CREDENTIALS.
+       if (cmsg->cmsg_level == SOL_SOCKET &&
+           cmsg->cmsg_type == SCM_CREDENTIALS) {
+-        DCHECK_EQ(payload_len, sizeof(struct ucred));
++        DCHECK_EQ(payload_len, sizeof(struct cmsgcred));
+         DCHECK_EQ(pid, -1);
+-        pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
++        pid = getpid();
+       }
+ #endif  // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
+     }
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket__linux.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__linux.cc
deleted file mode 100644
index 997b59b8f1ab..000000000000
--- a/www/iridium/files/patch-base_posix_unix__domain__socket__linux.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- base/posix/unix_domain_socket_linux.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/posix/unix_domain_socket_linux.cc
-@@ -23,6 +23,15 @@
- 
- namespace base {
- 
-+#if defined(OS_BSD)
-+// Port over Linux ucred structure
-+struct ucred {
-+  pid_t pid; // process ID of the sending process
-+  uid_t uid; // user ID of the sending process
-+  gid_t gid; // group ID of the sending process
-+};
-+#endif
-+
- const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
- 
- #if !defined(OS_NACL_NONSFI)
-@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o
- 
- // static
- bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
-+#if defined(OS_BSD)
-+  // XXX(rene) do this? :
-+  // taken from dbus, Academic Free License 2.1 / GPL 2+
-+  return 0; // fake OK
-+#else
-   const int enable = 1;
-   return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
-+#endif
- }
- #endif  // !defined(OS_NACL_NONSFI)
- 
-@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
-       // The PNaCl toolchain for Non-SFI binary build does not support
-       // SCM_CREDENTIALS.
-       if (cmsg->cmsg_level == SOL_SOCKET &&
-+#if defined(OS_BSD)
-+        1) { // XXX(rene) carpet getting full ...
-+#else
-           cmsg->cmsg_type == SCM_CREDENTIALS) {
-+#endif
-         DCHECK_EQ(payload_len, sizeof(struct ucred));
-         DCHECK_EQ(pid, -1);
-         pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
deleted file mode 100644
index 388ab54a555a..000000000000
--- a/www/iridium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/posix/unix_domain_socket_linux_unittest.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/posix/unix_domain_socket_linux_unittest.cc
-@@ -2,10 +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 <stddef.h>
- #include <stdint.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#if defined(OS_BSD)
-+#include <signal.h>
-+#endif
- #include <unistd.h>
- 
- #include "base/bind.h"
diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc
new file mode 100644
index 000000000000..aaf58fc27d17
--- /dev/null
+++ b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc
@@ -0,0 +1,12 @@
+--- base/posix/unix_domain_socket_unittest.cc.orig	2017-12-23 20:50:07.237565000 +0100
++++ base/posix/unix_domain_socket_unittest.cc	2017-12-23 20:51:05.651558000 +0100
+@@ -8,6 +8,9 @@
+ #include <stdint.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "base/bind.h"
diff --git a/www/iridium/files/patch-base_process_internal__linux.cc b/www/iridium/files/patch-base_process_internal__linux.cc
new file mode 100644
index 000000000000..4ce388e4281f
--- /dev/null
+++ b/www/iridium/files/patch-base_process_internal__linux.cc
@@ -0,0 +1,16 @@
+--- base/process/internal_linux.cc.orig	2017-08-10 00:00:17.842158000 +0200
++++ base/process/internal_linux.cc	2017-08-10 00:02:37.838081000 +0200
+@@ -60,10 +60,13 @@
+   // Synchronously reading files in /proc is safe.
+   ThreadRestrictions::ScopedAllowIO allow_io;
+ 
++#if !defined(OS_BSD)
+   if (!ReadFileToString(file, buffer)) {
+     DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII();
+     return false;
+   }
++#endif
++
+   return !buffer->empty();
+ }
+ 
diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h
new file mode 100644
index 000000000000..b8da5df6eb71
--- /dev/null
+++ b/www/iridium/files/patch-base_process_kill.h
@@ -0,0 +1,11 @@
+--- base/process/kill.h.orig	2018-07-19 22:11:43.638992000 +0200
++++ base/process/kill.h	2018-07-19 22:12:06.613065000 +0200
+@@ -111,7 +111,7 @@
+ BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
+     ProcessHandle handle, int* exit_code);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Spawns a thread to wait asynchronously for the child |process| to exit
+ // and then reaps it.
+ BASE_EXPORT void EnsureProcessGetsReaped(Process process);
diff --git a/www/iridium/files/patch-base_process_kill_posix.cc b/www/iridium/files/patch-base_process_kill_posix.cc
new file mode 100644
index 000000000000..0f24fdcd8226
--- /dev/null
+++ b/www/iridium/files/patch-base_process_kill_posix.cc
@@ -0,0 +1,11 @@
+--- base/process/kill_posix.cc.orig	2018-07-19 22:11:49.327358000 +0200
++++ base/process/kill_posix.cc	2018-07-19 22:12:22.837132000 +0200
+@@ -167,7 +167,7 @@
+       0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void EnsureProcessGetsReaped(Process process) {
+   DCHECK(!process.is_current());
+ 
diff --git a/www/iridium/files/patch-base_process_launch.cc b/www/iridium/files/patch-base_process_launch.cc
index 2dca0a643ba2..35a223e5b8bd 100644
--- a/www/iridium/files/patch-base_process_launch.cc
+++ b/www/iridium/files/patch-base_process_launch.cc
@@ -1,6 +1,6 @@
---- base/process/launch.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/launch.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/launch.cc
-@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
+@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
  
  LaunchOptions LaunchOptionsForTest() {
    LaunchOptions options;
diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc
index bb441fd052da..d2c40dbbc6a2 100644
--- a/www/iridium/files/patch-base_process_memory.cc
+++ b/www/iridium/files/patch-base_process_memory.cc
@@ -1,6 +1,15 @@
---- base/process/memory.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/memory.cc
-@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t 
+--- base/process/memory.cc.orig	2017-12-15 02:04:05.000000000 +0100
++++ base/process/memory.cc	2017-12-31 09:49:46.308931000 +0100
+@@ -10,7 +10,7 @@
+ namespace base {
+ 
+ // Defined in memory_win.cc for Windows.
+-#if !defined(OS_WIN)
++#if !defined(OS_WIN) && !defined(OS_BSD)
+ 
+ namespace {
+ 
+@@ -31,7 +31,7 @@
  #endif
  
  // Defined in memory_mac.mm for Mac.
diff --git a/www/iridium/files/patch-base_process_memory.h b/www/iridium/files/patch-base_process_memory.h
index f2b7f5269afa..0afe6514d370 100644
--- a/www/iridium/files/patch-base_process_memory.h
+++ b/www/iridium/files/patch-base_process_memory.h
@@ -1,11 +1,11 @@
---- base/process/memory.h.orig	2017-04-19 19:06:28 UTC
-+++ base/process/memory.h
-@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO
+--- base/process/memory.h.orig	2017-07-25 21:04:48.000000000 +0200
++++ base/process/memory.h	2017-07-29 01:01:15.601297000 +0200
+@@ -32,7 +32,7 @@
  // Crash reporting classifies such crashes as OOM.
  BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
  
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID)
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
  BASE_EXPORT extern size_t g_oom_size;
  
  // The maximum allowed value for the OOM score.
diff --git a/www/iridium/files/patch-base_process_memory__unittest.cc b/www/iridium/files/patch-base_process_memory__unittest.cc
index 41f8b29840d2..56989b877dcf 100644
--- a/www/iridium/files/patch-base_process_memory__unittest.cc
+++ b/www/iridium/files/patch-base_process_memory__unittest.cc
@@ -1,19 +1,15 @@
---- base/process/memory_unittest.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/memory_unittest.cc
-@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
-   ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
- }
- 
--// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
-+// BSD does not support these tests. Don't test these on ASan/TSan/MSan
+--- base/process/memory_unittest.cc.orig	2017-09-05 21:05:11.000000000 +0200
++++ base/process/memory_unittest.cc	2017-09-06 16:53:33.919374000 +0200
+@@ -104,7 +104,7 @@
+ // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
  // configurations: only test the real allocator.
  // Windows only supports these tests with the allocator shim in place.
--#if !defined(OS_OPENBSD) && \
-+#if !defined(OS_BSD) && \
-     BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
+-#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
++#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
      !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
  
-@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
+ namespace {
+@@ -507,5 +507,5 @@
    EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
    EXPECT_TRUE(value_ == NULL);
  }
diff --git a/www/iridium/files/patch-base_process_process__handle.cc b/www/iridium/files/patch-base_process_process__handle.cc
new file mode 100644
index 000000000000..5ba037371727
--- /dev/null
+++ b/www/iridium/files/patch-base_process_process__handle.cc
@@ -0,0 +1,11 @@
+--- base/process/process_handle.cc.orig	2018-07-19 22:31:30.212555000 +0200
++++ base/process/process_handle.cc	2018-07-19 22:32:27.185612000 +0200
+@@ -39,7 +39,7 @@
+   return g_unique_id;
+ }
+ 
+-#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);
diff --git a/www/iridium/files/patch-base_process_process__handle.h b/www/iridium/files/patch-base_process_process__handle.h
new file mode 100644
index 000000000000..a445193a491d
--- /dev/null
+++ b/www/iridium/files/patch-base_process_process__handle.h
@@ -0,0 +1,11 @@
+--- base/process/process_handle.h.orig	2018-07-19 22:31:39.988330000 +0200
++++ base/process/process_handle.h	2018-07-19 22:32:06.977544000 +0200
+@@ -64,7 +64,7 @@
+ // a process's PID.
+ BASE_EXPORT uint32_t GetUniqueIdForProcess();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // When a process is started in a different PID namespace from the browser
+ // process, this function must be called with the process's PID in the browser's
+ // PID namespace in order to initialize its unique ID. Not thread safe.
diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc
index 4115ed2efc48..e02b802778fd 100644
--- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc
@@ -1,6 +1,6 @@
---- base/process/process_handle_freebsd.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_handle_freebsd.cc
-@@ -16,7 +16,7 @@ namespace base {
+--- base/process/process_handle_freebsd.cc.orig	2018-01-04 21:05:38.000000000 +0100
++++ base/process/process_handle_freebsd.cc	2018-01-27 02:11:02.948007000 +0100
+@@ -16,10 +16,13 @@
  
  ProcessId GetParentProcessId(ProcessHandle process) {
    struct kinfo_proc info;
@@ -9,3 +9,9 @@
    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
  
    if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
++    return -1;
++
++  if (length < sizeof(struct kinfo_proc))
+     return -1;
+ 
+   return info.ki_ppid;
diff --git a/www/iridium/files/patch-base_process_process__info__linux.cc b/www/iridium/files/patch-base_process_process__info__linux.cc
index ce71cfc3fc85..1391a12e27ff 100644
--- a/www/iridium/files/patch-base_process_process__info__linux.cc
+++ b/www/iridium/files/patch-base_process_process__info__linux.cc
@@ -1,4 +1,4 @@
---- base/process/process_info_linux.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/process_info_linux.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/process_info_linux.cc
 @@ -11,10 +11,28 @@
  #include "base/process/process_handle.h"
@@ -28,10 +28,10 @@
 +#else
    int64_t start_ticks =
        internal::ReadProcSelfStatsAndGetFieldAsInt64(internal::VM_STARTTIME);
-   DCHECK(start_ticks);
-@@ -22,6 +40,7 @@ const Time CurrentProcessInfo::CreationT
-   Time boot_time = internal::GetBootTime();
-   DCHECK(!boot_time.is_null());
+   if (!start_ticks)
+@@ -24,6 +42,7 @@ const Time CurrentProcessInfo::CreationTime() {
+   if (boot_time.is_null())
+     return Time();
    return Time(boot_time + start_offset);
 +#endif
  }
diff --git a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
index 2ac07ce1eae2..357ce1033d2b 100644
--- a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc
@@ -1,5 +1,5 @@
---- base/process/process_iterator_freebsd.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_iterator_freebsd.cc
+--- base/process/process_iterator_freebsd.cc.orig	2018-01-04 21:05:38.000000000 +0100
++++ base/process/process_iterator_freebsd.cc	2018-01-27 17:58:40.475292000 +0100
 @@ -10,6 +10,10 @@
  #include <sys/sysctl.h>
  #include <unistd.h>
@@ -11,7 +11,16 @@
  #include "base/logging.h"
  #include "base/macros.h"
  #include "base/strings/string_split.h"
-@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces
+@@ -40,7 +44,7 @@
+       num_of_kinfo_proc += 16;
+       kinfo_procs_.resize(num_of_kinfo_proc);
+       len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
+-      if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) {
++      if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) {
+         // If we get a mem error, it just means we need a bigger buffer, so
+         // loop around again.  Anything else is a real error and give up.
+         if (errno != ENOMEM) {
+@@ -72,19 +76,13 @@
    for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
      size_t length;
      struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc
new file mode 100644
index 000000000000..5f45b9680278
--- /dev/null
+++ b/www/iridium/files/patch-base_process_process__metrics.cc
@@ -0,0 +1,11 @@
+--- base/process/process_metrics.cc.orig	2017-12-23 21:01:02.481980000 +0100
++++ base/process/process_metrics.cc	2017-12-23 21:01:15.848759000 +0100
+@@ -10,7 +10,7 @@
+ #include "base/values.h"
+ #include "build/build_config.h"
+ 
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+ namespace {
+ int CalculateEventsPerSecond(uint64_t event_count,
+                              uint64_t* last_event_count,
diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h
index b40a0e896d2b..e0bfd5d880de 100644
--- a/www/iridium/files/patch-base_process_process__metrics.h
+++ b/www/iridium/files/patch-base_process_process__metrics.h
@@ -1,33 +1,112 @@
---- base/process/process_metrics.h.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_metrics.h
-@@ -22,6 +22,12 @@
- #include "base/values.h"
- #include "build/build_config.h"
- 
-+#if defined(OS_BSD)
-+#include <kvm.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-+
+--- base/process/process_metrics.h.orig	2018-03-20 23:05:14.000000000 +0100
++++ base/process/process_metrics.h	2018-03-24 12:20:53.523721000 +0100
+@@ -110,7 +110,7 @@
+   size_t image;
+ };
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ // Minor and major page fault counts since the process creation.
+ // Both counts are process-wide, and exclude child processes.
+ //
+@@ -120,7 +120,7 @@
+   int64_t minor;
+   int64_t major;
+ };
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 
+ // Convert a POSIX timeval to microseconds.
+ BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv);
+@@ -252,7 +252,7 @@
+   // otherwise.
+   bool GetIOCounters(IoCounters* io_counters) const;
+ 
+-#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
+   // Returns the number of file descriptors currently open by the process, or
+   // -1 on error.
+   int GetOpenFdCount() const;
+@@ -260,16 +260,16 @@
+   // Returns the soft limit of file descriptors that can be opened by the
+   // process, or -1 on error.
+   int GetOpenFdSoftLimit() const;
+-#endif  // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   // Bytes of swap as reported by /proc/[pid]/status.
+   uint64_t GetVmSwapBytes() const;
+ 
+   // Minor and major page fault count as reported by /proc/[pid]/stat.
+   // Returns true for success.
+   bool GetPageFaultCounts(PageFaultCounts* counts) const;
+-#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
++#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 
+   // Returns total memory usage of malloc.
+   size_t GetMallocUsage();
+@@ -289,7 +289,7 @@
+   bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const;
+ #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 CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
+ #endif
  #if defined(OS_MACOSX)
- #include <mach/mach.h>
- #include "base/process/port_provider_mac.h"
-@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
- // CPU-related ticks.  Returns -1 on parse error.
- // Exposed for testing.
- BASE_EXPORT int ParseProcStatCPU(const std::string& input);
-+#endif
+@@ -310,7 +310,7 @@
+   TimeTicks last_cpu_time_;
+   int64_t last_system_time_;
+ 
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+   // Same thing for idle wakeups.
+   TimeTicks last_idle_wakeups_time_;
+   uint64_t last_absolute_idle_wakeups_;
+@@ -358,7 +358,7 @@
+ #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)
+ // Data about system-wide memory consumption. Values are in KB. Available on
+ // Windows, Mac, Linux, Android and Chrome OS.
+ //
+@@ -391,7 +391,7 @@
+   int avail_phys = 0;
+ #endif
  
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
- // Get the number of threads of |process| as available in /proc/<pid>/stat.
- // This should be used with care as no synchronization with running threads is
- // done. This is mostly useful to guarantee being single-threaded.
- // Returns 0 on failure.
- BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
-+#endif
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
+   // 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
+@@ -406,7 +406,7 @@
+ #endif
  
-+#if defined(OS_LINUX) || defined(OS_ANDROID)
- // /proc/self/exe refers to the current executable.
- BASE_EXPORT extern const char kProcSelfExe[];
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
+-    defined(OS_FUCHSIA)
++    defined(OS_FUCHSIA) || defined(OS_BSD)
+   int buffers = 0;
+   int cached = 0;
+   int active_anon = 0;
+@@ -416,7 +416,7 @@
+   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)
  
+ #if defined(OS_CHROMEOS)
+   int shmem = 0;
+@@ -444,7 +444,7 @@
+ #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
+         // 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.
diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
index 89aa3be55bf4..e2ea325713e9 100644
--- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,19 +1,28 @@
---- base/process/process_metrics_freebsd.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_metrics_freebsd.cc
-@@ -13,6 +13,9 @@
- #include "base/memory/ptr_util.h"
- #include "base/sys_info.h"
+--- base/process/process_metrics_freebsd.cc.orig	2018-08-01 00:08:25.000000000 +0200
++++ base/process/process_metrics_freebsd.cc	2018-08-04 21:48:06.554728000 +0200
+@@ -14,11 +14,14 @@
+ #include "base/process/process_metrics_iocounters.h"
+ #include "base/stl_util.h"
  
 +#include <unistd.h> /* getpagesize() */
 +#include <fcntl.h>  /* O_RDONLY */
++#include <kvm.h>
 +
  namespace base {
  
  ProcessMetrics::ProcessMetrics(ProcessHandle process)
-@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() {
-   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
- }
+-    : process_(process),
+-      last_cpu_(0) {}
++    : process_(process) {}
+ 
+ // static
+ std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
+@@ -67,6 +70,65 @@
+   pagesize = getpagesize();
  
+   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
++}
++
 +int GetNumberOfThreads(ProcessHandle process) {
 +  // Taken from FreeBSD top (usr.bin/top/machine.c)
 +
@@ -33,4 +42,44 @@
 +  return nproc;
 +}
 +
++bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) {
++  unsigned int mem_total, mem_free, swap_total, swap_used;
++  size_t length;
++  int pagesizeKB;
++
++  pagesizeKB = getpagesize() / 1024;
++
++  length = sizeof(mem_total);
++  if (sysctlbyname("vm.stats.vm.v_page_count", &mem_total,
++      &length, NULL, 0) != 0 || length != sizeof(mem_total))
++    return false;
++
++  length = sizeof(mem_free);
++  if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &length, NULL, 0)
++      != 0 || length != sizeof(mem_free))
++    return false;
++
++  length = sizeof(swap_total);
++  if (sysctlbyname("vm.swap_size", &swap_total, &length, NULL, 0)
++      != 0 || length != sizeof(swap_total))
++    return false;
++
++  length = sizeof(swap_used);
++  if (sysctlbyname("vm.swap_anon_use", &swap_used, &length, NULL, 0)
++      != 0 || length != sizeof(swap_used))
++    return false;
++
++  meminfo->total = mem_total * pagesizeKB;
++  meminfo->free = mem_free * pagesizeKB;
++  meminfo->swap_total = swap_total * pagesizeKB;
++  meminfo->swap_free = (swap_total - swap_used) * pagesizeKB;
++
++  return true;
++}
++
++uint64_t ProcessMetrics::GetVmSwapBytes() const {
++   NOTIMPLEMENTED();
++   return 0;
+ }
+ 
  }  // namespace base
diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc
new file mode 100644
index 000000000000..06aa8b4509ad
--- /dev/null
+++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc
@@ -0,0 +1,20 @@
+--- base/process/process_metrics_posix.cc.orig	2018-08-01 00:08:25.000000000 +0200
++++ base/process/process_metrics_posix.cc	2018-08-05 00:53:58.559513000 +0200
+@@ -19,6 +19,8 @@
+ 
+ #if defined(OS_MACOSX)
+ #include <malloc/malloc.h>
++#elif defined(OS_FREEBSD)
++#include <stdlib.h>
+ #else
+ #include <malloc.h>
+ #endif
+@@ -107,7 +109,7 @@
+ #else
+   return minfo.hblkhd + minfo.arena;
+ #endif
+-#elif defined(OS_FUCHSIA)
++#elif defined(OS_FUCHSIA) || defined(OS_BSD)
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc
index cfaca45e5357..637d67b75b51 100644
--- a/www/iridium/files/patch-base_process_process__posix.cc
+++ b/www/iridium/files/patch-base_process_process__posix.cc
@@ -1,11 +1,10 @@
---- base/process/process_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_posix.cc
-@@ -21,8 +21,18 @@
+--- base/process/process_posix.cc.orig	2017-12-15 02:04:05.000000000 +0100
++++ base/process/process_posix.cc	2017-12-23 21:14:03.546283000 +0100
+@@ -22,8 +22,17 @@
  #include <sys/event.h>
  #endif
  
 +#if defined(OS_BSD)
-+#include <signal.h>
 +#include <sys/types.h>
 +#include <sys/event.h>
 +#include <sys/time.h>
@@ -19,72 +18,50 @@
  #if !defined(OS_NACL_NONSFI)
  
  bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
-   base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
-   base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
-   if (parent_pid != our_pid) {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
-     // On Mac we can wait on non child processes.
--    return WaitForSingleNonChildProcess(handle, timeout);
-+    /* return WaitForSingleNonChildProcess(handle, timeout); */
- #else
-     // Currently on Linux we can't handle non child processes.
-     NOTIMPLEMENTED();
--#endif  // OS_MACOSX
-+#endif  // OS_MACOSX || OS_BSD
-   }
- 
-   int status;
-@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro
+@@ -263,12 +272,10 @@
    return Process(handle);
  }
  
--#if !defined(OS_LINUX) && !defined(OS_MACOSX)
-+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
  // static
  bool Process::CanBackgroundProcesses() {
-   return false;
- }
--#endif  // !defined(OS_LINUX) && !defined(OS_MACOSX)
-+#elif defined(OS_FREEBSD)
-+bool Process::CanBackgroundProcesses() {
+-  return false;
 +  return true;
-+}
-+#endif  // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+ }
+-#endif  // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
  
  // static
  void Process::TerminateCurrentProcessImmediately(int exit_code) {
-@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim
+@@ -372,21 +379,23 @@
+   return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout);
+ }
+ 
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
  bool Process::IsProcessBackgrounded() const {
    // See SetProcessBackgrounded().
    DCHECK(IsValid());
-+#if defined(OS_FREEBSD)
-+  return true;
-+#else
-   return false;
-+#endif
+-  return false;
++  return GetPriority() == kBackgroundPriority;
  }
  
- bool Process::SetProcessBackgrounded(bool value) {
-+#if !defined(OS_FREEBSD)
-   // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if
-   // we were to lower the process priority we wouldn't be able to raise it back
-   // to its initial priority.
-   NOTIMPLEMENTED();
-   return false;
-+#else
+-bool Process::SetProcessBackgrounded(bool value) {
+-  // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if
+-  // we were to lower the process priority we wouldn't be able to raise it back
+-  // to its initial priority.
+-  NOTIMPLEMENTED();
+-  return false;
++bool Process::SetProcessBackgrounded(bool background) {
 +  DCHECK(IsValid());
 +
 +  if (!CanBackgroundProcesses())
 +    return false;
 +
-+  int priority = value ? kBackgroundPriority : kForegroundPriority;
-+  int result   = setpriority(PRIO_PROCESS, process_, priority);
-+
++  int priority = background ? kBackgroundPriority : kForegroundPriority;
++  int result = setpriority(PRIO_PROCESS, process_, priority);
 +  DPCHECK(result == 0);
 +  return result == 0;
-+#endif // !defined(OS_FREEBSD)
  }
- #endif  // !defined(OS_LINUX) && !defined(OS_MACOSX)
+-#endif  // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX)
  
+ int Process::GetPriority() const {
+   DCHECK(IsValid());
diff --git a/www/iridium/files/patch-base_strings_safe__sprintf.cc b/www/iridium/files/patch-base_strings_safe__sprintf.cc
deleted file mode 100644
index 311186684a17..000000000000
--- a/www/iridium/files/patch-base_strings_safe__sprintf.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- base/strings/safe_sprintf.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/strings/safe_sprintf.cc
-@@ -115,8 +115,11 @@ class Buffer {
-         count_(0) {
- // MSVS2013's standard library doesn't mark max() as constexpr yet. cl.exe
- // supports static_cast but doesn't really implement constexpr yet so it doesn't
--// complain, but clang does.
--#if __cplusplus >= 201103 && !(defined(__clang__) && defined(OS_WIN))
-+// complain, but clang does. Older FreeBSD (<10) use libstdc++4.2, which
-+// doesn't mark numeric_limits::max() as constexp.
-+#if __cplusplus >= 201103 && \
-+	!(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) && \
-+	!(defined(__clang__) && defined(OS_WIN))
-     static_assert(kSSizeMaxConst ==
-                       static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
-                   "kSSizeMaxConst should be the max value of an ssize_t");
diff --git a/www/iridium/files/patch-base_sys__info__freebsd.cc b/www/iridium/files/patch-base_sys__info__freebsd.cc
index 301080013828..7b97b7f17fd9 100644
--- a/www/iridium/files/patch-base_sys__info__freebsd.cc
+++ b/www/iridium/files/patch-base_sys__info__freebsd.cc
@@ -1,30 +1,9 @@
---- base/sys_info_freebsd.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/sys_info_freebsd.cc
-@@ -12,12 +12,34 @@
- 
+--- base/sys_info_freebsd.cc.orig	2017-12-15 02:04:05.000000000 +0100
++++ base/sys_info_freebsd.cc	2017-12-23 21:51:22.626194000 +0100
+@@ -13,26 +13,58 @@
  namespace base {
  
-+int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
-+  int page_size, r = 0;
-+  unsigned pgfree, pginact, pgcache;
-+  size_t size = sizeof(page_size);
-+  size_t szpg = sizeof(pgfree);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
-+  if (r == -1) {
-+    NOTREACHED();
-+    return 0;
-+  }
-+  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
-+}
-+
- int64_t SysInfo::AmountOfPhysicalMemory() {
+ int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
 -  int pages, page_size;
 +  int pages, page_size, r = 0;
    size_t size = sizeof(pages);
@@ -34,19 +13,41 @@
 +  if(r == 0)
 +    r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
 +  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+  if (r == -1) {
++    r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++  if(r == -1) {
      NOTREACHED();
      return 0;
    }
-@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory(
+   return static_cast<int64_t>(pages) * page_size;
  }
  
- // static
+-// static
 -uint64_t SysInfo::MaxSharedMemorySize() {
 -  size_t limit;
 -  size_t size = sizeof(limit);
 -  if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
++int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
++  int page_size, r = 0;
++  unsigned pgfree, pginact, pgcache;
++  size_t size = sizeof(page_size);
++  size_t szpg = sizeof(pgfree);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
++  if(r == -1) {
+     NOTREACHED();
+     return 0;
+   }
+-  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 };
 +  char name[256];
@@ -61,11 +62,9 @@
 +  int ncpu;
 +  size_t size = sizeof(ncpu);
 +  if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
-     NOTREACHED();
--    return 0;
++    NOTREACHED();
 +    return 1;
-   }
--  return static_cast<uint64_t>(limit);
++  }
 +  return ncpu;
  }
  
diff --git a/www/iridium/files/patch-base_sys__info__posix.cc b/www/iridium/files/patch-base_sys__info__posix.cc
index 90ecf301d369..d7fc3b435a62 100644
--- a/www/iridium/files/patch-base_sys__info__posix.cc
+++ b/www/iridium/files/patch-base_sys__info__posix.cc
@@ -1,20 +1,38 @@
---- base/sys_info_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/sys_info_posix.cc
+--- base/sys_info_posix.cc.orig	2018-01-04 21:05:38.000000000 +0100
++++ base/sys_info_posix.cc	2018-01-27 20:03:02.391851000 +0100
 @@ -35,7 +35,7 @@
  
  namespace {
  
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
+-#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.
-@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa
+@@ -62,7 +62,7 @@
+ 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() {
+@@ -130,7 +130,7 @@
  
  namespace base {
  
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
+-#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();
  }
+@@ -223,6 +223,8 @@
+     arch = "x86";
+   } else if (arch == "amd64") {
+     arch = "x86_64";
++  } else if (arch == "arm64") {
++    arch = "aarch64";
+   } else if (std::string(info.sysname) == "AIX") {
+     arch = "ppc64";
+   }
diff --git a/www/iridium/files/patch-base_test_BUILD.gn b/www/iridium/files/patch-base_test_BUILD.gn
deleted file mode 100644
index 2bc772bb511c..000000000000
--- a/www/iridium/files/patch-base_test_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/test/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ base/test/BUILD.gn
-@@ -312,7 +312,7 @@ static_library("run_all_base_unittests")
-   ]
- }
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   shared_library("malloc_wrapper") {
-     testonly = true
-     sources = [
diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc
index 0d81c983be42..2aa96398d644 100644
--- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,13 +1,10 @@
---- base/test/launcher/test_launcher.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/test/launcher/test_launcher.cc
-@@ -60,6 +60,10 @@
- #include "base/win/windows_version.h"
- #endif
+--- base/test/launcher/test_launcher.cc.orig	2017-12-15 02:04:05.000000000 +0100
++++ base/test/launcher/test_launcher.cc	2017-12-30 02:02:22.630578000 +0100
+@@ -51,6 +51,7 @@
+ #include "testing/gtest/include/gtest/gtest.h"
  
-+#if defined(OS_FREEBSD)
+ #if defined(OS_POSIX)
 +#include <signal.h>
-+#endif
-+
- namespace base {
+ #include <fcntl.h>
  
- // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
+ #include "base/files/file_descriptor_watcher_posix.h"
diff --git a/www/iridium/files/patch-base_test_test__file__util__linux.cc b/www/iridium/files/patch-base_test_test__file__util__linux.cc
new file mode 100644
index 000000000000..161252128ad2
--- /dev/null
+++ b/www/iridium/files/patch-base_test_test__file__util__linux.cc
@@ -0,0 +1,13 @@
+--- base/test/test_file_util_linux.cc.orig	2017-08-10 16:14:03.505570000 +0200
++++ base/test/test_file_util_linux.cc	2017-08-10 16:14:43.299690000 +0200
+@@ -20,8 +20,10 @@
+     return false;
+   if (fdatasync(fd.get()) != 0)
+     return false;
++#if !defined(OS_BSD)
+   if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
+     return false;
++#endif
+   return true;
+ }
+ 
diff --git a/www/iridium/files/patch-base_test_test__file__util__posix.cc b/www/iridium/files/patch-base_test_test__file__util__posix.cc
index be8a681a71e6..7ff08d5fc353 100644
--- a/www/iridium/files/patch-base_test_test__file__util__posix.cc
+++ b/www/iridium/files/patch-base_test_test__file__util__posix.cc
@@ -1,11 +1,11 @@
---- base/test/test_file_util_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/test/test_file_util_posix.cc
-@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo
+--- base/test/test_file_util_posix.cc.orig	2017-09-05 21:05:11.000000000 +0200
++++ base/test/test_file_util_posix.cc	2017-09-06 16:59:12.993711000 +0200
+@@ -79,7 +79,7 @@
    return DeleteFile(file, recurse);
  }
  
--#if !defined(OS_LINUX) && !defined(OS_MACOSX)
-+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
  bool EvictFileFromSystemCache(const FilePath& file) {
    // There doesn't seem to be a POSIX way to cool the disk cache.
    NOTIMPLEMENTED();
diff --git a/www/iridium/files/patch-base_third__party_libevent_BUILD.gn b/www/iridium/files/patch-base_third__party_libevent_BUILD.gn
index 512862246dbf..b02b2a11a816 100644
--- a/www/iridium/files/patch-base_third__party_libevent_BUILD.gn
+++ b/www/iridium/files/patch-base_third__party_libevent_BUILD.gn
@@ -1,11 +1,23 @@
---- base/third_party/libevent/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ base/third_party/libevent/BUILD.gn
-@@ -50,6 +50,9 @@ static_library("libevent") {
+--- base/third_party/libevent/BUILD.gn.orig	2018-01-04 21:05:38.000000000 +0100
++++ base/third_party/libevent/BUILD.gn	2018-01-06 01:02:53.058845000 +0100
+@@ -43,13 +43,20 @@
+       "mac/event-config.h",
+     ]
+     include_dirs = [ "mac" ]
+-  } else if (is_linux) {
++  } else if (is_linux && !is_bsd) {
+     sources += [
+       "epoll.c",
+       "linux/config.h",
        "linux/event-config.h",
      ]
      include_dirs = [ "linux" ]
 +  } else if (is_bsd) {
-+    sources += [ "kqueue.c" ]
++    sources += [ 
++      "kqueue.c",
++      "freebsd/config.h",
++      "freebsd/event-config.h",
++    ]
 +    include_dirs = [ "freebsd" ]
    } else if (is_android) {
      sources += [
diff --git a/www/iridium/files/patch-base_threading_platform__thread__linux.cc b/www/iridium/files/patch-base_threading_platform__thread__linux.cc
index dc0070c650a2..b419dd7fec86 100644
--- a/www/iridium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/iridium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,8 +1,8 @@
---- base/threading/platform_thread_linux.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/threading/platform_thread_linux.cc
+--- base/threading/platform_thread_linux.cc.orig	2017-07-25 21:04:48.000000000 +0200
++++ base/threading/platform_thread_linux.cc	2017-08-01 22:36:09.953380000 +0200
 @@ -19,7 +19,9 @@
  
- #if !defined(OS_NACL)
+ #if !defined(OS_NACL) && !defined(OS_AIX)
  #include <pthread.h>
 +#if !defined(OS_BSD)
  #include <sys/prctl.h>
@@ -10,21 +10,12 @@
  #include <sys/resource.h>
  #include <sys/time.h>
  #include <sys/types.h>
-@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::
+@@ -130,7 +132,7 @@
    ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
    tracked_objects::ThreadData::InitializeThreadContext(name);
  
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
+-#if !defined(OS_NACL) && !defined(OS_AIX)
++#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
    // On linux we can get the thread names to show up in the debugger by setting
    // the process name for the LWP.  We don't want to do this for the main
    // thread because that would rename the process, causing tools like killall
-@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::
- #endif  //  !defined(OS_NACL)
- }
- 
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
- // static
- void PlatformThread::SetThreadPriority(PlatformThreadId thread_id,
-                                        ThreadPriority priority) {
diff --git a/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc b/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc
index 468a4f224611..e6f1289f01f1 100644
--- a/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc
+++ b/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc
@@ -1,4 +1,4 @@
---- base/threading/thread_task_runner_handle.cc.orig	2017-04-19 19:06:28 UTC
+--- base/threading/thread_task_runner_handle.cc.orig	2017-06-05 19:03:01 UTC
 +++ base/threading/thread_task_runner_handle.cc
 @@ -7,6 +7,7 @@
  #include <utility>
@@ -16,7 +16,7 @@
  // static
  ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
      scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand
+@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
        base::Passed(&overriding_task_runner),
        base::Unretained(ttrh->task_runner_.get())));
  }
diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc
deleted file mode 100644
index e8a0513eee80..000000000000
--- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/trace_event/malloc_dump_provider.cc
-@@ -21,7 +21,7 @@
- #if defined(OS_MACOSX)
- #include <malloc/malloc.h>
- #else
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #if defined(OS_WIN)
- #include <windows.h>
diff --git a/www/iridium/files/patch-base_trace__event_malloc_dump_provider.cc b/www/iridium/files/patch-base_trace__event_malloc_dump_provider.cc
new file mode 100644
index 000000000000..54463b0a563b
--- /dev/null
+++ b/www/iridium/files/patch-base_trace__event_malloc_dump_provider.cc
@@ -0,0 +1,21 @@
+--- base/trace_event/malloc_dump_provider.cc.orig	2017-08-02 18:33:27.773657000 +0200
++++ base/trace_event/malloc_dump_provider.cc	2017-08-02 18:34:48.019053000 +0200
+@@ -21,6 +21,8 @@
+ 
+ #if defined(OS_MACOSX)
+ #include <malloc/malloc.h>
++#elif defined(OS_BSD)
++#include "stdlib.h"
+ #else
+ #include <malloc.h>
+ #endif
+@@ -243,6 +245,9 @@
+   allocated_objects_count = main_heap_info.block_count;
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
++#elif defined(OS_BSD)
++  total_virtual_size = 0;
++  allocated_objects_size = 0;
+ #else
+   struct mallinfo info = mallinfo();
+   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
diff --git a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
index 446490dd7e56..0a2b6204bb2a 100644
--- a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
+++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc
@@ -1,11 +1,11 @@
---- base/trace_event/process_memory_dump.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/trace_event/process_memory_dump.cc
-@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB
+--- base/trace_event/process_memory_dump.cc.orig	2018-05-09 21:05:33.000000000 +0200
++++ base/trace_event/process_memory_dump.cc	2018-08-16 02:36:46.780728000 +0200
+@@ -92,7 +92,7 @@
    const size_t kMaxChunkSize = 8 * 1024 * 1024;
    size_t max_vec_size =
        GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
--#if defined(OS_MACOSX) || defined(OS_IOS)
-+#if defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_BSD)
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
    std::unique_ptr<char[]> vec(new char[max_vec_size]);
  #elif defined(OS_WIN)
    std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
diff --git a/www/iridium/files/patch-base__trace_event__process_memory_dump.h b/www/iridium/files/patch-base_trace__event_process__memory__dump.h
index b92550a3db42..f381fa50808f 100644
--- a/www/iridium/files/patch-base__trace_event__process_memory_dump.h
+++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.h
@@ -1,6 +1,6 @@
---- base/trace_event/process_memory_dump.h.orig	2017-04-19 19:06:28 UTC
-+++ base/trace_event/process_memory_dump.h
-@@ -24,7 +24,7 @@
+--- base/trace_event/process_memory_dump.h.orig	2018-05-09 21:05:33.000000000 +0200
++++ base/trace_event/process_memory_dump.h	2018-08-16 02:49:06.092591000 +0200
+@@ -22,7 +22,7 @@
  
  // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
  // resident memory.
diff --git a/www/iridium/files/patch-breakpad_BUILD.gn b/www/iridium/files/patch-breakpad_BUILD.gn
deleted file mode 100644
index 9bc9d6529dba..000000000000
--- a/www/iridium/files/patch-breakpad_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- breakpad/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ breakpad/BUILD.gn
-@@ -468,7 +468,7 @@ if (is_mac) {
-   }
- }
- 
--if (is_linux || is_android) {
-+if (is_linux || is_bsd || is_android) {
-   if (current_toolchain == host_toolchain) {
-     executable("symupload") {
-       sources = [
diff --git a/www/iridium/files/patch-breakpad_src_build_common.gypi b/www/iridium/files/patch-breakpad_src_build_common.gypi
deleted file mode 100644
index 6bb11e2f9cb1..000000000000
--- a/www/iridium/files/patch-breakpad_src_build_common.gypi
+++ /dev/null
@@ -1,18 +0,0 @@
---- breakpad/src/build/common.gypi.orig	2017-04-19 19:07:40 UTC
-+++ breakpad/src/build/common.gypi
-@@ -813,15 +813,6 @@
-         ],
-       },
-     }],
--    # FreeBSD-specific options; note that most FreeBSD options are set above,
--    # with Linux.
--    ['OS=="freebsd"', {
--      'target_defaults': {
--        'ldflags': [
--          '-Wl,--no-keep-memory',
--        ],
--      },
--    }],
-     ['OS=="solaris"', {
-       'cflags!': ['-fvisibility=hidden'],
-       'cflags_cc!': ['-fvisibility-inlines-hidden'],
diff --git a/www/iridium/files/patch-breakpad_src_common_simple__string__dictionary.h b/www/iridium/files/patch-breakpad_src_common_simple__string__dictionary.h
deleted file mode 100644
index 307f136e9b98..000000000000
--- a/www/iridium/files/patch-breakpad_src_common_simple__string__dictionary.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- breakpad/src/common/simple_string_dictionary.h.orig	2017-04-19 19:07:40 UTC
-+++ breakpad/src/common/simple_string_dictionary.h
-@@ -33,7 +33,7 @@
- #include <assert.h>
- #include <string.h>
- 
--#include "common/basictypes.h"
-+#include "breakpad/src/common/basictypes.h"
- 
- namespace google_breakpad {
- 
diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn
index 2f85025c9f8b..28173c1eb341 100644
--- a/www/iridium/files/patch-build_config_BUILD.gn
+++ b/www/iridium/files/patch-build_config_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/BUILD.gn
-@@ -193,7 +193,7 @@ config("debug") {
+--- build/config/BUILD.gn.orig	2018-08-01 00:08:26.000000000 +0200
++++ build/config/BUILD.gn	2018-08-05 13:59:34.648903000 +0200
+@@ -167,7 +167,7 @@
        # builds, and we have to tell it to turn it off.
        defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
      }
@@ -9,21 +9,22 @@
      # 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?
-@@ -276,7 +276,7 @@ config("default_libs") {
-       "CoreText.framework",
-       "Foundation.framework",
+@@ -269,9 +269,7 @@
      ]
--  } else if (is_linux) {
-+  } else if (is_linux && !is_bsd) {
+   } else if (is_linux) {
      libs = [
-       "dl",
-       "rt",
-@@ -307,7 +307,7 @@ config("executable_config") {
+-      "dl",
+       "pthread",
+-      "rt",
      ]
-   } else if (is_ios) {
-     configs += [ "//build/config/ios:ios_dynamic_flags" ]
--  } else if (is_linux || is_android) {
-+  } else if (is_linux || is_android || is_bsd) {
+   }
+ }
+@@ -320,7 +318,7 @@
+       "//build/config/ios:ios_dynamic_flags",
+       "//build/config/ios:ios_executable_flags",
+     ]
+-  } else if (is_linux || is_android || current_os == "aix") {
++  } else if (is_linux || is_bsd || is_android || current_os == "aix") {
      configs += [ "//build/config/gcc:executable_ldconfig" ]
      if (is_android) {
        configs += [ "//build/config/android:executable_config" ]
diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn
index 841b49d3906f..dab1b21c3779 100644
--- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,6 +1,6 @@
---- build/config/BUILDCONFIG.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/BUILDCONFIG.gn
-@@ -131,12 +131,13 @@ declare_args() {
+--- build/config/BUILDCONFIG.gn.orig	2018-05-09 21:05:34.000000000 +0200
++++ build/config/BUILDCONFIG.gn	2018-08-16 02:56:08.556687000 +0200
+@@ -131,14 +131,14 @@
    is_official_build = false
  
    # Whether we're a traditional desktop unix.
@@ -9,14 +9,15 @@
  
    # Set to true when compiling with the Clang compiler. Typically this is used
    # to configure warnings.
-   is_clang = current_os == "mac" || current_os == "ios" ||
--             current_os == "linux" || current_os == "chromeos"
-+             current_os == "linux" || current_os == "chromeos" ||
-+             current_os == "bsd"
- 
-   # Allows the path to a custom target toolchain to be injected as a single
-   # argument, and set as the default toolchain.
-@@ -185,8 +186,8 @@ if (host_toolchain == "") {
+   is_clang =
+       current_os == "mac" || current_os == "ios" || current_os == "chromeos" ||
+       current_os == "fuchsia" || current_os == "android" ||
+-      current_os == "win" ||
++      current_os == "win" || current_os == "bsd" ||
+       (current_os == "linux" && current_cpu != "s390x" &&
+        current_cpu != "s390" && current_cpu != "ppc64" &&
+        current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64")
+@@ -190,8 +190,8 @@
    # TODO(dpranke): Add some sort of assert here that verifies that
    # no toolchain omitted host_toolchain from its toolchain_args().
  
@@ -27,40 +28,95 @@
        # TODO(dpranke) - is_clang normally applies only to the target
        # build, and there is no way to indicate that you want to override
        # it for both the target build *and* the host build. Do we need to
-@@ -222,7 +223,7 @@ if (target_os == "android") {
-   } else {
-     _default_toolchain = "//build/toolchain/android:android_$target_cpu"
-   }
+@@ -225,7 +225,7 @@
+   assert(host_os == "linux" || host_os == "mac",
+          "Android builds are only supported on Linux and Mac hosts.")
+   _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
 -} else if (target_os == "chromeos" || target_os == "linux") {
 +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") {
    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
    if (is_clang) {
      _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -342,8 +343,17 @@ if (current_os == "win" || current_os ==
+@@ -298,6 +298,7 @@
+   is_nacl = false
+   is_posix = false
+   is_win = true
++  is_bsd = false
+ } else if (current_os == "mac") {
+   is_android = false
+   is_chromeos = false
+@@ -308,6 +309,7 @@
+   is_nacl = false
+   is_posix = true
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "android") {
+   is_android = true
+   is_chromeos = false
+@@ -318,6 +320,7 @@
+   is_nacl = false
+   is_posix = true
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "chromeos") {
+   is_android = false
+   is_chromeos = true
+@@ -328,6 +331,7 @@
+   is_nacl = false
+   is_posix = true
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "nacl") {
+   # current_os == "nacl" will be passed by the nacl toolchain definition.
+   # It is not set by default or on the command line. We treat is as a
+@@ -341,6 +345,7 @@
+   is_nacl = true
+   is_posix = true
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "fuchsia") {
+   is_android = false
+   is_chromeos = false
+@@ -351,6 +356,7 @@
+   is_nacl = false
+   is_posix = false
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "ios") {
+   is_android = false
+   is_chromeos = false
+@@ -361,6 +367,7 @@
    is_nacl = false
    is_posix = true
    is_win = false
++  is_bsd = false
+ } else if (current_os == "linux") {
+   is_android = false
+   is_chromeos = false
+@@ -371,6 +378,7 @@
+   is_nacl = false
+   is_posix = true
+   is_win = false
++  is_bsd = false
+ } else if (current_os == "aix") {
+   is_android = false
+   is_chromeos = false
+@@ -381,6 +389,18 @@
+   is_nacl = false
+   is_posix = true
+   is_win = false
++  is_bsd = false
 +} else if (current_os == "bsd") {
 +  is_android = false
 +  is_chromeos = false
++  is_fuchsia = false
 +  is_ios = false
-+  is_linux = false
-+  is_bsd = true
++  is_linux = true
 +  is_mac = false
 +  is_nacl = false
 +  is_posix = true
 +  is_win = false
++  is_bsd = true
  }
--
- # =============================================================================
- # SOURCES FILTERS
+ 
  # =============================================================================
-@@ -412,7 +422,7 @@ if (!is_ios) {
- if (!is_mac && !is_ios) {
-   sources_assignment_filter += [ "*.mm" ]
- }
--if (!is_linux) {
-+if (!is_linux && !is_bsd) {
-   sources_assignment_filter += [
-     "*_linux.h",
-     "*_linux.cc",
diff --git a/www/iridium/files/patch-build_config_allocator.gni b/www/iridium/files/patch-build_config_allocator.gni
index ad404179d272..d963319c4622 100644
--- a/www/iridium/files/patch-build_config_allocator.gni
+++ b/www/iridium/files/patch-build_config_allocator.gni
@@ -1,16 +1,20 @@
---- build/config/allocator.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/config/allocator.gni
-@@ -45,10 +45,10 @@ assert(use_allocator == "none" || use_al
- assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
- assert(!is_mac || use_allocator == "none", "Tcmalloc doesn't work on macOS.")
+--- build/config/allocator.gni.orig	2018-06-13 00:10:02.000000000 +0200
++++ build/config/allocator.gni	2018-07-14 13:12:35.947359000 +0200
+@@ -6,7 +6,7 @@
  
--assert(!use_experimental_allocator_shim || is_linux || is_android || is_win ||
--           is_mac,
-+assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || 
-+           is_mac || is_bsd,
-        "use_experimental_allocator_shim supported only on Linux, Android, " +
--           "Windows and macOS targets")
-+           "Windows, macOS and BSD targets")
- 
- if (is_win && use_experimental_allocator_shim) {
-   assert(!is_component_build,
+ # 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 @@
+ # 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
diff --git a/www/iridium/files/patch-build_config_clang_BUILD.gn b/www/iridium/files/patch-build_config_clang_BUILD.gn
deleted file mode 100644
index 9a30eeb8faeb..000000000000
--- a/www/iridium/files/patch-build_config_clang_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/config/clang/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/clang/BUILD.gn
-@@ -20,7 +20,7 @@ config("find_bad_constructs") {
-         rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
-                     root_build_dir),
-       ]
--    } else if (is_linux || is_android) {
-+    } else if (is_linux || is_bsd || is_android) {
-       cflags += [
-         "-Xclang",
-         "-load",
-@@ -41,7 +41,7 @@ config("find_bad_constructs") {
-       "check-auto-raw-pointer",
-     ]
- 
--    if ((is_linux || is_android) && !is_chromecast) {
-+    if ((is_linux || is_bsd || is_android) && !is_chromecast) {
-       cflags += [
-         "-Xclang",
-         "-plugin-arg-find-bad-constructs",
diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn
deleted file mode 100644
index 1839b6b6b626..000000000000
--- a/www/iridium/files/patch-build_config_compiler_BUILD.gn
+++ /dev/null
@@ -1,136 +0,0 @@
---- build/config/compiler/BUILD.gn.orig	2017-04-19 21:06:28.000000000 +0200
-+++ build/config/compiler/BUILD.gn	2017-06-15 22:15:26.426452000 +0200
-@@ -36,7 +36,7 @@
-   # 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 =
--      linux_use_bundled_binutils_override && is_linux &&
-+      linux_use_bundled_binutils_override && (is_linux && !is_bsd) &&
-       (current_cpu == "x64" || current_cpu == "x86")
-   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
-                               root_build_dir)
-@@ -158,7 +158,7 @@
-     configs += [ "//build/config/win:compiler" ]
-   } else if (is_android) {
-     configs += [ "//build/config/android:compiler" ]
--  } else if (is_linux) {
-+  } else if (is_linux || is_bsd) {
-     configs += [ "//build/config/linux:compiler" ]
-   } else if (is_nacl) {
-     configs += [ "//build/config/nacl:compiler" ]
-@@ -214,7 +214,7 @@
- 
-     # Linker warnings.
-     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
--        !(is_android && use_order_profiling) && !is_mac && !is_ios) {
-+        !(is_android && use_order_profiling) && !is_mac && !is_ios && !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
-@@ -301,7 +301,7 @@
- 
-   # Linux/Android common flags setup.
-   # ---------------------------------
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     cflags += [
-       "-fPIC",
-       "-pipe",  # Use pipes for communicating between sub-processes. Faster.
-@@ -314,7 +314,7 @@
-       "-Wl,-z,relro",
-     ]
-     if (!using_sanitizer) {
--      if (!use_cfi_diag) {
-+      if (!use_cfi_diag && !is_bsd) {
-         ldflags += [ "-Wl,-z,defs" ]
-       }
- 
-@@ -428,14 +428,14 @@
-   # clang-cl (used if is_win) doesn't expose this flag.
-   # Currently disabled for nacl since its toolchain lacks this flag (too old).
-   # TODO(zforman): Once nacl's toolchain is updated, remove check.
--  if (is_clang && is_linux && strip_absolute_paths_from_debug_symbols) {
-+  if (is_clang && (is_linux || is_bsd) && strip_absolute_paths_from_debug_symbols) {
-     absolute_path = rebase_path("//.")
-     cflags += [ "-fdebug-prefix-map=$absolute_path=." ]
-   }
- 
-   # C++11 compiler flags setup.
-   # ---------------------------
--  if (is_linux || is_android || (is_nacl && is_clang)) {
-+  if (is_linux || is_bsd || is_android || (is_nacl && is_clang)) {
-     # gnu++11 instead of c++11 is needed because some code uses typeof() (a
-     # GNU extension).
-     # TODO(thakis): Eventually switch this to c++11 instead,
-@@ -488,7 +488,7 @@
-       ]
- 
-       # Apply a lower LTO optimization level as the default is too slow.
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         if (use_lld) {
-           ldflags += [ "-Wl,--lto-O1" ]
-         } else {
-@@ -508,7 +508,7 @@
-     # targeting ARM, without this flag, LTO produces a .text section that is
-     # larger than the maximum call displacement, preventing the linker from
-     # relocating calls (http://llvm.org/PR22999).
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
-     }
-   }
-@@ -776,7 +776,7 @@
- #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
- # See https://crbug.com/556393 for details of where it must be avoided.
- config("clang_stackrealign") {
--  if (is_clang && current_cpu == "x86" && is_linux) {
-+  if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) {
-     cflags = [
-       # Align the stack on 16-byte boundaries, http://crbug.com/418554.
-       "-mstack-alignment=16",
-@@ -830,7 +830,7 @@
-   # smaller.
-   if (is_win) {
-     configs += [ "//build/config/win:runtime_library" ]
--  } else if (is_linux) {
-+  } else if (is_linux || is_bsd) {
-     configs += [ "//build/config/linux:runtime_library" ]
-   } else if (is_ios) {
-     configs += [ "//build/config/ios:runtime_library" ]
-@@ -1104,7 +1104,7 @@
-         "-Wno-block-capture-autoreleasing",
- 
-         # TODO(hans): https://crbug.com/681136
--        "-Wno-unused-lambda-capture",
-+        # "-Wno-unused-lambda-capture",
- 
-         # TODO(thakis ): https://crbug.com/683349
-         "-Wno-user-defined-warnings",
-@@ -1144,7 +1144,7 @@
-     ]
- 
-     if (!is_debug && !using_sanitizer &&
--        (!is_linux || !is_clang || is_official_build)) {
-+        (!is_linux || !is_bsd || !is_clang || is_official_build)) {
-       # _FORTIFY_SOURCE isn't really supported by Clang now, see
-       # http://llvm.org/bugs/show_bug.cgi?id=16821.
-       # It seems to work fine with Ubuntu 12 headers though, so use it in
-@@ -1203,7 +1203,7 @@
-     ]
-   }
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     cflags_cc += [
-       # Don't warn about hash_map in third-party code.
-       "-Wno-deprecated",
-@@ -1647,7 +1647,7 @@
-         "-g2",
-       ]
-     } else {
--      cflags = [ "-g2" ]
-+      cflags = [ "-g0" ]
-     }
-     if (use_debug_fission) {
-       cflags += [ "-gsplit-dwarf" ]
diff --git a/www/iridium/files/patch-build_config_compiler_compiler.gni b/www/iridium/files/patch-build_config_compiler_compiler.gni
index cf9ed67acb3d..37bed9847066 100644
--- a/www/iridium/files/patch-build_config_compiler_compiler.gni
+++ b/www/iridium/files/patch-build_config_compiler_compiler.gni
@@ -1,11 +1,11 @@
---- build/config/compiler/compiler.gni.orig	2018-06-19 18:30:17.888048000 +0200
-+++ build/config/compiler/compiler.gni	2018-06-19 18:32:11.279335000 +0200
-@@ -72,7 +72,7 @@
+--- build/config/compiler/compiler.gni.orig	2018-05-09 21:05:34.000000000 +0200
++++ build/config/compiler/compiler.gni	2018-08-16 03:18:27.380502000 +0200
+@@ -174,7 +174,7 @@
  
  declare_args() {
    # Whether to use the gold linker from binutils instead of lld or bfd.
--  use_gold = !use_lld && !(is_chromecast && is_linux &&
-+  use_gold = !is_bsd && !use_lld && !(is_chromecast && is_linux &&
-                            (current_cpu == "arm" || current_cpu == "mipsel")) &&
-              ((is_linux && (current_cpu == "x64" || current_cpu == "x86" ||
-                             current_cpu == "arm" || current_cpu == "mipsel")) ||
+-  use_gold =
++  use_gold = !is_bsd &&
+       (!use_lld && !(is_chromecast && is_linux &&
+                      (current_cpu == "arm" || current_cpu == "mipsel")) &&
+        (is_linux &&
diff --git a/www/iridium/files/patch-build_config_crypto.gni b/www/iridium/files/patch-build_config_crypto.gni
deleted file mode 100644
index 29f38a66cf20..000000000000
--- a/www/iridium/files/patch-build_config_crypto.gni
+++ /dev/null
@@ -1,8 +0,0 @@
---- build/config/crypto.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/config/crypto.gni
-@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac
- 
- # True if NSS is used for certificate handling. It is possible to use OpenSSL
- # for the crypto library, but NSS for the platform certificate library.
--use_nss_certs = is_linux
-+use_nss_certs = is_linux || is_bsd
diff --git a/www/iridium/files/patch-build_config_features.gni b/www/iridium/files/patch-build_config_features.gni
index bb7ef35cb8c8..89de733794c0 100644
--- a/www/iridium/files/patch-build_config_features.gni
+++ b/www/iridium/files/patch-build_config_features.gni
@@ -1,19 +1,11 @@
---- build/config/features.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/config/features.gni
-@@ -60,13 +60,13 @@ declare_args() {
-   # libudev usage. This currently only affects the content layer.
-   use_udev = is_linux && !is_chromecast
- 
--  use_dbus = is_linux && !is_chromecast
-+  use_dbus = (is_linux || is_bsd) && !is_chromecast
+--- build/config/features.gni.orig	2017-12-15 02:04:05.000000000 +0100
++++ build/config/features.gni	2017-12-23 23:30:21.417932000 +0100
+@@ -46,7 +46,7 @@
+   fieldtrial_testing_like_official_build = is_chrome_branded
  
-   # Option controlling the use of GConf (the classic GNOME configuration
-   # system).
--  use_gconf = is_linux && !is_chromeos && !is_chromecast
-+  use_gconf = (is_linux || is_bsd) && !is_chromeos && !is_chromecast
+   # libudev usage. This currently only affects the content layer.
+-  use_udev = is_linux && !is_chromecast
++  use_udev = is_linux && !is_chromecast && !is_bsd
  
--  use_gio = is_linux && !is_chromeos && !is_chromecast
-+  use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast
+   use_dbus = is_linux && !is_chromecast
  
-   # Whether or not to use external popup menu.
-   use_external_popup_menu = is_android || is_mac
diff --git a/www/iridium/files/patch-build_config_linux_BUILD.gn b/www/iridium/files/patch-build_config_linux_BUILD.gn
new file mode 100644
index 000000000000..8622d398e2d8
--- /dev/null
+++ b/www/iridium/files/patch-build_config_linux_BUILD.gn
@@ -0,0 +1,11 @@
+--- build/config/linux/BUILD.gn.orig	2018-07-19 22:09:59.968726000 +0200
++++ build/config/linux/BUILD.gn	2018-07-19 22:10:16.334896000 +0200
+@@ -28,7 +28,7 @@
+   }
+ 
+   if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
+-      (!use_custom_libcxx || current_cpu == "mipsel")) {
++      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
+     libs = [ "atomic" ]
+   }
+ }
diff --git a/www/iridium/files/patch-build_config_linux_gtk2_BUILD.gn b/www/iridium/files/patch-build_config_linux_gtk2_BUILD.gn
deleted file mode 100644
index 9943c1388043..000000000000
--- a/www/iridium/files/patch-build_config_linux_gtk2_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/config/linux/gtk2/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/linux/gtk2/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/linux/pkg_config.gni")
- 
--assert(is_linux, "This file should only be referenced on Linux")
-+assert(is_linux || is_bsd, "This file should only be referenced on Linux")
- 
- # Depend on //build/config/linux/gtk2 to use GTKv2. Depend on
- # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags.
diff --git a/www/iridium/files/patch-build_config_linux_gtk3_BUILD.gn b/www/iridium/files/patch-build_config_linux_gtk3_BUILD.gn
deleted file mode 100644
index e9bc6f57d64d..000000000000
--- a/www/iridium/files/patch-build_config_linux_gtk3_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/config/linux/gtk3/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/linux/gtk3/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/linux/pkg_config.gni")
- 
--assert(is_linux, "This file should only be referenced on Linux")
-+assert(is_linux || is_bsd, "This file should only be referenced on Linux")
- 
- # Depend on //build/config/linux/gtk3 to use GTKv3. Depend on
- # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags.
diff --git a/www/iridium/files/patch-build_config_linux_gtk_BUILD.gn b/www/iridium/files/patch-build_config_linux_gtk_BUILD.gn
deleted file mode 100644
index b7ad2252b439..000000000000
--- a/www/iridium/files/patch-build_config_linux_gtk_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/config/linux/gtk/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/linux/gtk/BUILD.gn
-@@ -5,7 +5,7 @@
- import("//build/config/linux/gtk/gtk.gni")
- import("//build/config/linux/pkg_config.gni")
- 
--assert(is_linux, "This file should only be referenced on Linux")
-+assert(is_linux || is_bsd, "This file should only be referenced on Linux")
- 
- # The target in this file will automatically reference GTK2 or GTK3 depending
- # on the state of the build flag. Some builds reference both 2 and 3, and some
diff --git a/www/iridium/files/patch-build_config_sanitizers_BUILD.gn b/www/iridium/files/patch-build_config_sanitizers_BUILD.gn
deleted file mode 100644
index e385f3ee575c..000000000000
--- a/www/iridium/files/patch-build_config_sanitizers_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/config/sanitizers/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/sanitizers/BUILD.gn
-@@ -428,7 +428,7 @@ config("lsan_flags") {
- 
- config("msan_flags") {
-   if (is_msan) {
--    assert(is_linux, "msan only supported on linux x86_64")
-+    assert(is_linux || is_bsd, "msan only supported on linux x86_64")
-     if (!defined(msan_blacklist_path)) {
-       msan_blacklist_path =
-           rebase_path("//tools/msan/blacklist.txt", root_build_dir)
-@@ -443,7 +443,7 @@ config("msan_flags") {
- 
- config("tsan_flags") {
-   if (is_tsan) {
--    assert(is_linux, "tsan only supported on linux x86_64")
-+    assert(is_linux || is_bsd, "tsan only supported on linux x86_64")
-     if (!defined(tsan_blacklist_path)) {
-       tsan_blacklist_path =
-           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
diff --git a/www/iridium/files/patch-build_config_sanitizers_sanitizers.gni b/www/iridium/files/patch-build_config_sanitizers_sanitizers.gni
deleted file mode 100644
index f7eeffba7876..000000000000
--- a/www/iridium/files/patch-build_config_sanitizers_sanitizers.gni
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/config/sanitizers/sanitizers.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/config/sanitizers/sanitizers.gni
-@@ -54,8 +54,8 @@ declare_args() {
-   # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
-   #
-   # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
--  is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
--           is_official_build && allow_posix_link_time_opt
-+  is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos &&
-+           target_cpu == "x64" && is_official_build && allow_posix_link_time_opt
- 
-   # Enable checks for bad casts: derived cast and unrelated cast.
-   # TODO(krasin): remove this, when we're ready to add these checks by default.
diff --git a/www/iridium/files/patch-build_config_ui.gni b/www/iridium/files/patch-build_config_ui.gni
deleted file mode 100644
index 47d20b7a4045..000000000000
--- a/www/iridium/files/patch-build_config_ui.gni
+++ /dev/null
@@ -1,36 +0,0 @@
---- build/config/ui.gni.orig	2017-04-19 19:06:28 UTC
-+++ build/config/ui.gni
-@@ -31,10 +31,10 @@ declare_args() {
- 
-   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
-   # of a replacement for GDI or GTK.
--  use_aura = is_win || is_linux
-+  use_aura = is_win || is_linux || is_bsd
- 
-   # Whether we should use glib, a low level C utility library.
--  use_glib = is_linux
-+  use_glib = is_linux || is_bsd
- 
-   # Indicates if Wayland display server support is enabled.
-   enable_wayland_server = is_chromeos
-@@ -55,17 +55,17 @@ declare_args() {
- 
- # Use GPU accelerated cross process image transport by default on linux builds
- # with the Aura window manager.
--ui_compositor_image_transport = use_aura && is_linux
-+ui_compositor_image_transport = use_aura && (is_linux || is_bsd)
- 
- # Indicates if the UI toolkit depends on X11.
--use_x11 = is_linux && !use_ozone
-+use_x11 = (is_linux || is_bsd) && !use_ozone
- 
- # Turn off glib if Ozone is enabled.
- if (use_ozone) {
-   use_glib = false
- }
- 
--if (is_linux && !use_ozone) {
-+if ((is_linux || is_bsd) && !use_ozone) {
-   use_cairo = true
-   use_pango = true
- } else {
diff --git a/www/iridium/files/patch-build_gn_run_binary.py b/www/iridium/files/patch-build_gn_run_binary.py
new file mode 100644
index 000000000000..f1dfcd53ca79
--- /dev/null
+++ b/www/iridium/files/patch-build_gn_run_binary.py
@@ -0,0 +1,11 @@
+--- build/gn_run_binary.py.orig	2017-12-30 01:00:32.419195000 +0100
++++ build/gn_run_binary.py	2017-12-30 01:01:14.497716000 +0100
+@@ -19,7 +19,7 @@
+ # The rest of the arguments are passed directly to the executable.
+ args = [path] + sys.argv[2:]
+ 
+-ret = subprocess.call(args)
++ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome"})
+ if ret != 0:
+   print '%s failed with exit code %d' % (sys.argv[1], ret)
+ sys.exit(ret)
diff --git a/www/iridium/files/patch-build_linux_unbundle_ffmpeg.gn b/www/iridium/files/patch-build_linux_unbundle_ffmpeg.gn
new file mode 100644
index 000000000000..54b990f5fc64
--- /dev/null
+++ b/www/iridium/files/patch-build_linux_unbundle_ffmpeg.gn
@@ -0,0 +1,22 @@
+--- build/linux/unbundle/ffmpeg.gn.orig	2018-07-20 01:03:59.604084000 +0200
++++ build/linux/unbundle/ffmpeg.gn	2018-07-20 01:04:45.406745000 +0200
+@@ -14,8 +14,8 @@
+   ]
+ }
+ 
+-buildflag_header("ffmpeg_buildflags") {
+-  header = "ffmpeg_buildflags.h"
++buildflag_header("ffmpeg_features") {
++  header = "ffmpeg_features.h"
+   flags = [ "USE_SYSTEM_FFMPEG=true" ]
+ }
+ 
+@@ -30,7 +30,7 @@
+ 
+ source_set("ffmpeg") {
+   deps = [
+-    ":ffmpeg_buildflags",
++    ":ffmpeg_features",
+     ":ffmpeg_shim",
+   ]
+   public_configs = [ ":system_ffmpeg" ]
diff --git a/www/iridium/files/patch-build_linux_unbundle_libusb.gn b/www/iridium/files/patch-build_linux_unbundle_libusb.gn
new file mode 100644
index 000000000000..55c6dbb7f971
--- /dev/null
+++ b/www/iridium/files/patch-build_linux_unbundle_libusb.gn
@@ -0,0 +1,27 @@
+--- build/linux/unbundle/libusb.gn.orig	2018-07-20 03:07:05.793992000 +0200
++++ build/linux/unbundle/libusb.gn	2018-07-20 03:07:35.792417000 +0200
+@@ -0,0 +1,24 @@
++# Copyright 2016 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.
++
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libusb") {
++  packages = [ "libusb-1.0" ]
++}
++
++shim_headers("libusb_shim") {
++  root_path = "src/libusb"
++  headers = [
++    "libusb.h",
++  ]
++}
++
++source_set("libusb") {
++  deps = [
++    ":libusb_shim",
++  ]
++  public_configs = [ ":system_libusb" ]
++}
diff --git a/www/iridium/files/patch-build_linux_unbundle_libwebp.gn b/www/iridium/files/patch-build_linux_unbundle_libwebp.gn
new file mode 100644
index 000000000000..34193f75fda6
--- /dev/null
+++ b/www/iridium/files/patch-build_linux_unbundle_libwebp.gn
@@ -0,0 +1,41 @@
+--- build/linux/unbundle/libwebp.gn.orig	2018-08-13 22:43:49.456935000 +0200
++++ build/linux/unbundle/libwebp.gn	2018-08-13 22:48:47.151901000 +0200
+@@ -2,12 +2,34 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libwebp") {
++  packages = [
++    "libwebp",
++    "libwebpdemux",
++    "libwebpmux",
++  ]
++}
++
++shim_headers("libwebp_shim") {
++  root_path = "src"
++  headers = [
++    "webp/decode.h",
++    "webp/demux.h",
++    "webp/encode.h",
++    "webp/mux.h",
++    "webp/mux_types.h",
++    "webp/types.h",
++  ]
++}
++
+ source_set("libwebp_webp") {
+-  libs = [
+-    "webp",
+-    "webpdemux",
+-    "webpmux",
++  deps = [
++    ":libwebp_shim",
+   ]
++  public_configs = [ ":system_libwebp" ]
+ }
+ 
+ group("libwebp") {
diff --git a/www/iridium/files/patch-build_linux_unbundle_replace_gn_files.py b/www/iridium/files/patch-build_linux_unbundle_replace_gn_files.py
new file mode 100644
index 000000000000..5dd7a9d2391a
--- /dev/null
+++ b/www/iridium/files/patch-build_linux_unbundle_replace_gn_files.py
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/replace_gn_files.py.orig	2018-07-20 03:07:59.446131000 +0200
++++ build/linux/unbundle/replace_gn_files.py	2018-07-20 03:08:31.519350000 +0200
+@@ -27,6 +27,7 @@
+   'libevent': 'base/third_party/libevent/BUILD.gn',
+   'libjpeg': 'third_party/libjpeg.gni',
+   'libpng': 'third_party/libpng/BUILD.gn',
++  'libusb': 'third_party/libusb/BUILD.gn',
+   'libvpx': 'third_party/libvpx/BUILD.gn',
+   'libwebp': 'third_party/libwebp/BUILD.gn',
+   'libxml': 'third_party/libxml/BUILD.gn',
diff --git a/www/iridium/files/patch-build_secondary_third__party_nss_BUILD.gn b/www/iridium/files/patch-build_secondary_third__party_nss_BUILD.gn
deleted file mode 100644
index 509d6110710b..000000000000
--- a/www/iridium/files/patch-build_secondary_third__party_nss_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/secondary/third_party/nss/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/secondary/third_party/nss/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/linux/pkg_config.gni")
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
-   # library but the system NSS libraries. Non-Linux platforms using NSS use the
-   # hermetic one in //third_party/nss.
diff --git a/www/iridium/files/patch-build_toolchain_linux_BUILD.gn b/www/iridium/files/patch-build_toolchain_linux_BUILD.gn
index 3a312520cc14..65cc0174d610 100644
--- a/www/iridium/files/patch-build_toolchain_linux_BUILD.gn
+++ b/www/iridium/files/patch-build_toolchain_linux_BUILD.gn
@@ -1,24 +1,10 @@
---- build/toolchain/linux/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/toolchain/linux/BUILD.gn
-@@ -6,7 +6,9 @@ import("//build/config/sysroot.gni")
- import("//build/toolchain/gcc_toolchain.gni")
- 
- clang_toolchain("clang_arm") {
--  toolprefix = "arm-linux-gnueabihf-"
-+  if (!is_bsd) {
-+    toolprefix = "arm-linux-gnueabihf-"
-+  }
-   toolchain_args = {
-     current_cpu = "arm"
-     current_os = "linux"
-@@ -14,7 +16,9 @@ clang_toolchain("clang_arm") {
+--- build/toolchain/linux/BUILD.gn.orig	2017-09-11 02:58:56.145741000 +0200
++++ build/toolchain/linux/BUILD.gn	2017-09-11 02:59:18.322655000 +0200
+@@ -14,7 +14,6 @@
  }
  
  clang_toolchain("clang_arm64") {
 -  toolprefix = "aarch64-linux-gnu-"
-+  if (!is_bsd) {
-+    toolprefix = "aarch64-linux-gnu-"
-+  }
    toolchain_args = {
      current_cpu = "arm64"
      current_os = "linux"
diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn
new file mode 100644
index 000000000000..4e40dedebb20
--- /dev/null
+++ b/www/iridium/files/patch-cc_BUILD.gn
@@ -0,0 +1,22 @@
+--- cc/BUILD.gn.orig	2017-12-30 06:26:13.722587000 +0100
++++ cc/BUILD.gn	2017-12-30 06:26:46.042197000 +0100
+@@ -541,7 +541,7 @@
+     "//ui/gl:test_support",
+     "//ui/latency",
+   ]
+-  if (!is_android) {
++  if (!is_android && !is_bsd) {
+     data_deps = [
+       "//third_party/mesa:osmesa",
+     ]
+@@ -717,10 +717,6 @@
+     "//ui/gfx/geometry",
+     "//ui/gl",
+     "//ui/gl:test_support",
+-  ]
+-
+-  data_deps = [
+-    "//third_party/mesa:osmesa",
+   ]
+ }
+ 
diff --git a/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
index de6cc4a4734d..481776ba30d1 100644
--- a/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
+++ b/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
@@ -1,6 +1,6 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig	2017-04-19 19:06:28 UTC
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2017-06-05 19:03:01 UTC
 +++ cc/layers/scrollbar_layer_impl_base.cc
-@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
+@@ -175,8 +175,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
    int thumb_offset = TrackStart();
    if (maximum > 0) {
      float ratio = clamped_current_pos / maximum;
diff --git a/www/iridium/files/patch-cc_trees_property__tree.cc b/www/iridium/files/patch-cc_trees_property__tree.cc
index 3aeb9ed21a0b..549b1400f3a2 100644
--- a/www/iridium/files/patch-cc_trees_property__tree.cc
+++ b/www/iridium/files/patch-cc_trees_property__tree.cc
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2017-04-19 19:06:28 UTC
+--- cc/trees/property_tree.cc.orig	2017-06-05 19:03:01 UTC
 +++ cc/trees/property_tree.cc
-@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
+@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
  
    gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
  
diff --git a/www/iridium/files/patch-chrome_BUILD.gn b/www/iridium/files/patch-chrome_BUILD.gn
deleted file mode 100644
index 93bbc2c35cbf..000000000000
--- a/www/iridium/files/patch-chrome_BUILD.gn
+++ /dev/null
@@ -1,41 +0,0 @@
---- chrome/BUILD.gn.orig	2017-04-24 14:40:29 UTC
-+++ chrome/BUILD.gn
-@@ -142,7 +142,7 @@ if (!is_android && !is_mac) {
-     data = [
-       "$root_out_dir/resources.pak",
-     ]
--    if (is_linux || is_win) {
-+    if (is_linux || is_bsd || is_win) {
-       data += [
-         "$root_out_dir/chrome_100_percent.pak",
-         "$root_out_dir/locales/en-US.pak",
-@@ -221,10 +221,9 @@ if (!is_android && !is_mac) {
-     } else if (use_aura) {
-       # Non-Windows aura entrypoint.
-       sources += [ "app/chrome_exe_main_aura.cc" ]
--      ldflags = [ "-Wl,--no-keep-memory" ]
-     }
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       sources += [
-         "app/chrome_dll_resource.h",
-         "app/chrome_main.cc",
-@@ -254,7 +253,7 @@ if (!is_android && !is_mac) {
-         "//chrome/common:features",
-       ]
- 
--      ldflags += [ "-pie", "-Wl,--no-keep-memory" ]
-+      ldflags = [ "-pie" ]
- 
-       if (use_pango || use_cairo) {
-         # Needed for chrome_main.cc initialization of libraries.
-@@ -1650,7 +1649,7 @@ if (enable_resource_whitelist_generation
-   }
- }
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   action("manpage") {
-     if (is_chrome_branded) {
-       name = "Google Chrome"
diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h
index 804bba997477..e18cc4fc4e8d 100644
--- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,6 +1,6 @@
---- chrome/app/chrome_command_ids.h.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/chrome_command_ids.h.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chrome_command_ids.h
-@@ -71,7 +71,7 @@
+@@ -67,7 +67,7 @@
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
  #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
  
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
index a3195d190da7..ea26c9429517 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main.cc
@@ -1,19 +1,19 @@
---- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
-+++ chrome/app/chrome_main.cc
-@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
+--- chrome/app/chrome_main.cc.orig	2017-09-05 21:05:12.000000000 +0200
++++ chrome/app/chrome_main.cc	2017-09-06 17:23:42.720920000 +0200
+@@ -99,14 +99,14 @@
    ALLOW_UNUSED_LOCAL(command_line);
- #endif
  
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   // Chrome-specific process modes.
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
    if (command_line->HasSwitch(switches::kHeadless)) {
  #if defined(OS_MACOSX)
      SetUpBundleOverrides();
  #endif
-     return headless::HeadlessShellMain(argc, argv);
+     return headless::HeadlessShellMain(params);
    }
--#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
-+#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
  
- #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
-   version_info::Channel channel = chrome::GetChannel();
+ #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
+ #if !defined(OS_WIN) || defined(COMPONENT_BUILD) || \
diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
index 80cc63aa457c..e4fd91ff05ba 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,21 +1,16 @@
---- chrome/app/chrome_main_delegate.cc.orig	2017-04-19 19:06:28 UTC
-+++ chrome/app/chrome_main_delegate.cc
-@@ -89,7 +89,7 @@
- #include "chrome/app/chrome_crash_reporter_client.h"
+--- chrome/app/chrome_main_delegate.cc.orig	2018-02-24 16:25:09.000000000 +0100
++++ chrome/app/chrome_main_delegate.cc	2018-03-03 20:07:40.484969000 +0100
+@@ -98,7 +98,7 @@
+ #include "chrome/app/shutdown_signal_handlers_posix.h"
  #endif
  
--#if !defined(DISABLE_NACL) && defined(OS_LINUX)
-+#if !defined(DISABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
+-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -117,11 +117,11 @@
- #include "ui/base/x/x11_util.h"  // nogncheck
- #endif
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "components/crash/content/app/breakpad_linux.h"
+@@ -133,7 +133,7 @@
+ #include "v8/include/v8.h"
  #endif
  
 -#if defined(OS_LINUX)
@@ -23,34 +18,16 @@
  #include "base/environment.h"
  #endif
  
-@@ -163,7 +163,7 @@ base::LazyInstance<ChromeContentBrowserC
-     LAZY_INSTANCE_INITIALIZER;
- #endif
+@@ -238,7 +238,7 @@
  
--#if defined(OS_POSIX)
-+#if defined(OS_POSIX) && !defined(OS_BSD)
- base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
-     LAZY_INSTANCE_INITIALIZER;
- #endif
-@@ -280,7 +280,7 @@ static void AdjustLinuxOOMScore(const st
- // and resources loaded.
- bool SubprocessNeedsResourceBundle(const std::string& process_type) {
-   return
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-       // The zygote process opens the resources for the renderers.
-       process_type == switches::kZygoteProcess ||
- #endif
-@@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::Comm
- }
- #endif
+ #endif  // defined(OS_WIN)
  
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void SIGTERMProfilingShutdown(int signal) {
-   Profiling::Stop();
-   struct sigaction sigact;
-@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+ void AdjustLinuxOOMScore(const std::string& process_type) {
+   // Browsers and zygotes should still be killable, but killed last.
+   const int kZygoteScore = 0;
+@@ -407,7 +407,7 @@
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -59,7 +36,16 @@
    // 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.
-@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -581,7 +581,7 @@
+ #if defined(OS_CHROMEOS)
+   chromeos::RegisterPathProvider();
+ #endif
+-#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX)
++#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
+   nacl::RegisterPathProvider();
+ #endif
+ 
+@@ -603,7 +603,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -68,7 +54,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -653,7 +653,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -77,17 +63,8 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart
-   std::string process_type =
-       command_line.GetSwitchValueASCII(switches::kProcessType);
- 
--#if defined(OS_POSIX)
-+#if defined(OS_POSIX) && !defined(OS_BSD)
-   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
- #endif
- 
-@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart
-   chrome::InitializePDF();
+@@ -915,7 +915,7 @@
+   InitializePDF();
  #endif
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -95,7 +72,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -899,7 +899,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -931,7 +931,7 @@
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -104,12 +81,12 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -1005,7 +1005,7 @@ bool ChromeMainDelegate::DelaySandboxIni
+@@ -941,7 +941,7 @@
+ 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.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   AdjustLinuxOOMScore(process_type);
  #endif
-   return process_type == switches::kRelauncherProcess;
- }
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void ChromeMainDelegate::ZygoteStarting(
-     std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
- #if defined(OS_CHROMEOS)
+ #if defined(OS_WIN)
diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.h b/www/iridium/files/patch-chrome_app_chrome__main__delegate.h
deleted file mode 100644
index 0d28e5dde319..000000000000
--- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/chrome_main_delegate.h.orig	2017-04-19 19:06:28 UTC
-+++ chrome/app/chrome_main_delegate.h
-@@ -42,7 +42,7 @@ class ChromeMainDelegate : public conten
-       const std::string& process_type) override;
-   bool ShouldSendMachPort(const std::string& process_type) override;
-   bool DelaySandboxInitialization(const std::string& process_type) override;
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
-                           delegates) override;
-   void ZygoteForked() override;
diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd
index 492817705484..b87408d73cd5 100644
--- a/www/iridium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd
@@ -1,11 +1,11 @@
---- chrome/app/chromium_strings.grd.orig	2017-04-24 14:40:26 UTC
-+++ chrome/app/chromium_strings.grd
-@@ -891,7 +891,7 @@ Signing in anyway will merge browser inf
+--- chrome/app/chromium_strings.grd.orig	2017-09-05 21:05:12.000000000 +0200
++++ chrome/app/chromium_strings.grd	2017-09-07 19:17:30.228682000 +0200
+@@ -913,7 +913,7 @@
        </message>
  
        <!-- ProcessSingleton -->
 -      <if expr="is_linux or is_macosx">
-+      <if expr="is_linux or is_macosx or is_bsd">
++      <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>
diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd
index 327ea90a6468..2dba7ca4b3b7 100644
--- a/www/iridium/files/patch-chrome_app_generated__resources.grd
+++ b/www/iridium/files/patch-chrome_app_generated__resources.grd
@@ -1,38 +1,29 @@
---- chrome/app/generated_resources.grd.orig	2017-04-24 14:40:26 UTC
-+++ chrome/app/generated_resources.grd
-@@ -6535,7 +6535,7 @@ Keep your key file in a safe place. You 
-       <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
-           Right-to-left
-       </message>
--      <if expr="is_win or is_linux">
-+      <if expr="is_win or is_linux or is_bsd">
-         <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
-           Enable Input IME API
-         </message>
-@@ -9629,7 +9629,7 @@ I don't think this site should be blocke
-       <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
-         Appearance
+--- chrome/app/generated_resources.grd.orig	2018-02-24 16:25:09.000000000 +0100
++++ chrome/app/generated_resources.grd	2018-03-03 20:22:12.855371000 +0100
+@@ -6919,7 +6919,7 @@
+         Google Payments
        </message>
+ 
 -      <if expr="not is_linux or chromeos">
-+      <if expr="not is_linux or not is_bsd or chromeos">
++      <if expr="not is_posix or chromeos">
          <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
            Themes
          </message>
-@@ -9637,7 +9637,7 @@ I don't think this site should be blocke
+@@ -6927,7 +6927,7 @@
        <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
          Reset to default theme
        </message>
 -      <if expr="is_linux and not chromeos">
-+      <if expr="is_linux or is_bsd and not chromeos">
++      <if expr="is_posix and not chromeos">
          <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
            Use GTK+ theme
          </message>
-@@ -10903,7 +10903,7 @@ Tell us what happened exactly before you
+@@ -8076,7 +8076,7 @@
          Set as default
        </message>
  
 -      <if expr="is_linux and not chromeos">
-+      <if expr="is_linux or is_bsd and not chromeos">
-         <message name="IDS_SHOW_WINDOW_DECORATIONS_MENU" desc="The menu entry text in the tab strip context menu.  This toggles the system title bar and window borders (window decorations) on linux.">
-           Use system title bar and borders
++      <if expr="is_posix and not chromeos">
+         <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
+           Minimize
          </message>
diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd
index 40e0375e1a09..9859f183f6ce 100644
--- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,11 +1,11 @@
---- chrome/app/google_chrome_strings.grd.orig	2017-04-24 14:40:26 UTC
-+++ chrome/app/google_chrome_strings.grd
-@@ -892,7 +892,7 @@ Signing in anyway will merge Chrome info
+--- chrome/app/google_chrome_strings.grd.orig	2017-09-05 21:05:12.000000000 +0200
++++ chrome/app/google_chrome_strings.grd	2017-09-07 19:16:11.038110000 +0200
+@@ -917,7 +917,7 @@
        </message>
  
        <!-- ProcessSingleton -->
 -      <if expr="is_linux or is_macosx">
-+      <if expr="is_linux or is_macosx or is_bsd">
++      <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 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>
diff --git a/www/iridium/files/patch-chrome_app_mash_mash__runner.cc b/www/iridium/files/patch-chrome_app_mash_mash__runner.cc
deleted file mode 100644
index 29251db2112a..000000000000
--- a/www/iridium/files/patch-chrome_app_mash_mash__runner.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/mash/mash_runner.cc.orig	2017-04-19 19:06:28 UTC
-+++ chrome/app/mash/mash_runner.cc
-@@ -263,7 +263,7 @@ int MashMain() {
-   // TODO(sky): wire this up correctly.
-   service_manager::InitializeLogging();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::AtExitManager exit_manager;
- #endif
- 
diff --git a/www/iridium/files/patch-chrome_app_resources_locale__settings.grd b/www/iridium/files/patch-chrome_app_resources_locale__settings.grd
deleted file mode 100644
index 367c458bb099..000000000000
--- a/www/iridium/files/patch-chrome_app_resources_locale__settings.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/resources/locale_settings.grd.orig	2017-04-19 19:06:29 UTC
-+++ chrome/app/resources/locale_settings.grd
-@@ -151,7 +151,7 @@
-         55
-       </message>
- 
--      <if expr="is_win or is_linux or chromeos">
-+      <if expr="is_win or is_linux or chromeos or is_bsd">
-         <!-- The width of the ash/ChromeOS system tray menu in pixels. -->
-         <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true">
-           300
diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp
index 8a79a339e266..c22ac4530096 100644
--- a/www/iridium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp
@@ -1,15 +1,15 @@
---- chrome/app/settings_strings.grdp.orig	2017-04-19 19:06:29 UTC
-+++ chrome/app/settings_strings.grdp
-@@ -240,7 +240,7 @@
-   <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser.">
-     Themes
-   </message>
+--- chrome/app/settings_strings.grdp.orig	2017-12-15 02:04:07.000000000 +0100
++++ chrome/app/settings_strings.grdp	2017-12-24 00:15:33.402792000 +0100
+@@ -363,7 +363,7 @@
+       Themes
+     </message>
+   </if>
 -  <if expr="is_linux and not chromeos">
 +  <if expr="is_posix and not chromeos">
      <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
        GTK+
      </message>
-@@ -254,7 +254,7 @@
+@@ -377,7 +377,7 @@
        Use Classic
      </message>
    </if>
diff --git a/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
index ed25b0f4cac3..92e2227dce8e 100644
--- a/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
+++ b/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
@@ -1,4 +1,4 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/shutdown_signal_handlers_posix.cc
 @@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers(
    g_pipe_pid = getpid();
@@ -12,11 +12,11 @@
  #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
  #else
-@@ -191,6 +196,7 @@ void InstallShutdownSignalHandlers(
+@@ -190,6 +195,7 @@ void InstallShutdownSignalHandlers(
+   // shadow stacks) bloat the stack frames, so we need to increase the stack
    // size to avoid hitting the guard page.
    const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
- #endif
 +#endif
+ #endif
    ShutdownDetector* detector = new ShutdownDetector(
        g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
-   // PlatformThread does not delete its delegate.
diff --git a/www/iridium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd
new file mode 100644
index 000000000000..fe027914c308
--- /dev/null
+++ b/www/iridium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd
@@ -0,0 +1,11 @@
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig	2017-09-07 19:07:10.298267000 +0200
++++ chrome/app/theme/chrome_unscaled_resources.grd	2017-09-07 19:07:26.024168000 +0200
+@@ -80,7 +80,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>
+-      <if expr="is_linux and enable_app_list">
++      <if expr="is_posix and enable_app_list">
+         <!-- App Launcher icons for desktop icon. -->
+         <if expr="_google_chrome">
+           <then>
diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn
deleted file mode 100644
index 0b55b08678b1..000000000000
--- a/www/iridium/files/patch-chrome_browser_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/BUILD.gn.orig	2017-04-24 14:40:28 UTC
-+++ chrome/browser/BUILD.gn
-@@ -2219,7 +2219,7 @@ split_static_library("browser") {
-     deps += [ "//device/udev_linux" ]
-   }
- 
--  if (is_linux && !is_chromeos) {
-+  if ((is_linux || is_bsd) && !is_chromeos) {
-     deps += [ "//third_party/speech-dispatcher" ]
-   }
- 
-@@ -3606,7 +3606,7 @@ split_static_library("browser") {
-     }
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (use_aura) {
-       deps += [ "//build/linux:fontconfig" ]
-       if (use_dbus) {
diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc
index 9a4ca2ae1c84..7e1a90fc3bfe 100644
--- a/www/iridium/files/patch-chrome_browser_about__flags.cc
+++ b/www/iridium/files/patch-chrome_browser_about__flags.cc
@@ -1,34 +1,29 @@
---- chrome/browser/about_flags.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/about_flags.cc
-@@ -856,7 +856,7 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
-      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
-                                switches::kDisableSmoothScrolling)},
--#if defined(USE_AURA) || defined(OS_LINUX)
-+#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD)
-     {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
-      IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
-      // Uses the system preference on Mac (a different implementation).
-@@ -1374,11 +1374,11 @@ const FeatureEntry kFeatureEntries[] = {
-      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
-                                switches::kDisableTranslateNewUX)},
- #endif  // OS_MACOSX
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
-     {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
-      IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
-      FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
--#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS
-+#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS || OS_BSD
-     {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
-      IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
-      FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
-@@ -1802,7 +1802,7 @@ const FeatureEntry kFeatureEntries[] = {
-      IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
+--- chrome/browser/about_flags.cc.orig	2018-05-09 21:05:36.000000000 +0200
++++ chrome/browser/about_flags.cc	2018-08-16 03:29:45.979149000 +0200
+@@ -593,7 +593,7 @@
+      switches::kForceDirectionRTL},
+ };
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+ // Feature used to enable the identification of open tabs given URLs in
+ // suggestions, and converting those suggestions to ones that allow switching to
+ // the tab if found.  Currently only on the desktop. Includes button option
+@@ -2441,7 +2441,7 @@
+      flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
  #endif  // ENABLE_EXTENSIONS
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-     {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
-      IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux,
+     {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName,
+      flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux,
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
+@@ -3058,7 +3058,7 @@
+      flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+     {"omnibox-entity-suggestions",
+      flag_descriptions::kOmniboxEntitySuggestionsName,
+      flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
index 809ef024c745..06f200bab0a7 100644
--- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,6 +1,6 @@
---- chrome/browser/after_startup_task_utils.cc.orig	2017-05-02 19:02:47 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/browser/after_startup_task_utils.cc
-@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStar
+@@ -99,7 +99,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
  
  void SetBrowserStartupIsComplete() {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
diff --git a/www/iridium/files/patch-chrome_browser_background_background_mode_optimizer.cc b/www/iridium/files/patch-chrome_browser_background_background_mode_optimizer.cc
new file mode 100644
index 000000000000..9e6f44cac295
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_background_background_mode_optimizer.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/background/background_mode_optimizer.cc.orig	2017-09-07 23:33:41.430876000 +0200
++++ chrome/browser/background/background_mode_optimizer.cc	2017-09-07 23:34:04.189439000 +0200
+@@ -30,10 +30,10 @@
+           switches::kKeepAliveForTest))
+     return nullptr;
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart))
+     return base::WrapUnique(new BackgroundModeOptimizer());
+-#endif  // defined(OS_WIN) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+   return nullptr;
+ }
diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
index b5a9b406b9b6..bae35a6d02aa 100644
--- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/browser_process_impl.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/browser_process_impl.cc
-@@ -171,7 +171,7 @@
+--- chrome/browser/browser_process_impl.cc.orig	2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/browser_process_impl.cc	2018-07-14 13:27:02.197056000 +0200
+@@ -180,7 +180,7 @@
  #include "chrome/browser/media/webrtc/webrtc_log_uploader.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/memory/tab_manager.h"
+ #include "chrome/browser/resource_coordinator/tab_manager.h"
  #endif
  
-@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
+@@ -856,7 +856,7 @@
  
- memory::TabManager* BrowserProcessImpl::GetTabManager() {
-   DCHECK(CalledOnValidThread());
+ resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   if (!tab_manager_.get())
-     tab_manager_.reset(new memory::TabManager());
-   return tab_manager_.get();
+   if (!tab_manager_) {
+     tab_manager_ = std::make_unique<resource_coordinator::TabManager>();
+     tab_lifecycle_unit_source_ =
diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h
index aab065842384..3e96886b6a57 100644
--- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.h.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/browser_process_impl.h.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/browser_process_impl.h
-@@ -342,7 +342,7 @@ class BrowserProcessImpl : public Browse
+@@ -343,7 +343,7 @@ class BrowserProcessImpl : public BrowserProcess,
  
    std::unique_ptr<ChromeDeviceClient> device_client_;
  
diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd
index 979666f08c0c..c3bd477966d3 100644
--- a/www/iridium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/iridium/files/patch-chrome_browser_browser__resources.grd
@@ -1,11 +1,11 @@
---- chrome/browser/browser_resources.grd.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/browser_resources.grd
-@@ -383,7 +383,7 @@
-         <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
-         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
+--- chrome/browser/browser_resources.grd.orig	2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/browser_resources.grd	2018-07-14 13:48:09.392254000 +0200
+@@ -634,7 +634,7 @@
+         <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
        </if>
--      <if expr="desktop_linux or (is_android and enable_plugins)">
-+      <if expr="desktop_linux or (is_android and enable_plugins) or is_bsd">
-         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
+       <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">
++      <if expr="is_android or is_posix">
+         <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
+         <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" />
        </if>
-       <if expr="is_android">
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
index dbdcacf15ea8..b94d601d1cb5 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,16 +1,16 @@
---- chrome/browser/chrome_browser_main.cc.orig	2017-04-24 14:40:28 UTC
-+++ chrome/browser/chrome_browser_main.cc
-@@ -181,7 +181,7 @@
- #include "chrome/browser/lifetime/application_lifetime.h"
- #endif  // defined(OS_ANDROID)
+--- chrome/browser/chrome_browser_main.cc.orig	2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/chrome_browser_main.cc	2018-07-14 13:55:52.288113000 +0200
+@@ -211,7 +211,7 @@
+ #include "chromeos/settings/cros_settings_names.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)
  
-@@ -276,7 +276,7 @@
- #endif
+@@ -251,7 +251,7 @@
+ #endif  // defined(OS_WIN)
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
 -    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ -18,43 +18,29 @@
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #endif
  
-@@ -479,10 +479,10 @@ void RegisterComponentsForUpdate() {
+@@ -1342,10 +1342,10 @@
+   }
+ #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
- #if !defined(OS_ANDROID)
-   RegisterPepperFlashComponent(cus);
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   RegisterSwiftShaderComponent(cus);
-   RegisterWidevineCdmComponent(cus);
--#endif  // !defined(OS_CHROMEOS)
-+#endif  // !defined(OS_CHROMEOS) && !defined(OS_BSD)
- #endif  // !defined(OS_ANDROID)
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+   // Set the product channel for crash reports.
+   breakpad::SetChannelCrashKey(chrome::GetChannelName());
+-#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif  // defined(OS_LINUX)
  
- #if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
-@@ -764,7 +764,7 @@ void ChromeBrowserMainParts::SetupFieldT
-   field_trial_synchronizer_ = new FieldTrialSynchronizer();
+ #if defined(OS_MACOSX)
+   // Get the Keychain API to register for distributed notifications on the main
+@@ -1369,7 +1369,7 @@
+   }
  
  #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();
  #endif
- 
-@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr
-   }
- #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Set the product channel for crash reports.
-   base::debug::SetCrashKeyValue(crash_keys::kChannel,
-                                 chrome::GetChannelString());
--#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- 
-   // Initialize tracking synchronizer system.
-   tracking_synchronizer_ = new metrics::TrackingSynchronizer(
-@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS
+   metrics::RendererUptimeTracker::Initialize();
+@@ -1514,7 +1514,7 @@
  
  // Start the tab manager here so that we give the most amount of time for the
  // other services to start up before we start adjusting the oom priority.
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index 0cbc57b8466a..4f69e8b88b40 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PrePro
+@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
  void ChromeBrowserMainPartsLinux::PostProfileInit() {
    ChromeBrowserMainPartsPosix::PostProfileInit();
  
@@ -16,7 +16,7 @@
    bluez::DBusThreadManagerLinux::Initialize();
    bluez::BluezDBusManager::Initialize(
        bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
-@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMa
+@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
  }
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index ee7a9e57bb2d..39a217d83346 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMa
+@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
  void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
  #if defined(OS_CHROMEOS)
    NOTREACHED();  // Should not ever happen on ChromeOS.
diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 9e2d66099384..d80dbdef3b44 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,24 +1,24 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2017-04-24 14:40:25 UTC
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -244,7 +244,7 @@
- #include "mash/public/interfaces/launchable.mojom.h"
- #include "services/service_manager/public/cpp/interface_factory.h"
- #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
+--- chrome/browser/chrome_content_browser_client.cc.orig	2018-05-17 22:11:45.087267968 +0200
++++ chrome/browser/chrome_content_browser_client.cc	2018-08-16 08:11:41.760400000 +0200
+@@ -304,7 +304,7 @@
+ #include "chromeos/chromeos_switches.h"
+ #include "components/user_manager/user_manager.h"
+ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.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 "chrome/browser/android/app_hooks.h"
-@@ -265,7 +265,7 @@
+ #include "base/android/application_status_listener.h"
+@@ -341,7 +341,7 @@
+ #include "chrome/common/importer/profile_import.mojom.h"
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
  #include "chrome/browser/webshare/share_service_impl.h"
  #endif
  
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "base/debug/leak_annotations.h"
- #include "components/crash/content/app/breakpad_linux.h"
- #include "components/crash/content/browser/crash_handler_host_linux.h"
-@@ -289,7 +289,7 @@
+@@ -355,7 +355,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -27,16 +27,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -700,7 +700,7 @@ bool CertMatchesFilter(const net::X509Ce
-   return false;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
-     const std::string& process_type) {
-   base::FilePath dumps_path;
-@@ -1023,7 +1023,7 @@ content::BrowserMainParts* ChromeContent
+@@ -1032,7 +1032,7 @@
    main_parts = new ChromeBrowserMainPartsMac(parameters);
  #elif defined(OS_CHROMEOS)
    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
@@ -45,25 +36,25 @@
    main_parts = new ChromeBrowserMainPartsLinux(parameters);
  #elif defined(OS_ANDROID)
    main_parts = new ChromeBrowserMainPartsAndroid(parameters);
-@@ -1039,7 +1039,7 @@ content::BrowserMainParts* ChromeContent
+@@ -1048,7 +1048,7 @@
    // 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_BSD) || 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());
  #else
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1680,7 +1680,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -1788,7 +1788,7 @@
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
 -#elif defined(OS_POSIX)
 +#elif defined(OS_POSIX) && !defined(OS_BSD)
-   if (breakpad::IsCrashReporterEnabled()) {
-     std::string switch_value;
-     std::unique_ptr<metrics::ClientInfo> client_info =
-@@ -2972,7 +2972,7 @@ void ChromeContentBrowserClient::GetAddi
+   bool enable_crash_reporter = breakpad::IsCrashReporterEnabled();
+ #if defined(OS_CHROMEOS)
+   // Chrome OS uses the OS-level crash_reporter for mash services, so disable
+@@ -3088,7 +3088,7 @@
    }
  }
  
@@ -72,21 +63,12 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -3001,7 +3001,7 @@ void ChromeContentBrowserClient::GetAddi
-   }
- #endif  // defined(OS_ANDROID)
- }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+@@ -3794,7 +3794,7 @@
+ #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
  
- #if defined(OS_WIN)
- base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3193,6 +3193,8 @@ void ChromeContentBrowserClient::Registe
-         base::Bind(&ForwardShareServiceRequest,
-                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
-   }
-+#elif defined(OS_BSD)
-+  NOTREACHED();
- #else
-   if (AreExperimentalWebPlatformFeaturesEnabled() &&
-       base::FeatureList::IsEnabled(features::kWebPayments)) {
diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
index 6767afaa862c..70e8ec6942f9 100644
--- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,15 +1,15 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/chrome_content_browser_client.h
-@@ -270,12 +270,12 @@ class ChromeContentBrowserClient : publi
+--- chrome/browser/chrome_content_browser_client.h.orig	2018-06-13 00:10:04.000000000 +0200
++++ chrome/browser/chrome_content_browser_client.h	2018-07-14 14:13:02.407023000 +0200
+@@ -299,12 +299,12 @@
+   void OverridePageVisibilityState(
        content::RenderFrameHost* render_frame_host,
-       blink::WebPageVisibilityState* visibility_state) override;
- 
+       blink::mojom::PageVisibilityState* visibility_state) override;
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
        const base::CommandLine& command_line,
        int child_process_id,
-       content::FileDescriptorInfo* mappings) override;
+       content::PosixFileDescriptorInfo* mappings) override;
 -#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 +#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  #if defined(OS_WIN)
diff --git a/www/iridium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc b/www/iridium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc
new file mode 100644
index 000000000000..528f4509d309
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig	2017-08-01 23:43:54.195876000 +0200
++++ chrome/browser/devtools/devtools_eye_dropper.cc	2017-08-01 23:44:16.153565000 +0200
+@@ -149,7 +149,7 @@
+ // magnified projection only with centered hotspot.
+ // Mac Retina requires cursor to be > 120px in order to render smoothly.
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   const float kCursorSize = 63;
+   const float kDiameter = 63;
+   const float kHotspotOffset = 32;
diff --git a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
index f3c2b2ca59eb..6d9ed48a481d 100644
--- a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
+++ b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.cc
-@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
+@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool success,
        console_->SetColor(color);
        console_->Write(base::ASCIIToUTF16(result));
      }
diff --git a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
index f882fdc84433..3958b67b58f6 100644
--- a/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ b/www/iridium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
@@ -1,6 +1,6 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.h
-@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos
+@@ -19,7 +19,7 @@ class DiagnosticsWriter : public DiagnosticsModel::Obs
   public:
    // The type of formatting done by this writer.
    enum FormatType {
diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 472e818b082c..a7d6d5111351 100644
--- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,15 +1,15 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-12-15 02:04:08.000000000 +0100
++++ chrome/browser/download/chrome_download_manager_delegate.cc	2017-12-24 00:58:48.284663000 +0100
+@@ -882,7 +882,7 @@
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -902,7 +902,7 @@
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {
diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc
index 60d885a1b817..4533799135cf 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/download/download_commands.cc
-@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(
+--- chrome/browser/download/download_commands.cc.orig	2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_commands.cc	2018-07-14 14:30:03.853964000 +0200
+@@ -249,7 +249,7 @@
        return download_item_->GetOpenWhenComplete() ||
               download_crx_util::IsExtensionDownload(*download_item_);
      case ALWAYS_OPEN_TYPE:
@@ -8,17 +8,17 @@
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
        if (CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
-             download_item_->GetBrowserContext());
-@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Co
+             content::DownloadItemUtils::GetBrowserContext(download_item_));
+@@ -293,7 +293,7 @@
        bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
-           download_item_->GetBrowserContext());
+           content::DownloadItemUtils::GetBrowserContext(download_item_));
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
        if (CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          DownloadItemModel(download_item_)
-@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() 
+@@ -408,7 +408,7 @@
    return browser_displayer.browser();
  }
  
@@ -27,7 +27,7 @@
  bool DownloadCommands::IsDownloadPdf() const {
    base::FilePath path = download_item_->GetTargetFilePath();
    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSyste
+@@ -425,7 +425,7 @@
    return IsDownloadPdf() &&
           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                            : true);
diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h
index dc8c7f43cf0c..dbe84337d047 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h
@@ -1,12 +1,11 @@
---- chrome/browser/download/download_commands.h.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/download/download_commands.h
-@@ -43,7 +43,8 @@ class DownloadCommands {
+--- chrome/browser/download/download_commands.h.orig	2017-09-05 21:05:12.000000000 +0200
++++ chrome/browser/download/download_commands.h	2017-09-06 18:02:40.537871000 +0200
+@@ -42,7 +42,7 @@
+   bool IsCommandVisible(Command command) const;
    void ExecuteCommand(Command command);
  
- #if defined(OS_WIN) || defined(OS_LINUX) || \
--    (defined(OS_MACOSX) && !defined(OS_IOS))
-+    defined(OS_BSD) || (defined(OS_MACOSX) && \
-+    !defined(OS_IOS))
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
    bool IsDownloadPdf() const;
    bool CanOpenPdfInSystemViewer() const;
  #endif
diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
index 137a11af0adf..0ca716d8ef5a 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.cc.orig	2017-04-24 14:40:26 UTC
-+++ chrome/browser/download/download_prefs.cc
-@@ -56,7 +56,7 @@ namespace {
+--- chrome/browser/download/download_prefs.cc.orig	2017-12-15 02:04:08.000000000 +0100
++++ chrome/browser/download/download_prefs.cc	2017-12-24 01:04:45.230590000 +0100
+@@ -56,7 +56,7 @@
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
  // to the desktop on any platform.
  bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -9,8 +9,8 @@
    base::FilePath home_dir = base::GetHomeDir();
    if (download_path == home_dir) {
      return true;
-@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
-                  GetDefaultDownloadDirectoryForProfile()));
+@@ -135,7 +135,7 @@
+                                 GetDefaultDownloadDirectoryForProfile()));
  #endif  // defined(OS_CHROMEOS)
  
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
@@ -18,7 +18,7 @@
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -219,7 +219,7 @@
                                   default_download_path);
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
@@ -27,7 +27,7 @@
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  }
-@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage
+@@ -302,7 +302,7 @@
  }
  
  bool DownloadPrefs::IsAutoOpenUsed() const {
@@ -36,16 +36,16 @@
    if (ShouldOpenPdfInSystemReader())
      return true;
  #endif
-@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
+@@ -316,7 +316,7 @@
      return false;
    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
    extension.erase(0, 1);
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
-     return true;
- #endif
-@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased
+   if (base::FilePath::CompareEqualIgnoreCase(extension,
+                                              FILE_PATH_LITERAL("pdf")) &&
+       ShouldOpenPdfInSystemReader())
+@@ -353,7 +353,7 @@
    SaveAutoOpenState();
  }
  
@@ -54,7 +54,7 @@
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
      return;
-@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
+@@ -374,7 +374,7 @@
  #endif
  
  void DownloadPrefs::ResetAutoOpen() {
diff --git a/www/iridium/files/patch-chrome_browser_download_download__query.cc b/www/iridium/files/patch-chrome_browser_download_download__query.cc
index 9bc543bcb3f6..b7bc9b8160b6 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__query.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__query.cc
@@ -1,9 +1,9 @@
---- chrome/browser/download/download_query.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/download/download_query.cc
+--- chrome/browser/download/download_query.cc.orig	2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_query.cc	2018-07-15 13:01:15.987418000 +0200
 @@ -27,7 +27,11 @@
+ #include "components/download/public/common/download_item.h"
  #include "components/url_formatter/url_formatter.h"
  #include "content/public/browser/content_browser_client.h"
- #include "content/public/browser/download_item.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
@@ -11,4 +11,4 @@
 +#endif
  #include "url/gurl.h"
  
- using content::DownloadDangerType;
+ using download::DownloadDangerType;
diff --git a/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
index e06e08c55e23..d8d342fddee0 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/download/download_shelf_context_menu.cc
-@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu:
+@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
                     : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
            break;
          }
diff --git a/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc b/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc
index 63c55461db09..db4acbe84cf1 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc
@@ -1,5 +1,5 @@
---- chrome/browser/download/download_status_updater.cc.orig	2017-05-02 19:02:47 UTC
-+++ chrome/browser/download/download_status_updater.cc
+--- chrome/browser/download/download_status_updater.cc.orig	2018-06-13 00:10:05.000000000 +0200
++++ chrome/browser/download/download_status_updater.cc	2018-07-15 13:07:15.012034000 +0200
 @@ -13,7 +13,7 @@
  #include "base/memory/ptr_util.h"
  #include "build/build_config.h"
@@ -9,10 +9,10 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUp
+@@ -136,7 +136,7 @@
  #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
  void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
-     content::DownloadItem* download) {
+     download::DownloadItem* download) {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
    const views::LinuxUI* linux_ui = views::LinuxUI::instance();
diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
index e1ec5184a20c..4a083e77eb03 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,24 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/BUILD.gn
-@@ -1040,7 +1040,7 @@ static_library("extensions") {
-     sources -= [ "global_shortcut_listener_ozone.cc" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//build/linux:fontconfig" ]
- 
-     if (use_dbus) {
-@@ -1100,7 +1100,7 @@ static_library("extensions") {
-     ]
-   }
- 
--  if (is_win || (is_linux && !is_chromeos)) {
-+  if (is_win || ((is_linux || is_bsd) && !is_chromeos)) {
-     sources += [
-       "api/input_ime/input_ime_api.cc",
-       "api/input_ime/input_ime_api.h",
-@@ -1133,6 +1133,12 @@ static_library("extensions") {
+--- chrome/browser/extensions/BUILD.gn.orig	2017-12-15 02:04:08.000000000 +0100
++++ chrome/browser/extensions/BUILD.gn	2017-12-30 01:58:47.411895000 +0100
+@@ -1117,6 +1117,12 @@
      defines += [ "ENABLE_HOTWORDING" ]
    }
  
@@ -30,4 +12,4 @@
 +
    if (enable_service_discovery) {
      sources += [
-       "api/mdns/dns_sd_delegate.cc",
+       "api/mdns/mdns_api.cc",
diff --git a/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
index 7de12bcb95d0..6e77c6f548b7 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
-@@ -48,7 +48,11 @@
+@@ -50,7 +50,11 @@
  #include "extensions/common/extension.h"
  #include "extensions/common/extension_messages.h"
  #include "extensions/common/one_shot_event.h"
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
deleted file mode 100644
index ea797b94f446..000000000000
--- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
-@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDe
- }
- 
- bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
-+#if !defined(OS_FREEBSD)
-   RemovableStorageProvider::GetAllDevices(
-     base::Bind(
-       &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady,
-       this));
-+#endif
-   return true;
- }
- 
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc
new file mode 100644
index 000000000000..274b1bcda1d4
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2018-01-03 17:00:05.332673000 +0100
++++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc	2018-01-03 17:01:00.459066000 +0100
+@@ -20,6 +20,7 @@
+ 
+ void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++#if !defined(OS_BSD)
+   if (g_test_device_list.Get().get() != nullptr) {
+     base::ThreadTaskRunnerHandle::Get()->PostTask(
+         FROM_HERE,
+@@ -33,6 +34,9 @@
+        base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
+       base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
+       std::move(callback));
++#else
++  NOTIMPLEMENTED();
++#endif
+ }
+ 
+ // static
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/iridium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
deleted file mode 100644
index 03706ca1408a..000000000000
--- a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
+++ /dev/null
@@ -1,35 +0,0 @@
---- chrome/browser/extensions/api/messaging/message_service.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/api/messaging/message_service.cc
-@@ -106,7 +106,7 @@ MessageService::PolicyPermission Message
- 
- const char kReceivingEndDoesntExistError[] =
-     "Could not establish connection. Receiving end does not exist.";
--#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 kMissingPermissionError[] =
-     "Access to native messaging requires nativeMessaging permission.";
- const char kProhibitedByPoliciesError[] =
-@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNative
-   if (!source)
-     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 =
-@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNative
-   channel->opener->IncrementLazyKeepaliveCount();
- 
-   AddChannel(std::move(channel), receiver_port_id);
--#else  // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
-+#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);
--#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,
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 0dd09d42fede..70f92733e5c8 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/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	2017-05-09 19:02:41 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -277,6 +277,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
+@@ -278,6 +278,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
      info->os = extensions::api::runtime::PLATFORM_OS_CROS;
    } else if (strcmp(os, "linux") == 0) {
      info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index 9c87dd54d20a..08ad6d0318a1 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
-       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2018-03-20 23:05:17.000000000 +0100
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc	2018-03-24 13:17:26.753666000 +0100
+@@ -102,7 +102,7 @@
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
    (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
-       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
-       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
  #endif
-@@ -93,7 +93,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -112,7 +112,7 @@
    // Appearance settings.
    (*s_whitelist)[::prefs::kCurrentThemeID] =
-       settings_private::PrefType::PREF_TYPE_STRING;
+       settings_api::PrefType::PREF_TYPE_STRING;
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    (*s_whitelist)[::prefs::kUsesSystemTheme] =
-       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
  #endif
diff --git a/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
index 9a5eb095cbb4..59f781693e6f 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/bookmark_app_helper.cc
-@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallati
+@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
  #if !defined(OS_MACOSX)
  #if !defined(USE_ASH)
    web_app::ShortcutLocations creation_locations;
diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index 6c2ea783144c..a7bdd4c23fb6 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -63,7 +63,7 @@
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2018-06-13 00:10:06.000000000 +0200
++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	2018-07-15 13:15:07.666902000 +0200
+@@ -57,7 +57,7 @@
  #include "chrome/browser/chromeos/extensions/media_player_api.h"
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
- #include "chrome/browser/extensions/api/log_private/log_private_api.h"
+ #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 -#elif defined(OS_LINUX) || defined(OS_WIN)
 +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -99,7 +99,7 @@
  #if defined(OS_CHROMEOS)
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();
diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 253b102ee206..4afa130ca4a5 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2018-03-20 23:05:17.000000000 +0100
++++ chrome/browser/extensions/external_provider_impl.cc	2018-03-24 13:22:20.011401000 +0100
+@@ -689,7 +689,7 @@
          Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
          oem_extension_creation_flags));
    }
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    if (!profile->IsLegacySupervised()) {
-     provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+     provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
-@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna
+@@ -717,7 +717,7 @@
          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))
-     provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
-         service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
-                                         ExternalPrefLoader::NONE, nullptr),
+     provider_list->push_back(std::make_unique<ExternalProviderImpl>(
+         service,
+         new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
index 559e964d746f..122267faeb00 100644
--- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
@@ -1,11 +1,20 @@
---- chrome/browser/first_run/first_run_internal_posix.cc.orig	2017-04-24 14:40:29 UTC
-+++ chrome/browser/first_run/first_run_internal_posix.cc
-@@ -25,7 +25,7 @@ namespace first_run {
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig	2018-02-24 16:25:09.000000000 +0100
++++ chrome/browser/first_run/first_run_internal_posix.cc	2018-03-03 21:26:08.717035000 +0100
+@@ -34,7 +34,7 @@
  namespace internal {
+ namespace {
+ 
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+ // 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
+@@ -80,7 +80,7 @@
+ }  // namespace
  
  void DoPostImportPlatformSpecificTasks(Profile* profile) {
 -#if !defined(OS_CHROMEOS)
 +#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   base::FilePath local_state_path;
-   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
-   bool local_state_file_exists = base::PathExists(local_state_path);
+   if (!ShouldShowFirstRunDialog())
+     return;
+ 
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
new file mode 100644
index 000000000000..7d0d2e62f76c
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/flag_descriptions.cc.orig	2017-12-15 02:04:09.000000000 +0100
++++ chrome/browser/flag_descriptions.cc	2017-12-24 01:21:43.685723000 +0100
+@@ -2643,7 +2643,7 @@
+ 
+ // Random platform combinations -----------------------------------------------
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ const char kEnableInputImeApiName[] = "Enable Input IME API";
+ const char kEnableInputImeApiDescription[] =
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
new file mode 100644
index 000000000000..ad0807412561
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
@@ -0,0 +1,20 @@
+--- chrome/browser/flag_descriptions.h.orig	2017-06-05 19:03:02 UTC
++++ chrome/browser/flag_descriptions.h
+@@ -1754,7 +1754,7 @@ extern const char kForceUiDirectionLtr[];
+ // Name for the option to force right-to-left UI direction mode.
+ extern const char kForceUiDirectionRtl[];
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // Name of the flag to enable che chrome.input.ime API.
+ extern const char kEnableInputImeApiName[];
+@@ -1762,7 +1762,7 @@ extern const char kEnableInputImeApiName[];
+ // Description of the flag to enable the chrome.input.ime API.
+ extern const char kEnableInputImeApiDescription[];
+ 
+-#endif  // defined(OS_WIN) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // Enables grouping websites by domain on chrome://history.
+ extern const char kEnableGroupedHistoryName[];
diff --git a/www/iridium/files/patch-chrome_browser_gpu_gl__string__manager.cc b/www/iridium/files/patch-chrome_browser_gpu_gl__string__manager.cc
deleted file mode 100644
index 8cd5dbb55565..000000000000
--- a/www/iridium/files/patch-chrome_browser_gpu_gl__string__manager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/gpu/gl_string_manager.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/gpu/gl_string_manager.cc
-@@ -33,7 +33,7 @@ GLStringManager::~GLStringManager() {
- 
- void GLStringManager::Initialize() {
-   // On MacOSX or Windows, preliminary GPUInfo is enough.
--#if defined(OS_LINUX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-   // We never remove this observer from GpuDataManager.
-   content::GpuDataManager::GetInstance()->AddObserver(this);
- 
diff --git a/www/iridium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc b/www/iridium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
deleted file mode 100644
index 0a8e0dd378e4..000000000000
--- a/www/iridium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/interstitials/chrome_controller_client.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/interstitials/chrome_controller_client.cc
-@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre
- #if defined(OS_ANDROID)
-   chrome::android::OpenDateAndTimeSettings();
- 
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   struct ClockCommand {
-     const char* const pathname;
-     const char* const argument;
-@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControlle
- 
- bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
- #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
--    defined(OS_MACOSX) || defined(OS_WIN)
-+    defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-   return true;
- #else
-   return false;
diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
index b768a3c18f5c..f12c6abe6d66 100644
--- a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
+++ b/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	2017-04-19 19:06:29 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil
+@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
      // Note that this initializes the delegate asynchronously, but since
      // the delegate will only be used from the IO thread, it is guaranteed
      // to be created before use of it expects it to be there.
diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
index 0806713aab5b..b222bbb0bdac 100644
--- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
+++ b/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	2017-04-19 19:06:29 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFile
+@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl) {
diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc
new file mode 100644
index 000000000000..dd627d987980
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc
@@ -0,0 +1,28 @@
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig	2017-09-10 01:42:30.124986000 +0200
++++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc	2017-09-10 01:44:26.941752000 +0200
+@@ -10,6 +10,7 @@
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#include <sys/time.h>
+ 
+ #include <algorithm>
+ 
+@@ -19,7 +20,7 @@
+ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
+ #include "net/base/net_errors.h"
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include <netpacket/packet.h>
+ #else
+ #include <net/if_dl.h>
+@@ -27,7 +28,7 @@
+ 
+ namespace {
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ using sll = struct sockaddr_ll;
+ #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype)
+ #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen)
diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc
new file mode 100644
index 000000000000..0c36572dff34
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc
@@ -0,0 +1,26 @@
+--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig	2017-09-05 21:05:13.000000000 +0200
++++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc	2017-09-10 03:43:00.933828000 +0200
+@@ -9,8 +9,6 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ 
+-#include <linux/wireless.h>
+-
+ #include "base/files/scoped_file.h"
+ #include "base/logging.h"
+ #include "net/base/network_interfaces_linux.h"
+@@ -18,6 +16,7 @@
+ bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
+   DCHECK(ssid_out);
+ 
++#if !defined(OS_BSD)
+   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
+   if (!ioctl_socket.is_valid())
+     return false;
+@@ -34,5 +33,6 @@
+     ssid_out->assign(ssid);
+     return true;
+   }
++#endif
+   return false;
+ }
diff --git a/www/iridium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc b/www/iridium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc
new file mode 100644
index 000000000000..6d25ec73df5d
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc
@@ -0,0 +1,22 @@
+--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig	2018-07-21 15:25:50.187627000 +0200
++++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc	2018-07-21 15:28:47.631030000 +0200
+@@ -111,6 +111,11 @@
+     bool incognito,
+     CreateRouteCallback callback) {
+   DCHECK(!base::ContainsKey(presentations_, presentation_id));
++#if defined(OS_BSD) // XXX
++   std::move(callback).Run(base::nullopt, std::string("Not implemented"),
++                           RouteRequestResult::UNKNOWN_ERROR);
++   return;
++#else
+   base::Optional<Display> display = GetDisplayBySinkId(sink_id);
+   if (!display) {
+     std::move(callback).Run(base::nullopt, std::string("Display not found"),
+@@ -135,6 +140,7 @@
+   presentation.receiver()->Start(presentation_id, GURL(media_source));
+   std::move(callback).Run(route, base::nullopt, RouteRequestResult::OK);
+   NotifyRouteObservers();
++#endif
+ }
+ 
+ void WiredDisplayMediaRouteProvider::JoinRoute(
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc
new file mode 100644
index 000000000000..3a42fb397348
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig	2018-07-19 22:14:21.658215000 +0200
++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc	2018-07-19 22:14:37.578585000 +0200
+@@ -51,7 +51,7 @@
+ const char kProduct[] = "Chrome";
+ #elif defined(OS_MACOSX)
+ const char kProduct[] = "Chrome_Mac";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ const char kProduct[] = "Chrome_Linux";
+ #elif defined(OS_ANDROID)
+ const char kProduct[] = "Chrome_Android";
diff --git a/www/iridium/files/patch-chrome_browser_memory__details.cc b/www/iridium/files/patch-chrome_browser_memory__details.cc
index 760e08c52aed..ade22db95aa3 100644
--- a/www/iridium/files/patch-chrome_browser_memory__details.cc
+++ b/www/iridium/files/patch-chrome_browser_memory__details.cc
@@ -1,7 +1,7 @@
---- chrome/browser/memory_details.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/memory_details.cc
-@@ -35,7 +35,7 @@
- #include "extensions/features/features.h"
+--- chrome/browser/memory_details.cc.orig	2018-05-09 21:05:38.000000000 +0200
++++ chrome/browser/memory_details.cc	2018-08-16 08:40:29.413255000 +0200
+@@ -36,7 +36,7 @@
+ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
  #include "ui/base/l10n/l10n_util.h"
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ -9,7 +9,7 @@
  #include "content/public/browser/zygote_host_linux.h"
  #endif
  
-@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUI
+@@ -341,7 +341,7 @@
        process.titles.push_back(title);
      }
  
diff --git a/www/iridium/files/patch-chrome_browser_memory__details__linux.cc b/www/iridium/files/patch-chrome_browser_memory__details__linux.cc
new file mode 100644
index 000000000000..4ac38bb3b945
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_memory__details__linux.cc
@@ -0,0 +1,13 @@
+--- chrome/browser/memory_details_linux.cc.orig	2018-06-13 00:10:06.000000000 +0200
++++ chrome/browser/memory_details_linux.cc	2018-07-20 00:12:53.799188000 +0200
+@@ -70,8 +70,10 @@
+ 
+     std::unique_ptr<base::ProcessMetrics> metrics(
+         base::ProcessMetrics::CreateProcessMetrics(pid));
++#if !defined(OS_BSD)
+     pmi.num_open_fds = metrics->GetOpenFdCount();
+     pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit();
++#endif
+ 
+     process_data.processes.push_back(pmi);
+   }
diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index ddb052046e13..1723f2192dc4 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,18 +1,21 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -42,12 +42,14 @@
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2017-09-05 21:05:13.000000000 +0200
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc	2017-09-06 18:21:57.565534000 +0200
+@@ -40,7 +40,9 @@
  
  #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
  #include <gnu/libc-version.h>
 +#endif
  
 +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "base/version.h"
+ #include "base/linux_util.h"
+ #include "base/strings/string_split.h"
+ #include "base/strings/string_util.h"
+@@ -48,7 +50,7 @@
  #if defined(USE_X11)
  #include "ui/base/x/x11_util.h"
  #endif
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif
++#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"
diff --git a/www/iridium/files/patch-chrome_browser_net_async__dns__field__trial.cc b/www/iridium/files/patch-chrome_browser_net_async__dns__field__trial.cc
deleted file mode 100644
index d3bfbb0e9470..000000000000
--- a/www/iridium/files/patch-chrome_browser_net_async__dns__field__trial.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/net/async_dns_field_trial.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/net/async_dns_field_trial.cc
-@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour
- }  // namespace
- 
- bool ConfigureAsyncDnsFieldTrial() {
--#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
-+#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_BSD)
-   const bool kDefault = true;
- #else
-   const bool kDefault = false;
diff --git a/www/iridium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc b/www/iridium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
index d96e823d99d0..8ab783c9e90e 100644
--- a/www/iridium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/notifications/message_center_notification_manager.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/notifications/message_center_notification_manager.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/notifications/message_center_notification_manager.cc
-@@ -63,7 +63,7 @@ MessageCenterNotificationManager::Messag
+@@ -62,7 +62,7 @@ MessageCenterNotificationManager::MessageCenterNotific
        base::MakeUnique<FullscreenNotificationBlocker>(message_center));
  
  #if defined(OS_WIN) || defined(OS_MACOSX) \
diff --git a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index beef5efc4513..760bc7030d88 100644
--- a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,14 +1,14 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -62,7 +62,11 @@
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2017-12-15 02:04:09.000000000 +0100
++++ chrome/browser/password_manager/chrome_password_manager_client.cc	2017-12-24 01:39:48.763209000 +0100
+@@ -67,7 +67,11 @@
+ #include "google_apis/gaia/gaia_urls.h"
  #include "net/base/url_util.h"
- #include "net/http/transport_security_state.h"
- #include "net/url_request/url_request_context.h"
+ #include "services/metrics/public/cpp/ukm_recorder.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
  #include "third_party/re2/src/re2/re2.h"
 +#endif
+ #include "url/url_constants.h"
  
- #if defined(OS_ANDROID)
- #include "chrome/browser/android/tab_android.h"
+ #if defined(SAFE_BROWSING_DB_LOCAL)
diff --git a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
index 9934b64489f9..fd931902f164 100644
--- a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
+++ b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
@@ -1,9 +1,9 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig	2017-04-24 14:40:27 UTC
+--- chrome/browser/plugins/plugins_resource_service.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/plugins/plugins_resource_service.cc
-@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() {
-   std::string filename;
- #if defined(OS_WIN)
+@@ -59,7 +59,7 @@ GURL GetPluginsServerURL() {
    filename = "plugins_win.json";
+ #elif defined(OS_CHROMEOS)
+   filename = "plugins_chromeos.json";
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    filename = "plugins_linux.json";
diff --git a/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
index 1b61eb9a6382..02457cbf914e 100644
--- a/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -180,6 +180,8 @@ class PolicyTestCase {
+@@ -181,6 +181,8 @@ class PolicyTestCase {
      const std::string os("chromeos");
  #elif defined(OS_LINUX)
      const std::string os("linux");
diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
index f6752e3b9774..91f3b0a5351f 100644
--- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/process_singleton_posix.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/process_singleton_posix.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/process_singleton_posix.cc
 @@ -93,11 +93,11 @@
  #include "net/base/network_interfaces.h"
@@ -14,7 +14,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -321,7 +321,7 @@ bool DisplayProfileInUseError(const base
+@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
    if (g_disable_prompt)
      return false;
  
@@ -23,7 +23,7 @@
    base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
        IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
    return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -855,7 +855,7 @@ ProcessSingleton::NotifyResult ProcessSi
+@@ -866,7 +866,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
      // The other process is shutting down, it's safe to start a new process.
      return PROCESS_NONE;
    } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc
deleted file mode 100644
index ab79228c1947..000000000000
--- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl__io__data.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/profiles/profile_impl_io_data.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/profiles/profile_impl_io_data.cc
-@@ -103,7 +103,7 @@ net::BackendType ChooseCacheBackendType(
-   }
- #endif  // #if !defined(OS_ANDROID)
- 
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   return net::CACHE_BACKEND_SIMPLE;
- #else
-   return net::CACHE_BACKEND_BLOCKFILE;
diff --git a/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
index 139aab791594..18dfbfec1b3f 100644
--- a/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
+++ b/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	2017-04-19 19:06:29 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1390,7 +1390,7 @@ void RenderViewContextMenu::AppendEditab
+@@ -1376,7 +1376,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,
-@@ -1428,7 +1428,7 @@ void RenderViewContextMenu::AppendLangua
+@@ -1414,7 +1414,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
-@@ -1666,7 +1666,7 @@ bool RenderViewContextMenu::IsCommandIdE
+@@ -1648,7 +1648,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
      case IDC_CHECK_SPELLING_WHILE_TYPING:
        return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck);
  
diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
index e7ba7369bb9d..7f72ec7b56ee 100644
--- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/renderer_preferences_util.cc
 @@ -20,7 +20,7 @@
  #include "third_party/WebKit/public/public_features.h"
@@ -18,7 +18,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::R
+@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
      prefs->caret_blink_interval = interval.InSecondsF();
  #endif
  
@@ -27,7 +27,7 @@
    views::LinuxUI* linux_ui = views::LinuxUI::instance();
    if (linux_ui) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::R
+@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
    }
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn b/www/iridium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn
deleted file mode 100644
index bfe4f2cdde28..000000000000
--- a/www/iridium/files/patch-chrome_browser_resources_safe__browsing_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/resources/safe_browsing/BUILD.gn.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/resources/safe_browsing/BUILD.gn
-@@ -29,6 +29,8 @@ action("make_file_types_protobuf") {
-     target_arch = "mac"
-   } else if (is_linux) {
-     target_arch = "linux"
-+  } else if (is_bsd) {
-+    target_arch = "bsd"
-   } else {
-     # This will cause the script to fail.
-     target_arch = "unknown_target_arch"
diff --git a/www/iridium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/iridium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
index 45859bff41f8..d63c069e1058 100644
--- a/www/iridium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
+++ b/www/iridium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
@@ -1,4 +1,4 @@
---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
 @@ -31,6 +31,7 @@ def PlatformTypes():
      "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID,
@@ -8,7 +8,7 @@
      "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC,
      "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS,
    }
-@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(Bin
+@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera
                        'Outfile must have a %d for version and %s for platform.')
      parser.add_option('-t', '--type',
                        help='The platform type. One of android, chromeos, ' +
diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
new file mode 100644
index 000000000000..327593c0e576
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@@ -0,0 +1,29 @@
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig	2018-06-13 00:10:07.000000000 +0200
++++ chrome/browser/resources/settings/appearance_page/appearance_page.html	2018-07-15 13:34:27.093948000 +0200
+@@ -75,7 +75,7 @@
+               hidden="[[!pageVisibility.setTheme]]"
+               label="$i18n{themes}" sub-label="[[themeSublabel_]]"
+               on-click="openThemeUrl_"></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_"
+@@ -84,7 +84,7 @@
+             </paper-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_)]]"
+@@ -149,7 +149,7 @@
+             pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
+             label="$i18n{showBookmarksBar}">
+         </settings-toggle-button>
+-<if expr="is_linux and not chromeos">
++<if expr="is_posix and not chromeos">
+         <settings-toggle-button
+             class$="[[getFirst_(pageVisibility.bookmarksBar)]]"
+             pref="{{prefs.browser.custom_chrome_frame}}"
diff --git a/www/iridium/files/patch-chrome_browser_resources_vulcanize.gni b/www/iridium/files/patch-chrome_browser_resources_vulcanize.gni
deleted file mode 100644
index 13acbf11aff4..000000000000
--- a/www/iridium/files/patch-chrome_browser_resources_vulcanize.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/resources/vulcanize.gni.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/resources/vulcanize.gni
-@@ -13,7 +13,7 @@ template("node") {
-       "//third_party/node/node_modules.tar.gz.sha1",
-     ]
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       inputs += [ "//third_party/node/linux/node-linux-x64.tar.gz.sha1" ]
-     }
-     if (is_win) {
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
index 84cc4858abe8..b3a37b548402 100644
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
-@@ -720,7 +720,7 @@ void IncidentReportingService::OnEnviron
+@@ -720,7 +720,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
    environment_collection_pending_ = false;
  
  // CurrentProcessInfo::CreationTime() is missing on some platforms.
diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc
deleted file mode 100644
index 34f7084f45cf..000000000000
--- a/www/iridium/files/patch-chrome_browser_safe__browsing_permission__reporter.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/safe_browsing/permission_reporter.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/safe_browsing/permission_reporter.cc
-@@ -188,7 +188,7 @@ bool PermissionReporter::BuildReport(con
- #if defined(OS_ANDROID)
-   report.set_platform_type(PermissionReport::ANDROID_PLATFORM);
- #elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_CHROMEOS) || \
--    defined(OS_LINUX)
-+    defined(OS_LINUX) || defined(OS_BSD)
-   report.set_platform_type(PermissionReport::DESKTOP_PLATFORM);
- #else
- #error Unsupported platform.
diff --git a/www/iridium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc b/www/iridium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc
new file mode 100644
index 000000000000..7a81287db276
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig	2018-03-03 21:13:39.612526000 +0100
++++ chrome/browser/ssl/ssl_error_controller_client.cc	2018-03-03 21:14:15.298290000 +0100
+@@ -55,7 +55,7 @@
+ #if defined(OS_ANDROID)
+   chrome::android::OpenDateAndTimeSettings();
+ 
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   struct ClockCommand {
+     const char* const pathname;
+     const char* const argument;
+@@ -185,7 +185,7 @@
+ 
+ bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+-    defined(OS_WIN)
++    defined(OS_WIN) || defined(OS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index fcfd327ffbe6..1eaf4b8adca0 100644
--- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,11 +1,20 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -639,7 +639,7 @@ void ChromeSyncClient::RegisterDesktopDa
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2017-12-15 02:04:10.000000000 +0100
++++ chrome/browser/sync/chrome_sync_client.cc	2017-12-24 02:09:05.300500000 +0100
+@@ -668,7 +668,7 @@
    }
- #endif
+ #endif  // BUILDFLAG(ENABLE_APP_LIST)
  
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#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)) {
      sync_service->RegisterDataTypeController(
+@@ -676,7 +676,7 @@
+             syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI,
+             BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
+   }
+-#endif  // defined(OS_LINUX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   sync_service->RegisterDataTypeController(
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index 8d63165160d3..d39e8c05bab2 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -28,9 +28,9 @@ const int kBackgroundRefreshTypesMask =
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/browser/task_manager/sampling/task_group.cc	2018-03-03 21:46:29.318291000 +0100
+@@ -29,9 +29,9 @@
  #if defined(OS_WIN)
      REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
  #endif  // defined(OS_WIN)
@@ -9,37 +9,37 @@
      REFRESH_TYPE_FD_COUNT |
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
- #if !defined(DISABLE_NACL)
+ #if BUILDFLAG(ENABLE_NACL)
      REFRESH_TYPE_NACL |
- #endif  // !defined(DISABLE_NACL)
-@@ -102,9 +102,9 @@ TaskGroup::TaskGroup(
+ #endif  // BUILDFLAG(ENABLE_NACL)
+@@ -105,9 +105,9 @@
+ #if BUILDFLAG(ENABLE_NACL)
        nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
- #endif  // !defined(DISABLE_NACL)
-       idle_wakeups_per_second_(-1),
+ #endif  // BUILDFLAG(ENABLE_NACL)
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
        open_fd_count_(-1),
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
+       idle_wakeups_per_second_(-1),
        gpu_memory_has_duplicates_(false),
        is_backgrounded_(false),
-       weak_ptr_factory_(this) {
-@@ -117,10 +117,10 @@ TaskGroup::TaskGroup(
-                                       weak_ptr_factory_.GetWeakPtr()),
-                            base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
-                                       weak_ptr_factory_.GetWeakPtr()),
+@@ -121,10 +121,10 @@
+                    weak_ptr_factory_.GetWeakPtr()),
+         base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
+                    weak_ptr_factory_.GetWeakPtr()),
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-                            base::Bind(&TaskGroup::OnOpenFdCountRefreshDone,
-                                       weak_ptr_factory_.GetWeakPtr()),
+         base::Bind(&TaskGroup::OnOpenFdCountRefreshDone,
+                    weak_ptr_factory_.GetWeakPtr()),
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
-                            base::Bind(&TaskGroup::OnProcessPriorityDone,
-                                       weak_ptr_factory_.GetWeakPtr())));
-   worker_thread_sampler_.swap(sampler);
-@@ -333,14 +333,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone
-   OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS);
+         base::Bind(&TaskGroup::OnProcessPriorityDone,
+                    weak_ptr_factory_.GetWeakPtr()));
+ 
+@@ -284,14 +284,14 @@
  }
+ #endif  // BUILDFLAG(ENABLE_NACL)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
@@ -52,5 +52,5 @@
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
- void TaskGroup::OnProcessPriorityDone(bool is_backgrounded) {
+ void TaskGroup::OnCpuRefreshDone(double cpu_usage) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index eda8013fad37..988543e7cf6d 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,8 +1,8 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/task_manager/sampling/task_group.h
-@@ -96,9 +96,9 @@ class TaskGroup {
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/browser/task_manager/sampling/task_group.h	2018-03-03 21:51:35.928601000 +0100
+@@ -106,9 +106,9 @@
    int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
- #endif  // !defined(DISABLE_NACL)
+ #endif  // BUILDFLAG(ENABLE_NACL)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
@@ -12,28 +12,28 @@
  
    int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
  
-@@ -124,9 +124,9 @@ class TaskGroup {
- 
-   void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second);
- 
+@@ -122,9 +122,9 @@
+   void RefreshNaClDebugStubPort(int child_process_unique_id);
+   void OnRefreshNaClDebugStubPortDone(int port);
+ #endif
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    void OnOpenFdCountRefreshDone(int open_fd_count);
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
-   void OnProcessPriorityDone(bool is_backgrounded);
- 
-@@ -174,10 +174,10 @@ class TaskGroup {
+   void OnCpuRefreshDone(double cpu_usage);
+   void OnMemoryUsageRefreshDone(MemoryUsageStats memory_usage);
+@@ -184,10 +184,10 @@
+ #if BUILDFLAG(ENABLE_NACL)
    int nacl_debug_stub_port_;
- #endif  // !defined(DISABLE_NACL)
-   int idle_wakeups_per_second_;
+ #endif  // BUILDFLAG(ENABLE_NACL)
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // The number of file descriptors currently open by the process.
    int open_fd_count_;
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   int idle_wakeups_per_second_;
    bool gpu_memory_has_duplicates_;
    bool is_backgrounded_;
- 
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
index a53900a2ed69..8984c6713b5b 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.cc
 @@ -36,9 +36,9 @@ TaskGroupSampler::TaskGroupSampler(
      const OnCpuRefreshCallback& on_cpu_refresh,
@@ -24,7 +24,7 @@
        on_process_priority_callback_(on_process_priority) {
    DCHECK(blocking_pool_runner.get());
  
-@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t r
+@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          on_memory_refresh_callback_);
    }
  
@@ -33,7 +33,7 @@
    if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
                                                      refresh_flags)) {
      base::PostTaskAndReplyWithResult(
-@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t r
+@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) 
          base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
          on_idle_wakeups_callback_);
    }
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
index cfb03a01b44a..083a3bb398d3 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/task_manager/sampling/task_group_sampler.h
-@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::Re
+@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::RefCountedThread
    using OnCpuRefreshCallback = base::Callback<void(double)>;
    using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>;
    using OnIdleWakeupsCallback = base::Callback<void(int)>;
@@ -12,7 +12,7 @@
    using OnProcessPriorityCallback = base::Callback<void(bool)>;
  
    TaskGroupSampler(
-@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::Re
+@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::RefCountedThread
        const OnCpuRefreshCallback& on_cpu_refresh,
        const OnMemoryRefreshCallback& on_memory_refresh,
        const OnIdleWakeupsCallback& on_idle_wakeups,
@@ -24,7 +24,7 @@
        const OnProcessPriorityCallback& on_process_priority);
  
    // Refreshes the expensive process' stats (CPU usage, memory usage, and idle
-@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::Re
+@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::RefCountedThread
    double RefreshCpuUsage();
    MemoryUsageStats RefreshMemoryUsage();
    int RefreshIdleWakeupsPerSecond();
@@ -36,7 +36,7 @@
    bool RefreshProcessPriority();
  
    // The process that holds the handle that we own so that we can use it for
-@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::Re
+@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::RefCountedThread
    const OnCpuRefreshCallback on_cpu_refresh_callback_;
    const OnMemoryRefreshCallback on_memory_refresh_callback_;
    const OnIdleWakeupsCallback on_idle_wakeups_callback_;
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index bd8bfc45a89b..af206cbfba03 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(Tas
+@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
index ca1b6a9c876c..9b2b400f0ab8 100644
--- a/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
+++ b/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
@@ -1,11 +1,11 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig	2017-04-24 14:40:29 UTC
-+++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -157,6 +157,8 @@ void TraceCrashServiceUploader::DoUpload
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2018-05-17 22:11:49.335213830 +0200
++++ chrome/browser/tracing/crash_service_uploader.cc	2018-08-16 08:53:50.028885000 +0200
+@@ -154,6 +154,8 @@
+   const char product[] = "Chrome_Linux";
+ #elif defined(OS_ANDROID)
    const char product[] = "Chrome_Android";
- #elif defined(OS_CHROMEOS)
-   const char product[] = "Chrome_ChromeOS";
 +#elif defined(OS_FREEBSD)
 +  const char product[] = "Chrome_FreeBSD";
+ #elif defined(OS_CHROMEOS)
+   const char product[] = "Chrome_ChromeOS";
  #else
- #error Platform not supported.
- #endif
diff --git a/www/iridium/files/patch-chrome_browser_ui_BUILD.gn b/www/iridium/files/patch-chrome_browser_ui_BUILD.gn
deleted file mode 100644
index cd892fb19cd7..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/BUILD.gn.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/BUILD.gn
-@@ -3135,7 +3135,7 @@ split_static_library("ui") {
-       ]
-     }
-   }
--  if (is_linux) {  # Both desktop Linux and ChromeOS.
-+  if (is_linux || is_bsd) {  # Both desktop Linux and ChromeOS.
-     sources += [
-       "certificate_dialogs.cc",
-       "certificate_dialogs.h",
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 59c1d4f68cf5..72886af02f70 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -80,7 +80,7 @@
- #include "chrome/browser/ui/browser_commands_chromeos.h"
+--- chrome/browser/ui/browser_command_controller.cc.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/browser/ui/browser_command_controller.cc	2018-03-03 21:58:39.480640000 +0100
+@@ -83,7 +83,7 @@
+ #include "ui/base/clipboard/clipboard_types.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,30 +9,30 @@
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -190,7 +190,7 @@ bool BrowserCommandController::IsReserve
-   if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
-     return true;
+@@ -216,7 +216,7 @@
+ #endif
+   }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -395,7 +395,7 @@ void BrowserCommandController::ExecuteCo
+@@ -425,7 +425,7 @@
        break;
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     case IDC_USE_SYSTEM_TITLE_BAR: {
-       PrefService* prefs = profile()->GetPrefs();
-       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -755,7 +755,7 @@ void BrowserCommandController::InitComma
+     case IDC_MINIMIZE_WINDOW:
+       browser_->window()->Minimize();
+       break;
+@@ -853,7 +853,7 @@
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
  #endif
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true);
- #endif
- 
+   command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
+   command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
+   command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
deleted file mode 100644
index bbc50dac4910..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/browser_view_prefs.cc
-@@ -10,7 +10,7 @@
- #include "components/prefs/pref_registry_simple.h"
- #include "components/prefs/pref_service.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "ui/base/x/x11_util.h"  // nogncheck
- #endif
- 
diff --git a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h b/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
index 9061fbec5176..7422f066c1f0 100644
--- a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
+++ b/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/input_method/input_method_engine.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/input_method/input_method_engine.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/input_method/input_method_engine.h
-@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMe
+@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase
  
    // ui::IMEEngineHandlerInterface:
    bool IsActive() const override;
diff --git a/www/iridium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn b/www/iridium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn
deleted file mode 100644
index c43e4a107042..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/libgtkui/BUILD.gn.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/libgtkui/BUILD.gn
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
--assert(is_linux, "This file should only be referenced on Linux")
-+assert(is_linux || is_bsd, "This file should only be referenced on Linux")
- 
- import("//build/config/features.gni")
- import("//build/config/linux/gtk/gtk.gni")
diff --git a/www/iridium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h b/www/iridium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h
new file mode 100644
index 000000000000..6da3546262c7
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h.orig	2018-02-11 02:34:07.340548000 +0100
++++ chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h	2018-02-11 02:32:04.747163000 +0100
+@@ -31,7 +31,7 @@
+ 
+  private:
+   std::map<chrome::FrameButtonDisplayType,
+-           gfx::ImageSkia[views::Button::STATE_COUNT]>
++           std::array<gfx::ImageSkia, views::Button::STATE_COUNT>>
+       button_images_;
+   std::map<chrome::FrameButtonDisplayType, gfx::Insets> button_margins_;
+   gfx::Insets top_area_spacing_;
diff --git a/www/iridium/files/patch-chrome_browser_ui_sad_tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad_tab.cc
new file mode 100644
index 000000000000..c8895cf8be41
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_sad_tab.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/sad_tab.cc.orig	2018-03-03 21:11:09.039038000 +0100
++++ chrome/browser/ui/sad_tab.cc	2018-03-03 21:11:28.213027000 +0100
+@@ -180,7 +180,7 @@
+       // 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);
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+       // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
+       // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
+       // followed by one of the above suggestions.
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 1a55f41b305b..3bf1a0a4851c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser
+@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
      // This flag gives extensions more powers.
      extensions::switches::kExtensionsOnChromeURLs,
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 7cf4e11b87f1..2ee47ecce2c2 100644
--- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -96,7 +96,7 @@
+@@ -94,7 +94,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
@@ -9,15 +9,14 @@
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
  
-@@ -668,9 +668,11 @@ bool StartupBrowserCreator::ProcessCmdLi
+@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
    }
  #endif  // OS_CHROMEOS
  
 +#if 0 /* XXX */
  #if defined(TOOLKIT_VIEWS) && defined(USE_X11)
    ui::TouchFactory::SetTouchDeviceListFromCommandLine();
- #endif
 +#endif
+ #endif
  
  #if defined(OS_MACOSX)
-   if (web_app::MaybeRebuildShortcut(command_line))
diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
index 38719ce500bb..f5285da6dd88 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -245,7 +245,7 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -258,7 +258,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
  #endif
  
  #if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -8,4 +8,4 @@
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
    metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents);
  #endif
- // --- Feature tab helpers behind flags ---
+ 
diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index a16ae9956f24..f25adb71292a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::Ge
+@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
            ? stringifier_->backgrounded_string()
            : stringifier_->foregrounded_string();
  
@@ -16,7 +16,7 @@
  
      case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: {
        return stringifier_->GetMemoryStateText(
-@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues
+@@ -623,7 +623,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]);
-@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues
+@@ -631,7 +631,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();
-@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefres
+@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
index 699a8f7a660b..af1b89bc1dcd 100644
--- a/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/toolbar/app_menu_model.cc
-@@ -631,7 +631,7 @@ bool AppMenuModel::IsCommandIdVisible(in
+@@ -619,7 +619,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) 
      case IDC_UPGRADE_DIALOG:
        return browser_defaults::kShowUpgradeMenuItem &&
            UpgradeDetector::GetInstance()->notify_upgrade();
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index aeef0af5953d..4f00b6125a0a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/accelerator_table.cc
-@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2018-05-09 21:05:40.000000000 +0200
++++ chrome/browser/ui/views/accelerator_table.cc	2018-08-16 09:05:20.123832000 +0200
+@@ -48,7 +48,7 @@
    { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE },
    { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB },
    { ui::VKEY_NUMPAD9, kPlatformModifier, 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 },
-@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap
+@@ -78,7 +78,7 @@
    { ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 },
    { ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 },
    { ui::VKEY_NUMPAD8, kPlatformModifier, 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 },
-@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap
+@@ -123,7 +123,7 @@
  #endif  // !OS_MACOSX
  
    // Platform-specific key maps.
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index bd9f35a4601a..9e8a71c5932e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,5 +1,5 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2017-09-05 21:05:14.000000000 +0200
++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc	2017-09-06 18:35:55.806325000 +0200
 @@ -19,7 +19,7 @@
  #include "ui/gfx/image/image_skia.h"
  #include "ui/views/widget/widget.h"
@@ -9,12 +9,3 @@
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB
-     const AppWindow::CreateParams& create_params,
-     views::Widget::InitParams* init_params,
-     views::Widget* widget) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
-       app_window()->extension_id());
-   // Set up a custom WM_CLASS for app windows. This allows task switchers in
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index a121f9512615..dacfafc50635 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,23 +1,24 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -26,14 +26,14 @@
+@@ -29,7 +29,7 @@
  #include "ui/wm/core/wm_state.h"
  #endif  // defined(USE_AURA)
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "base/command_line.h"
- #include "chrome/browser/ui/simple_message_box.h"
- #include "chrome/grit/chromium_strings.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -40,7 +40,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() {
- }
-@@ -70,7 +70,7 @@ void ChromeBrowserMainExtraPartsViews::P
+ #if defined(OS_CHROMEOS)
+ #include "chrome/browser/chromeos/ash_config.h"
+@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
      IMEDriver::Register();
  #endif
  
@@ -26,7 +27,7 @@
    // On the Linux desktop, we want to prevent the user from logging in as root,
    // so that we don't destroy the profile. Now that we have some minimal ui
    // initialized, check to see if we're running as root and bail if we are.
-@@ -94,7 +94,7 @@ void ChromeBrowserMainExtraPartsViews::P
+@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
    base::RunLoop().RunUntilIdle();
  
    exit(EXIT_FAILURE);
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index 365fb2f890b0..50e92b9cc78e 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views
+@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
    HICON GetSmallWindowIcon() const override;
    int GetAppbarAutohideEdges(HMONITOR monitor,
                               const base::Closure& callback) override;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
index 5e6fab177b96..01251ed892cd 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
@@ -1,17 +1,17 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/first_run_dialog.cc
 @@ -40,8 +40,10 @@ using views::GridLayout;
  namespace {
  
  void InitCrashReporterIfEnabled(bool enabled) {
-+#ifndef OS_BSD
++#if !defined(OS_BSD)
    if (enabled)
      breakpad::InitCrashReporter(std::string());
 +#endif
  }
  
  }  // namespace
-@@ -121,8 +123,10 @@ views::View* FirstRunDialog::CreateExtra
+@@ -120,8 +122,10 @@ views::View* FirstRunDialog::CreateExtraView() {
  bool FirstRunDialog::Accept() {
    GetWidget()->Hide();
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 94c956c697e9..d70006f3cc61 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -36,11 +36,11 @@
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2017-07-25 21:04:51.000000000 +0200
++++ chrome/browser/ui/views/frame/browser_frame.cc	2017-08-02 00:17:41.951632000 +0200
+@@ -36,7 +36,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
@@ -9,12 +9,7 @@
  #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
  #endif
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
- #endif
- 
-@@ -97,7 +97,7 @@ void BrowserFrame::InitBrowserFrame() {
+@@ -97,7 +97,7 @@
      non_client_view()->set_context_menu_controller(this);
    }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc
new file mode 100644
index 000000000000..c264949e1cb9
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig	2018-03-03 21:07:27.595112000 +0100
++++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc	2018-03-03 21:07:57.689186000 +0100
+@@ -18,7 +18,7 @@
+ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 288c9c90f96e..7c36498cc1d5 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 @@ -38,7 +38,7 @@
  #include "ui/views/window/frame_background.h"
@@ -9,7 +9,7 @@
  #include "ui/views/controls/menu/menu_runner.h"
  #endif
  
-@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPress
+@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
  void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
                                                   const gfx::Point& point,
                                                   const ui::Event* event) {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
index 3e5cb4ffc39e..0080daddd87a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
-@@ -20,7 +20,7 @@ namespace {
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2018-05-09 21:05:40.000000000 +0200
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc	2018-08-16 09:13:39.899230000 +0200
+@@ -20,7 +20,7 @@
  
  const int kCaptionButtonHeight = 18;
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
  // Default extra space between the top of the frame and the top of the window
  // caption buttons.
  const int kExtraCaption = 2;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
index 55ae538f3522..fa3b1692a1fc 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
-@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci
+@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy
    return false;
  }
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index c7bdf78d105f..5af3208d620a 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystem
+@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
      model->AddSeparator(ui::NORMAL_SEPARATOR);
      model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
    }
@@ -9,7 +9,7 @@
    model->AddSeparator(ui::NORMAL_SEPARATOR);
    model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
                                    IDS_SHOW_WINDOW_DECORATIONS_MENU);
-@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystem
+@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
      model->AddSeparator(ui::NORMAL_SEPARATOR);
      model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
    }
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index e13e94089ec8..df7ddf468159 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/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	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
 @@ -13,7 +13,7 @@
  #include "components/sessions/core/tab_restore_service.h"
@@ -9,7 +9,7 @@
  #include "chrome/common/pref_names.h"
  #include "components/prefs/pref_service.h"
  #endif
-@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuMode
+@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {
  }
  
  bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
deleted file mode 100644
index 906206b93202..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc
-@@ -15,7 +15,7 @@
- namespace message_center {
- 
- MessageCenterFrameView::MessageCenterFrameView() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   const int kBorderWidth = 1;
-   SetBorder(views::CreateSolidBorder(
-       kBorderWidth, message_center::kMessageCenterBorderColor));
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
new file mode 100644
index 000000000000..fd6a9e1d46ce
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/profiles/avatar_button.cc.orig	2018-06-13 00:10:08.000000000 +0200
++++ chrome/browser/ui/views/profiles/avatar_button.cc	2018-07-18 22:53:21.770071000 +0200
+@@ -250,7 +250,7 @@
+   } else if (apply_ink_drop) {
+     SetInkDropMode(InkDropMode::ON);
+     SetFocusPainter(nullptr);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     set_ink_drop_base_color(SK_ColorWHITE);
+     SetBorder(std::make_unique<AvatarButtonThemedBorder>());
+     generic_avatar_ =
+@@ -544,7 +544,7 @@
+ #endif
+ }
+ bool AvatarButton::ShouldApplyInkDrop() const {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   DCHECK_EQ(AvatarButtonStyle::THEMED, button_style_);
+   return true;
+ #elif defined(OS_MACOSX)
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc
new file mode 100644
index 000000000000..ada559317302
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig	2017-09-10 00:35:35.638045000 +0200
++++ chrome/browser/ui/views/tabs/new_tab_button.cc	2017-09-10 00:36:04.851309000 +0200
+@@ -49,7 +49,7 @@
+       destroyed_(nullptr),
+       new_tab_promo_observer_(this) {
+   set_animate_on_state_change(true);
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   set_triggerable_event_flags(triggerable_event_flags() |
+                               ui::EF_MIDDLE_MOUSE_BUTTON);
+ #endif
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index a7c9b7d262b8..dea233ae2fbd 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,24 +1,24 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -251,7 +251,7 @@ void TabDragController::Init(
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2017-12-15 02:04:11.000000000 +0100
++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc	2017-12-24 02:45:43.317955000 +0100
+@@ -261,7 +261,7 @@
    //     synchronous on desktop Linux, so use that.
-   // - Ash
+   // - Chrome OS
    //     Releasing capture on Ash cancels gestures so avoid it.
--#if defined(OS_LINUX) || defined(USE_ASH)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_ASH)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -597,7 +597,7 @@ TabDragController::DragBrowserToNewTabSt
+@@ -599,7 +599,7 @@
      else
        target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
  
--#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) || 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.
-@@ -1787,7 +1787,7 @@ TabDragController::Liveness TabDragContr
+@@ -1792,7 +1792,7 @@
      if (dragged_window)
        exclude.insert(dragged_window);
    }
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
deleted file mode 100644
index f682195e002b..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -323,7 +323,7 @@ NewTabButton::NewTabButton(TabStrip* tab
-       tab_strip_(tab_strip),
-       destroyed_(NULL) {
-   set_animate_on_state_change(true);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   set_triggerable_event_flags(triggerable_event_flags() |
-                               ui::EF_MIDDLE_MOUSE_BUTTON);
- #endif
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
index 812135525c57..84bae6590480 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,15 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/about_ui.cc
-@@ -76,7 +76,7 @@
- #include "chrome/browser/ui/webui/theme_source.h"
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "content/public/browser/zygote_host_linux.h"
- #include "content/public/common/sandbox_linux.h"
- #endif
-@@ -644,7 +644,7 @@ class AboutDnsHandler : public base::Ref
+--- chrome/browser/ui/webui/about_ui.cc.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/browser/ui/webui/about_ui.cc	2018-03-03 22:12:29.265266000 +0100
+@@ -390,7 +390,7 @@
    DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler);
  };
  
@@ -18,39 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -660,6 +660,7 @@ std::string AboutLinuxProxyConfig() {
-   return data;
- }
- 
-+#if !defined(OS_BSD)
- void AboutSandboxRow(std::string* data, int name_id, bool good) {
-   data->append("<tr><td>");
-   data->append(l10n_util::GetStringUTF8(name_id));
-@@ -674,6 +675,7 @@ void AboutSandboxRow(std::string* data, 
-   }
-   data->append("</td></tr>");
- }
-+#endif
- 
- std::string AboutSandbox() {
-   std::string data;
-@@ -683,6 +685,7 @@ std::string AboutSandbox() {
-   data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
-   data.append("</h1>");
- 
-+#if !defined(OS_BSD)
-   // Get expected sandboxing status of renderers.
-   const int status =
-       content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
-@@ -723,6 +726,7 @@ std::string AboutSandbox() {
-     data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_BAD));
-   }
-   data.append("</p>");
-+#endif
- 
-   AppendFooter(&data);
-   return data;
-@@ -794,7 +798,7 @@ void AboutUIHTMLSource::StartDataRequest
+@@ -448,7 +448,7 @@
    } else if (source_name_ == chrome::kChromeUIDNSHost) {
      AboutDnsHandler::Start(profile(), callback);
      return;
@@ -59,12 +18,3 @@
    } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
      response = AboutLinuxProxyConfig();
  #endif
-@@ -803,7 +807,7 @@ void AboutUIHTMLSource::StartDataRequest
-     ChromeOSCreditsHandler::Start(path, callback);
-     return;
- #endif
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   } else if (source_name_ == chrome::kChromeUISandboxHost) {
-     response = AboutSandbox();
- #endif
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 248120d25908..ae36578a9e02 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,20 +1,49 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -290,7 +290,7 @@ bool IsAboutUI(const GURL& url) {
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2018-03-03 22:18:39.234352000 +0100
+@@ -176,11 +176,11 @@
+ #include "chrome/browser/ui/webui/welcome_win10_ui.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/ui/webui/discards/discards_ui.h"
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
+ #endif
+ 
+@@ -285,7 +285,7 @@
  #if !defined(OS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost ||
-           url.host_piece() == chrome::kChromeUISandboxHost
+           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
-@@ -567,7 +567,7 @@ WebUIFactoryFunction GetWebUIFactoryFunc
+ #if defined(OS_CHROMEOS)
+@@ -524,7 +524,7 @@
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
 -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) {
++#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD)
+   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
      return &NewWebUI<ConstrainedWebDialogUI>;
+ #endif
+@@ -585,12 +585,12 @@
+     return &NewWebUI<CastUI>;
    }
+ #endif
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   if (url.host_piece() == chrome::kChromeUISandboxHost) {
+     return &NewWebUI<SandboxInternalsUI>;
+   }
+ #endif
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   if (url.host_piece() == chrome::kChromeUIDiscardsHost)
+     return &NewWebUI<DiscardsUI>;
+ #endif
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_extensions_extension_loader_handler.cc
index a1510e6881e5..27dca799655c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_extensions_extension_loader_handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc
-@@ -28,7 +28,11 @@
+--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2018-08-16 13:00:53.692954000 +0200
++++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc	2018-08-16 13:01:28.004036000 +0200
+@@ -30,7 +30,11 @@
  #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
  #include "extensions/common/manifest_constants.h"
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
deleted file mode 100644
index dbd7f1e8dc29..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc
-@@ -608,13 +608,13 @@ void BrowserOptionsHandler::GetLocalized
-     { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
- #endif  // defined(OS_CHROMEOS)
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-     { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
-     { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
-     { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
- #else
-     { "themes", IDS_THEMES_GROUP_NAME },
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
- 
- #if defined(OS_CHROMEOS) && defined(USE_ASH)
-     { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
-@@ -859,7 +859,7 @@ void BrowserOptionsHandler::RegisterMess
-       "requestProfilesInfo",
-       base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
-                  base::Unretained(this)));
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   web_ui()->RegisterMessageCallback(
-       "themesSetNative",
-       base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1519,7 +1519,7 @@ void BrowserOptionsHandler::ObserveTheme
-   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
-   bool is_system_theme = false;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   bool profile_is_supervised = profile->IsSupervised();
-   is_system_theme = theme_service->UsingSystemTheme();
-   base::Value native_theme_enabled(!is_system_theme && !profile_is_supervised);
-@@ -1540,7 +1540,7 @@ void BrowserOptionsHandler::ThemesReset(
-   ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
- void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
-   content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
-   Profile* profile = Profile::FromWebUI(web_ui());
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
deleted file mode 100644
index 4187f58bb992..000000000000
--- a/www/iridium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/options/browser_options_handler.h
-@@ -210,7 +210,7 @@ class BrowserOptionsHandler
- 
-   void ObserveThemeChanged();
-   void ThemesReset(const base::ListValue* args);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   void ThemesSetNative(const base::ListValue* args);
- #endif
- 
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
index d8d7f6adfb1d..03e3af1d34b1 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2018-06-13 00:10:09.000000000 +0200
++++ chrome/browser/ui/webui/settings/appearance_handler.cc	2018-07-18 23:00:36.362422000 +0200
+@@ -31,7 +31,7 @@
        "useDefaultTheme",
-       base::Bind(&AppearanceHandler::HandleUseDefaultTheme,
-                  base::Unretained(this)));
+       base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
+                           base::Unretained(this)));
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
    web_ui()->RegisterMessageCallback(
        "useSystemTheme",
-       base::Bind(&AppearanceHandler::HandleUseSystemTheme,
-@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefault
+       base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
+@@ -59,7 +59,7 @@
    ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
  }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
  void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
    if (profile_->IsSupervised())
      NOTREACHED();
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
index 06229fdc6666..5fa324448a86 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/webui/settings/appearance_handler.h
-@@ -35,7 +35,7 @@ class AppearanceHandler : public Setting
+@@ -35,7 +35,7 @@ class AppearanceHandler : public SettingsPageUIHandler
    // Changes the UI theme of the browser to the default theme.
    void HandleUseDefaultTheme(const base::ListValue* args);
  
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
index 0f7a628925f4..7c2bf66a735f 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -301,7 +301,7 @@ void AddAppearanceStrings(content::WebUI
-     {"appearancePageTitle", IDS_SETTINGS_APPEARANCE},
-     {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM},
+@@ -332,7 +332,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},
-@@ -321,7 +321,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -350,7 +350,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
      {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
      {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
  #endif
@@ -17,4 +17,4 @@
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
      {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
-   };
+ #if defined(OS_MACOSX)
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app.cc b/www/iridium/files/patch-chrome_browser_web__applications_web__app.cc
index 8d6d2298ecda..8b92939d0ac9 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_web__app.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/web_app.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/web_applications/web_app.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/web_applications/web_app.cc
 @@ -58,7 +58,7 @@ namespace {
  #if defined(OS_MACOSX)
@@ -9,7 +9,7 @@
  // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
  // that "Minimally you should install a 48x48 icon in the hicolor theme."
  const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
-@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationIn
+@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info,
  }
  #endif
  
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app.h b/www/iridium/files/patch-chrome_browser_web__applications_web__app.h
index 0a869662de98..d389a6909393 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_web__app.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app.h
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/browser/web_applications/web_app.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/browser/web_applications/web_app.h
-@@ -208,7 +208,7 @@ typedef std::vector<WebApplicationInfo::
+@@ -206,7 +206,7 @@ typedef std::vector<WebApplicationInfo::IconInfo> Icon
  void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
  #endif
  
diff --git a/www/iridium/files/patch-chrome_chrome__paks.gni b/www/iridium/files/patch-chrome_chrome__paks.gni
deleted file mode 100644
index 849ca493aad9..000000000000
--- a/www/iridium/files/patch-chrome_chrome__paks.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/chrome_paks.gni.orig	2017-05-09 19:02:43 UTC
-+++ chrome/chrome_paks.gni
-@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
-         "//ui/file_manager:resources",
-       ]
-     }
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
-       deps += [ "//headless:resources" ]
-     }
diff --git a/www/iridium/files/patch-chrome_common_BUILD.gn b/www/iridium/files/patch-chrome_common_BUILD.gn
index c892161413b0..39edb2bf620e 100644
--- a/www/iridium/files/patch-chrome_common_BUILD.gn
+++ b/www/iridium/files/patch-chrome_common_BUILD.gn
@@ -1,14 +1,11 @@
---- chrome/common/BUILD.gn.orig	2017-04-24 14:40:28 UTC
-+++ chrome/common/BUILD.gn
-@@ -240,6 +240,13 @@ static_library("common") {
+--- chrome/common/BUILD.gn.orig	2017-12-15 02:04:11.000000000 +0100
++++ chrome/common/BUILD.gn	2017-12-30 02:27:17.872477000 +0100
+@@ -287,6 +287,10 @@
      public_deps += [ "//ppapi/shared_impl" ]
    }
  
 +  if (is_bsd) {
-+    sources -= [
-+      "component_flash_hint_file_linux.cc",
-+      "component_flash_hint_file_linux.h"
-+    ]
++    sources -= [ "component_flash_hint_file_linux.cc" ]
 +  }
 +
    if (enable_extensions) {
diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc
new file mode 100644
index 000000000000..0b5aa8a4517b
--- /dev/null
+++ b/www/iridium/files/patch-chrome_common_chrome__features.cc
@@ -0,0 +1,20 @@
+--- chrome/common/chrome_features.cc.orig	2018-05-09 21:05:40.000000000 +0200
++++ chrome/common/chrome_features.cc	2018-08-16 09:19:27.702090000 +0200
+@@ -85,7 +85,7 @@
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif  // defined(OS_WIN) || defined(OS_MACOSX)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ // Enables the Restart background mode optimization. When all Chrome UI is
+ // closed and it goes in the background, allows to restart the browser to
+ // discard memory.
+@@ -142,7 +142,7 @@
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif
+ 
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
+ // Enables the dual certificate verification trial feature.
+ // https://crbug.com/649026
+ const base::Feature kCertDualVerificationTrialFeature{
diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h
new file mode 100644
index 000000000000..4ea85fb9074f
--- /dev/null
+++ b/www/iridium/files/patch-chrome_common_chrome__features.h
@@ -0,0 +1,20 @@
+--- chrome/common/chrome_features.h.orig	2018-05-09 21:05:40.000000000 +0200
++++ chrome/common/chrome_features.h	2018-08-16 09:26:45.525295000 +0200
+@@ -52,7 +52,7 @@
+ extern const base::Feature kAutomaticTabDiscarding;
+ #endif  // defined(OS_WIN) || defined(OS_MACOSX)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ extern const base::Feature kBackgroundModeAllowRestart;
+ #endif  // defined(OS_WIN) || defined(OS_LINUX)
+ 
+@@ -76,7 +76,7 @@
+ extern const base::Feature kTabStripKeyboardFocus;
+ #endif  // defined(OS_MACOSX)
+ 
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
+ extern const base::Feature kCertDualVerificationTrialFeature;
+ #endif
+ 
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc
index a28c7707e790..922b47f40b5a 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,23 @@
---- chrome/common/chrome_paths.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/common/chrome_paths.cc
-@@ -190,7 +190,7 @@ bool PathProvider(int key, base::FilePat
+--- chrome/common/chrome_paths.cc.orig	2017-06-15 21:03:02.000000000 +0200
++++ chrome/common/chrome_paths.cc	2017-06-18 01:09:20.663411000 +0200
+@@ -51,14 +51,14 @@
+ const base::FilePath::CharType kInternalNaClPluginFileName[] =
+     FILE_PATH_LITERAL("internal-nacl-plugin");
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // 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");
+ #else
+-    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
++    FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
+ #endif  // defined(GOOGLE_CHROME_BUILD)
+ 
+ // The path to the hint file that tells the pepper plugin loader
+@@ -190,7 +190,7 @@
          return false;
        break;
      case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -9,7 +26,16 @@
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat
+@@ -426,7 +426,7 @@
+       break;
+ #endif
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
+       if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur))
+         return false;
+@@ -474,10 +474,12 @@
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
@@ -23,7 +49,25 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
-@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat
+@@ -485,7 +487,7 @@
+     }
+ #endif
+ #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
+-    defined(OS_MACOSX)
++    defined(OS_MACOSX) || defined(OS_BSD)
+     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
+       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
+         return false;
+@@ -493,7 +495,7 @@
+       break;
+     }
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
+       cur = base::FilePath(kFilepathSinglePrefExtensions);
+       break;
+@@ -528,7 +530,7 @@
  #endif
        break;
  
@@ -32,7 +76,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if defined(OS_MACOSX)
  #if defined(GOOGLE_CHROME_BUILD)
-@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat
+@@ -542,6 +544,9 @@
  #if defined(GOOGLE_CHROME_BUILD)
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/opt/chrome/native-messaging-hosts"));
@@ -42,7 +86,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/chromium/native-messaging-hosts"));
-@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat
+@@ -554,7 +559,7 @@
          return false;
        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
        break;
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
index 982b4f1a3de1..dc9e1f064244 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/common/chrome_paths_internal.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/chrome_paths_internal.h
-@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::F
+@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
  // Get the path to the user's documents directory.
  bool GetUserDocumentsDirectory(base::FilePath* result);
  
diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc
index 9c68debdfcc9..5519c40a725b 100644
--- a/www/iridium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc
@@ -1,11 +1,17 @@
---- chrome/common/chrome_switches.cc.orig	2017-04-19 19:06:30 UTC
-+++ chrome/common/chrome_switches.cc
-@@ -1138,7 +1138,7 @@ const char kAllowNaClSocketAPI[]        
+--- chrome/common/chrome_switches.cc.orig	2018-02-24 16:25:10.000000000 +0100
++++ chrome/common/chrome_switches.cc	2018-03-03 22:30:18.421438000 +0100
+@@ -998,12 +998,12 @@
  const char kEnableWaylandServer[] = "enable-wayland-server";
  #endif
  
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- extern const char kDisableInputImeAPI[] = "disable-input-ime-api";
- extern const char kEnableInputImeAPI[] = "enable-input-ime-api";
+ 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
+ 
diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h
index 83825f90af2c..961a639ccdeb 100644
--- a/www/iridium/files/patch-chrome_common_chrome__switches.h
+++ b/www/iridium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2017-04-19 19:06:30 UTC
-+++ chrome/common/chrome_switches.h
-@@ -351,7 +351,7 @@ extern const char kAllowNaClSocketAPI[];
+--- chrome/common/chrome_switches.h.orig	2017-12-24 03:11:35.192869000 +0100
++++ chrome/common/chrome_switches.h	2017-12-24 03:12:02.641567000 +0100
+@@ -313,12 +313,12 @@
  extern const char kEnableWaylandServer[];
  #endif
  
@@ -9,3 +9,9 @@
  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[];
+ #endif
+ 
diff --git a/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn b/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn
index d721ddc239d9..3cea587cc338 100644
--- a/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn
+++ b/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/extensions/api/BUILD.gn.orig	2017-05-02 19:02:48 UTC
+--- chrome/common/extensions/api/BUILD.gn.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/extensions/api/BUILD.gn
-@@ -116,7 +116,7 @@ if (is_chromeos) {
+@@ -121,7 +121,7 @@ if (is_chromeos) {
      "wallpaper.json",
      "wallpaper_private.json",
    ]
diff --git a/www/iridium/files/patch-chrome_common_extensions_chrome__extensions__client.cc b/www/iridium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
index e3ba4bad483b..a432dae92139 100644
--- a/www/iridium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
+++ b/www/iridium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
@@ -1,7 +1,7 @@
---- chrome/common/extensions/chrome_extensions_client.cc.orig	2017-04-24 14:40:29 UTC
+--- chrome/common/extensions/chrome_extensions_client.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/extensions/chrome_extensions_client.cc
-@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann
- static base::LazyInstance<ChromeExtensionsClient> g_client =
+@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram
+ static base::LazyInstance<ChromeExtensionsClient>::DestructorAtExit g_client =
      LAZY_INSTANCE_INITIALIZER;
  
 -ChromeExtensionsClient::ChromeExtensionsClient() {}
diff --git a/www/iridium/files/patch-chrome_common_extensions_command.cc b/www/iridium/files/patch-chrome_common_extensions_command.cc
index 90c4ceb93a7d..c9917cc7722e 100644
--- a/www/iridium/files/patch-chrome_common_extensions_command.cc
+++ b/www/iridium/files/patch-chrome_common_extensions_command.cc
@@ -1,6 +1,6 @@
---- chrome/common/extensions/command.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/common/extensions/command.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/extensions/command.cc
-@@ -302,7 +302,7 @@ std::string Command::CommandPlatform() {
+@@ -303,7 +303,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
  #elif defined(OS_CHROMEOS)
    return values::kKeybindingPlatformChromeOs;
diff --git a/www/iridium/files/patch-chrome_common_features.gni b/www/iridium/files/patch-chrome_common_features.gni
index 714d870e1646..cc70d4ab4afb 100644
--- a/www/iridium/files/patch-chrome_common_features.gni
+++ b/www/iridium/files/patch-chrome_common_features.gni
@@ -1,11 +1,20 @@
---- chrome/common/features.gni.orig	2017-04-19 19:06:30 UTC
-+++ chrome/common/features.gni
-@@ -40,7 +40,7 @@ declare_args() {
-   enable_hotwording = is_chrome_branded && is_chromeos
+--- chrome/common/features.gni.orig	2017-09-05 21:05:14.000000000 +0200
++++ chrome/common/features.gni	2017-09-07 15:11:34.649303000 +0200
+@@ -46,7 +46,7 @@
+       is_android || is_mac || (is_desktop_linux && use_dbus)
  
    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)
  
-   # Set to true to bundle all the mash related mojo services into chrome.
+   # Indicates if Exo should use ozone gamepad. If this is false, exo will use
+   # /device/gamepad as backend.
+@@ -60,7 +60,7 @@
    # Specify --mash to chrome to have chrome start the mash environment.
+   enable_package_mash_services = is_chromeos
+ 
+-  enable_service_discovery = enable_mdns || is_mac
++  enable_service_discovery = enable_mdns || is_mac || is_bsd
+ 
+   # Enables use of the session service, which is enabled by default.
+   # Android stores them separately on the Java side.
diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc
index f1f034751677..e27126942772 100644
--- a/www/iridium/files/patch-chrome_common_pref__names.cc
+++ b/www/iridium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig	2017-04-19 19:06:30 UTC
+--- chrome/common/pref_names.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/pref_names.cc
-@@ -1013,7 +1013,7 @@ const char kForceSessionSync[] = "settin
+@@ -1009,7 +1009,7 @@ const char kForceSessionSync[] = "settings.history_rec
  // 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
-@@ -1100,7 +1100,7 @@ const char kShowUpdatePromotionInfoBar[]
+@@ -1096,7 +1096,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";
-@@ -1476,7 +1476,7 @@ const char kDownloadDefaultDirectory[] =
+@@ -1475,7 +1475,7 @@ const char kDownloadDefaultDirectory[] = "download.def
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h
index 584e5bfc2ec1..41399039b875 100644
--- a/www/iridium/files/patch-chrome_common_pref__names.h
+++ b/www/iridium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig	2017-04-19 19:06:30 UTC
+--- chrome/common/pref_names.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/common/pref_names.h
-@@ -340,7 +340,7 @@ extern const char kForceGoogleSafeSearch
+@@ -337,7 +337,7 @@ extern const char kForceGoogleSafeSearch[];
  extern const char kForceYouTubeRestrict[];
  extern const char kForceSessionSync[];
  extern const char kAllowedDomainsForApps[];
@@ -9,7 +9,7 @@
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -373,7 +373,7 @@ extern const char kDefaultBrowserSetting
+@@ -370,7 +370,7 @@ extern const char kDefaultBrowserSettingEnabled[];
  #if defined(OS_MACOSX)
  extern const char kShowUpdatePromotionInfoBar[];
  #endif
@@ -18,7 +18,7 @@
  extern const char kUseCustomChromeFrame[];
  #endif
  extern const char kBackShortcutBubbleShownCount[];
-@@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[];
+@@ -529,7 +529,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];
diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc
deleted file mode 100644
index 3ccea6a67f7e..000000000000
--- a/www/iridium/files/patch-chrome_common_url__constants.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/common/url_constants.cc.orig	2017-04-24 14:40:29 UTC
-+++ chrome/common/url_constants.cc
-@@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[] 
- const char kChromeUIMetroFlowURL[] = "chrome://make-metro/";
- #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 kChromeUITabModalConfirmDialogURL[] =
-     "chrome://tab-modal-confirm-dialog/";
- #endif
-@@ -337,7 +337,7 @@ const char kChromeOSAssetPath[] = "/usr/
- const char kChromeUIMetroFlowHost[] = "make-metro";
- #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
- 
diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h
deleted file mode 100644
index 69d2b1f590a9..000000000000
--- a/www/iridium/files/patch-chrome_common_url__constants.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/common/url_constants.h.orig	2017-04-19 19:06:30 UTC
-+++ chrome/common/url_constants.h
-@@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting
- extern const char kChromeUIMetroFlowURL[];
- #endif
- 
--#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
- extern const char kChromeUITabModalConfirmDialogURL[];
- #endif
- 
-@@ -314,7 +314,7 @@ extern const char kChromeOSAssetPath[];
- extern const char kChromeUIMetroFlowHost[];
- #endif
- 
--#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
-+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
- extern const char kChromeUITabModalConfirmDialogHost[];
- #endif
- 
diff --git a/www/iridium/files/patch-chrome_common_webui_url_constants.cc b/www/iridium/files/patch-chrome_common_webui_url_constants.cc
new file mode 100644
index 000000000000..505c4d7f922b
--- /dev/null
+++ b/www/iridium/files/patch-chrome_common_webui_url_constants.cc
@@ -0,0 +1,41 @@
+--- chrome/common/webui_url_constants.cc.orig	2018-02-24 16:25:11.000000000 +0100
++++ chrome/common/webui_url_constants.cc	2018-03-03 22:39:51.818055000 +0100
+@@ -226,7 +226,7 @@
+ const char kChromeUICastURL[] = "chrome://cast/";
+ #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 char kChromeUIDiscardsHost[] = "discards";
+ const char kChromeUIDiscardsURL[] = "chrome://discards/";
+ #endif
+@@ -235,11 +235,11 @@
+ const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ const char kChromeUISandboxHost[] = "sandbox";
+ #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
+ 
+@@ -380,13 +380,13 @@
+     kChromeUIInternetConfigDialogHost,
+     kChromeUIInternetDetailDialogHost,
+ #endif
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+     kChromeUIDiscardsHost,
+ #endif
+ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+     kChromeUILinuxProxyConfigHost,
+ #endif
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+     kChromeUISandboxHost,
+ #endif
+ #if defined(OS_WIN)
diff --git a/www/iridium/files/patch-chrome_common_webui_url_constants.h b/www/iridium/files/patch-chrome_common_webui_url_constants.h
new file mode 100644
index 000000000000..e53b479f7301
--- /dev/null
+++ b/www/iridium/files/patch-chrome_common_webui_url_constants.h
@@ -0,0 +1,25 @@
+--- chrome/common/webui_url_constants.h.orig	2018-02-24 16:25:11.000000000 +0100
++++ chrome/common/webui_url_constants.h	2018-03-03 22:40:56.113062000 +0100
+@@ -223,7 +223,7 @@
+ extern const char kChromeUICastURL[];
+ #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 char kChromeUIDiscardsHost[];
+ extern const char kChromeUIDiscardsURL[];
+ #endif
+@@ -232,11 +232,11 @@
+ 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_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+ extern const char kChromeUITabModalConfirmDialogHost[];
+ #endif
+ 
diff --git a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
index 09dadf16e5ee..4f930773b716 100644
--- a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
+++ b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
@@ -1,4 +1,4 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2017-04-19 19:06:31 UTC
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2017-06-05 19:03:03 UTC
 +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
 @@ -14,7 +14,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
@@ -9,7 +9,7 @@
  #include "content/public/child/child_process_sandbox_support_linux.h"
  #include "content/public/common/common_sandbox_support_linux.h"
  #elif defined(OS_WIN)
-@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFont
+@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost(
      const ppapi::proxy::SerializedFontDescription& description,
      PP_PrivateFontCharset charset)
      : ResourceHost(host->GetPpapiHost(), instance, resource) {
@@ -18,7 +18,7 @@
    fd_.reset(content::MatchFontWithFallback(
        description.face,
        description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFont
+@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost(
    sk_sp<SkFontMgr> font_mgr(SkFontMgr::RefDefault());
    typeface_ = sk_sp<SkTypeface>(
        font_mgr->matchFamilyStyle(description.face.c_str(), style));
@@ -27,7 +27,7 @@
  }
  
  PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontDat
+@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab
                                            void* buffer,
                                            size_t* length) {
    bool result = false;
diff --git a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
index 84489c5207cb..3c3263e4f493 100644
--- a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
+++ b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
@@ -1,4 +1,4 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2017-04-19 19:06:31 UTC
+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2017-06-05 19:03:03 UTC
 +++ chrome/renderer/pepper/pepper_flash_font_file_host.h
 @@ -14,7 +14,7 @@
  #include "ppapi/c/private/pp_private_font_charset.h"
@@ -9,7 +9,7 @@
  #include "base/files/scoped_file.h"
  #elif defined(OS_WIN)
  #include "third_party/skia/include/core/SkRefCnt.h"
-@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p
+@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re
                           uint32_t table);
    bool GetFontData(uint32_t table, void* buffer, size_t* length);
  
diff --git a/www/iridium/files/patch-chrome_service_cloud__print_print__system.cc b/www/iridium/files/patch-chrome_service_cloud__print_print__system.cc
new file mode 100644
index 000000000000..36fa0854ce05
--- /dev/null
+++ b/www/iridium/files/patch-chrome_service_cloud__print_print__system.cc
@@ -0,0 +1,11 @@
+--- chrome/service/cloud_print/print_system.cc.orig	2018-03-24 13:33:28.414570000 +0100
++++ chrome/service/cloud_print/print_system.cc	2018-03-24 13:31:35.144592000 +0100
+@@ -36,7 +36,7 @@
+   return base::GenerateGUID();
+ }
+ 
+-#if defined(OS_LINUX) && !defined(USE_CUPS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS)
+ scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
+     const base::DictionaryValue*) {
+   return nullptr;
diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn
deleted file mode 100644
index 1cea5919557d..000000000000
--- a/www/iridium/files/patch-chrome_test_BUILD.gn
+++ /dev/null
@@ -1,167 +0,0 @@
---- chrome/test/BUILD.gn.orig	2017-04-19 19:06:31 UTC
-+++ chrome/test/BUILD.gn
-@@ -190,7 +190,7 @@ static_library("test_support") {
-     ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     public_deps += [ "//crypto:platform" ]
-   }
-   if (is_mac) {
-@@ -455,7 +455,7 @@ if (!is_android) {
-       "$root_out_dir/test_page.css.mock-http-headers",
-       "$root_out_dir/ui_test.pak",
-     ]
--    if (is_linux || is_win) {
-+    if (is_linux || is_bsd || is_win) {
-       data += [
-         "$root_out_dir/chrome_100_percent.pak",
-         "$root_out_dir/chrome_200_percent.pak",
-@@ -464,7 +464,7 @@ if (!is_android) {
-         "$root_out_dir/resources.pak",
-       ]
-     }
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       data += [ "$root_out_dir/libppapi_tests.so" ]
-     }
- 
-@@ -584,7 +584,7 @@ if (!is_android) {
-           "../browser/ui/views/payments/payment_sheet_view_controller_interactive_uitest.cc",
-         ]
-       }
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         if (!is_chromeos) {
-           # Desktop linux.
-           sources -= [
-@@ -2048,14 +2048,14 @@ test("browser_tests") {
-         sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
-         deps += [ "//chrome/browser/chromeos" ]
-         data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
--      } else if (is_linux || is_win) {
-+      } else if (is_linux || is_bsd || is_win) {
-         sources += [
-           "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc",
-           "../browser/ui/views/ime/ime_window_browsertest.cc",
-         ]
-       }
- 
--      if (is_win || is_linux) {
-+      if (is_win || is_linux || is_bsd) {
-         sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
-         data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
-       }
-@@ -2067,7 +2067,7 @@ test("browser_tests") {
-         configs +=
-             [ "//build/config/win:default_large_module_incremental_linking" ]
-       }
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         data_deps += [ "//components/nacl/loader:nacl_helper" ]
- 
-         if (enable_nacl_nonsfi) {
-@@ -2186,7 +2186,7 @@ test("browser_tests") {
-       }
-     }
- 
--    if (is_linux && !is_component_build) {
-+    if ((is_linux || is_bsd) && !is_component_build) {
-       # Set rpath to find the CDM adapter even in a non-component build.
-       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-     }
-@@ -2412,7 +2412,7 @@ test("browser_tests") {
-       if (toolkit_views) {
-         sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
-       }
--      if (is_win || is_linux) {
-+      if (is_win || is_linux || is_bsd) {
-         sources +=
-             [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
-       }
-@@ -2594,7 +2594,7 @@ test("browser_tests") {
-         "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
-       ]
-     }
--    if (is_mac || is_win || (is_linux && !is_chromeos)) {
-+    if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) {
-       sources += [
-         # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
-         "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
-@@ -2772,7 +2772,7 @@ if (!is_android) {
-       "//testing/xvfb.py",
-     ]
- 
--    if (is_linux || is_win) {
-+    if (is_linux || is_bsd || is_win) {
-       data += [
-         "$root_out_dir/chrome_100_percent.pak",
-         "$root_out_dir/chrome_200_percent.pak",
-@@ -3471,7 +3471,7 @@ test("unit_tests") {
-       "$root_out_dir/resources.pak",
-     ]
-   }
--  if (is_linux || is_win) {
-+  if (is_linux || is_bsd || is_win) {
-     data += [ "$root_out_dir/chrome_200_percent.pak" ]
-   }
-   if (is_win) {
-@@ -4198,7 +4198,7 @@ test("unit_tests") {
-       "//ui/wm",
-     ]
-   }
--  if (!is_chromeos && is_linux) {
-+  if (!is_chromeos && (is_linux || is_bsd)) {
-     sources += [
-       "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
-       "../browser/shell_integration_linux_unittest.cc",
-@@ -4218,7 +4218,7 @@ test("unit_tests") {
-   if (use_gio) {
-     deps += [ "//build/linux/libgio" ]
-   }
--  if (!is_chromeos && !use_ozone && is_linux) {
-+  if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) {
-     deps += [ "//chrome/browser/ui/libgtkui" ]
-   }
- 
-@@ -4487,18 +4487,18 @@ test("unit_tests") {
-       "//components/os_crypt:gnome_keyring_direct",
-     ]
-   }
--  if (is_linux && !is_chromeos && !use_ozone) {
-+  if ((is_linux || is_bsd) && !is_chromeos && !use_ozone) {
-     sources +=
-         [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
-     deps += [ "//third_party/libsecret" ]
-   }
--  if (is_linux && use_aura) {
-+  if ((is_linux || is_bsd) && use_aura) {
-     deps += [ "//ui/aura:test_support" ]
-     if (use_dbus) {
-       deps += [ "//dbus:test_support" ]
-     }
-   }
--  if (is_linux && is_chrome_branded && current_cpu == "x86") {
-+  if ((is_linux || is_bsd)  && is_chrome_branded && current_cpu == "x86") {
-     ldflags = [ "-Wl,--strip-debug" ]
-   }
-   if (is_mac) {
-@@ -4996,7 +4996,7 @@ if (safe_browsing_mode == 1 && is_mac) {
-   }
- }
- 
--if (!is_android) {
-+if (!is_android && !is_bsd) {
-   # TODO(609855): Make this compile on Android and run on the bots.
-   test("chrome_app_unittests") {
-     sources = [
-@@ -5021,7 +5021,7 @@ if (!is_android) {
-   }
- }
- 
--if (!is_android && !is_chromecast) {
-+if (!is_android && !is_chromecast && !is_bsd) {
-   test("performance_browser_tests") {
-     sources = [
-       "../app/chrome_version.rc.version",
diff --git a/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc
index 96e89ff7edbd..f30e23f290e1 100644
--- a/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc
+++ b/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	2017-04-19 19:06:31 UTC
+--- chrome/test/base/in_process_browser_test.cc.orig	2017-06-05 19:03:04 UTC
 +++ chrome/test/base/in_process_browser_test.cc
-@@ -94,6 +94,10 @@
+@@ -95,6 +95,10 @@
  
  namespace {
  
diff --git a/www/iridium/files/patch-chrome_test_base_testing__browser__process.h b/www/iridium/files/patch-chrome_test_base_testing__browser__process.h
index f52d16386a76..2e6fb6456520 100644
--- a/www/iridium/files/patch-chrome_test_base_testing__browser__process.h
+++ b/www/iridium/files/patch-chrome_test_base_testing__browser__process.h
@@ -1,6 +1,6 @@
---- chrome/test/base/testing_browser_process.h.orig	2017-04-19 19:06:31 UTC
+--- chrome/test/base/testing_browser_process.h.orig	2017-06-05 19:03:04 UTC
 +++ chrome/test/base/testing_browser_process.h
-@@ -108,8 +108,8 @@ class TestingBrowserProcess : public Bro
+@@ -108,8 +108,8 @@ class TestingBrowserProcess : public BrowserProcess {
    DownloadStatusUpdater* download_status_updater() override;
    DownloadRequestLimiter* download_request_limiter() override;
  
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
index c329a059d171..2024e02bc187 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2017-04-19 19:06:31 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2017-06-05 19:03:04 UTC
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base
+@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
    }
  }
@@ -9,7 +9,7 @@
  void GetApplicationDirs(std::vector<base::FilePath>* locations) {
    locations->push_back(base::FilePath("/opt/google/chrome"));
    locations->push_back(base::FilePath("/usr/local/bin"));
-@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_
+@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_exe) {
  #elif defined(OS_MACOSX)
        base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
        base::FilePath("Chromium.app/Contents/MacOS/Chromium")
diff --git a/www/iridium/files/patch-chromecast_BUILD.gn b/www/iridium/files/patch-chromecast_BUILD.gn
deleted file mode 100644
index ac7833384bbf..000000000000
--- a/www/iridium/files/patch-chromecast_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromecast/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/BUILD.gn
-@@ -55,7 +55,7 @@ cast_test_group("cast_tests") {
-     }
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     tests += [ "//chromecast/crash:cast_crash_unittests" ]
-   }
- 
diff --git a/www/iridium/files/patch-chromecast_browser_BUILD.gn b/www/iridium/files/patch-chromecast_browser_BUILD.gn
deleted file mode 100644
index 0012a2ea80a2..000000000000
--- a/www/iridium/files/patch-chromecast_browser_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromecast/browser/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/browser/BUILD.gn
-@@ -125,7 +125,7 @@ source_set("browser") {
-     "//ui/gl",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "cast_content_window_linux.cc",
-       "cast_content_window_linux.h",
diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
deleted file mode 100644
index 55f4ba2235e4..000000000000
--- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -70,7 +70,7 @@
- #include <signal.h>
- #include <sys/prctl.h>
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <fontconfig/fontconfig.h>
- #endif
- 
-@@ -229,7 +229,7 @@ DefaultCommandLineSwitch g_default_switc
- #if BUILDFLAG(IS_CAST_AUDIO_ONLY)
-   { switches::kDisableGpu, "" },
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #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.
-@@ -371,7 +371,7 @@ void CastBrowserMainParts::PostMainMessa
- }
- 
- void CastBrowserMainParts::ToolkitInitialized() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Without this call, the FontConfig library gets implicitly initialized
-   // on the first call to FontConfig. Since it's not safe to initialize it
-   // concurrently from multiple threads, we explicitly initialize it here
diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
index 49ab11392642..84de5e3e12af 100644
--- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,9 +1,9 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/browser/cast_content_browser_client.cc
-@@ -298,7 +298,7 @@ void CastContentBrowserClient::AppendExt
-       command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback);
-   }
- 
+--- chromecast/browser/cast_content_browser_client.cc.orig	2018-06-13 00:10:12.000000000 +0200
++++ chromecast/browser/cast_content_browser_client.cc	2018-07-18 23:13:48.741141000 +0200
+@@ -416,7 +416,7 @@
+                                           switches::kAudioOutputChannels));
+     }
+   } else if (process_type == switches::kGpuProcess) {
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // Necessary for accelerated 2d canvas.  By default on Linux, Chromium assumes
diff --git a/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn
deleted file mode 100644
index 367e3f1ef63a..000000000000
--- a/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromecast/browser/metrics/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/browser/metrics/BUILD.gn
-@@ -26,7 +26,7 @@ source_set("metrics") {
-     "//content/public/common",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "external_metrics.cc",
-       "external_metrics.h",
diff --git a/www/iridium/files/patch-chromecast_crash_BUILD.gn b/www/iridium/files/patch-chromecast_crash_BUILD.gn
deleted file mode 100644
index 875145c37e4d..000000000000
--- a/www/iridium/files/patch-chromecast_crash_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromecast/crash/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ chromecast/crash/BUILD.gn
-@@ -78,7 +78,7 @@ source_set("test_support") {
-   ]
- }
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   test("cast_crash_unittests") {
-     sources = [
-       "cast_crashdump_uploader_unittest.cc",
diff --git a/www/iridium/files/patch-components_BUILD.gn b/www/iridium/files/patch-components_BUILD.gn
deleted file mode 100644
index 96ed75ab4434..000000000000
--- a/www/iridium/files/patch-components_BUILD.gn
+++ /dev/null
@@ -1,13 +0,0 @@
---- components/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ components/BUILD.gn
-@@ -177,8 +177,8 @@ test("components_unittests") {
-       "//components/certificate_reporting:unit_tests",
-       "//components/certificate_transparency:unit_tests",
-       "//components/contextual_search:unit_tests",
--      "//components/crash/content/app:unit_tests",
--      "//components/crash/core/common:unit_tests",
-+      #"//components/crash/content/app:unit_tests",
-+      #"//components/crash/core/common:unit_tests",
-       "//components/data_reduction_proxy/content/browser:unit_tests",
-       "//components/data_reduction_proxy/core/browser:unit_tests",
-       "//components/data_reduction_proxy/core/common:unit_tests",
diff --git a/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
index b666b919c799..d79dbf78cc48 100644
--- a/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
+++ b/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
@@ -1,9 +1,9 @@
---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2017-04-19 19:06:32 UTC
-+++ components/autofill/content/renderer/password_form_conversion_utils.cc
-@@ -28,7 +28,11 @@
- #include "third_party/WebKit/public/web/WebFormControlElement.h"
- #include "third_party/WebKit/public/web/WebFrame.h"
- #include "third_party/WebKit/public/web/WebInputElement.h"
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2018-05-09 21:05:44.000000000 +0200
++++ components/autofill/content/renderer/password_form_conversion_utils.cc	2018-08-16 09:39:51.905373000 +0200
+@@ -34,7 +34,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"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
index b6df6559536f..be73f8b9e594 100644
--- a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
+++ b/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/autofill_experiments.cc.orig	2017-04-19 19:06:32 UTC
+--- components/autofill/core/browser/autofill_experiments.cc.orig	2017-06-05 19:03:05 UTC
 +++ components/autofill/core/browser/autofill_experiments.cc
-@@ -151,7 +151,7 @@ unsigned int GetPopupMargin() {
+@@ -153,7 +153,7 @@ unsigned int GetPopupMargin() {
  }
  
  bool OfferStoreUnmaskedCards() {
diff --git a/www/iridium/files/patch-components_autofill_strings.grdp b/www/iridium/files/patch-components_autofill_strings.grdp
new file mode 100644
index 000000000000..dfa15d2463b4
--- /dev/null
+++ b/www/iridium/files/patch-components_autofill_strings.grdp
@@ -0,0 +1,20 @@
+--- components/autofill_strings.grdp.orig	2018-05-09 21:05:44.000000000 +0200
++++ components/autofill_strings.grdp	2018-08-16 09:49:40.897088000 +0200
+@@ -198,7 +198,7 @@
+       Do you want Chromium to save this card?
+     </message>
+   </if>
+-  <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?
+@@ -216,7 +216,7 @@
+   <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION" desc="Explanation of the effect of 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.">
+     Pay quickly on sites and apps across devices using cards you have saved with Google.
+   </message>
+-  <if expr="is_linux and not chromeos">
++  <if expr="is_posix and not chromeos">
+     <then>
+       <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_UPLOAD_EXPLANATION_V2" desc="Explanation of the effect of the Autofill save card prompt when the card is to be saved by uploading it to Google Payments, according to June 2017 UI guidelines. The prompt will be shown in a bubble below the omnibox.">
+         To pay faster next time, save this card to your Google Account.
diff --git a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
index 6dc37c2a184c..15ee00c3da11 100644
--- a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
+++ b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
@@ -1,12 +1,11 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig	2017-04-19 19:06:32 UTC
-+++ components/content_settings/core/browser/website_settings_registry.cc
-@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin
-   // doesn't allow the settings to be managed in the same way. See
-   // crbug.com/642184.
-   sync_status = WebsiteSettingsInfo::UNSYNCABLE;
-+#elif defined(OS_BSD)
-+  if (!(platform & PLATFORM_BSD))
-+    return nullptr;
- #else
- #error "Unsupported platform"
- #endif
+--- components/content_settings/core/browser/website_settings_registry.cc.orig	2017-09-05 21:05:17.000000000 +0200
++++ components/content_settings/core/browser/website_settings_registry.cc	2017-09-10 01:16:20.683275000 +0200
+@@ -70,7 +70,7 @@
+ #if defined(OS_WIN)
+   if (!(platform & PLATFORM_WINDOWS))
+     return nullptr;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   if (!(platform & PLATFORM_LINUX))
+     return nullptr;
+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
diff --git a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.h b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.h
deleted file mode 100644
index de95fbaa82de..000000000000
--- a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- components/content_settings/core/browser/website_settings_registry.h.orig	2017-04-19 19:06:32 UTC
-+++ components/content_settings/core/browser/website_settings_registry.h
-@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry {
-     PLATFORM_MAC = 1 << 3,
-     PLATFORM_ANDROID = 1 << 4,
-     PLATFORM_IOS = 1 << 5,
-+    PLATFORM_BSD = 1 << 6,
- 
-     // Settings only applied to win, mac, linux and chromeos.
-     DESKTOP =
--        PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC,
-+        PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC | PLATFORM_BSD,
- 
-     // Settings applied to all platforms, including win, mac, linux, chromeos,
-     // android, ios.
diff --git a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
index 3aaab8566da5..b27a8e2d3590 100644
--- a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
+++ b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc
@@ -1,4 +1,4 @@
---- components/cookie_config/cookie_store_util.cc.orig	2017-04-19 19:06:32 UTC
+--- components/cookie_config/cookie_store_util.cc.orig	2017-06-05 19:03:05 UTC
 +++ components/cookie_config/cookie_store_util.cc
 @@ -11,7 +11,7 @@
  
@@ -9,7 +9,7 @@
  namespace {
  
  // Use the operating system's mechanisms to encrypt cookies before writing
-@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat
+@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor
  net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
    return g_cookie_crypto_delegate.Pointer();
  }
diff --git a/www/iridium/files/patch-components_crash_content_app_BUILD.gn b/www/iridium/files/patch-components_crash_content_app_BUILD.gn
index a292bd40b6df..c1fdab0f9c7e 100644
--- a/www/iridium/files/patch-components_crash_content_app_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_content_app_BUILD.gn
@@ -1,11 +1,19 @@
---- components/crash/content/app/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ components/crash/content/app/BUILD.gn
-@@ -153,7 +153,7 @@ source_set("app_non_mac_win") {
-       "//breakpad:breakpad_handler",
+--- components/crash/content/app/BUILD.gn.orig	2018-06-13 00:10:13.000000000 +0200
++++ components/crash/content/app/BUILD.gn	2018-07-18 23:31:26.635837000 +0200
+@@ -36,7 +36,7 @@
+     sources += [ "crashpad.cc" ]
+   }
+ 
+-  if (is_android || is_linux) {
++  if (is_android || is_linux && !is_bsd) {
+     # Want these files on both Linux and Android.
+     set_sources_assignment_filter([])
+     sources += [
+@@ -73,7 +73,6 @@
+       "//content/public/common:content_descriptors",
+       "//content/public/common:result_codes",
        "//sandbox",
+-      "//third_party/breakpad:client",
      ]
--  } else if (is_posix && !is_ios) {
-+  } else if (is_posix && !is_ios && !is_bsd) {
-     deps += [ "//breakpad:client" ]
-   }
- }
+ 
+     # Clang's -mstackrealign doesn't work well with
diff --git a/www/iridium/files/patch-components_crash_content_app_crashpad.cc b/www/iridium/files/patch-components_crash_content_app_crashpad.cc
new file mode 100644
index 000000000000..2fb251a44e96
--- /dev/null
+++ b/www/iridium/files/patch-components_crash_content_app_crashpad.cc
@@ -0,0 +1,43 @@
+--- components/crash/content/app/crashpad.cc.orig	2018-08-01 00:08:38.000000000 +0200
++++ components/crash/content/app/crashpad.cc	2018-08-05 12:57:33.862455000 +0200
+@@ -101,6 +101,12 @@
+                             const std::string& user_data_dir,
+                             const base::FilePath& exe_path,
+                             bool embedded_handler) {
++
++#if defined(OS_BSD)
++  NOTIMPLEMENTED();
++  return;
++#endif
++
+   static bool initialized = false;
+   DCHECK(!initialized);
+   initialized = true;
+@@ -119,7 +125,7 @@
+     // as processed by the backend.
+     DCHECK(browser_process || process_type == "Chrome Installer" ||
+            process_type == "notification-helper");
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+     DCHECK(browser_process);
+ #else
+ #error Port.
+@@ -184,7 +190,7 @@
+   // 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;
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   const bool should_initialize_database_and_set_upload_policy = browser_process;
+ #endif
+   if (should_initialize_database_and_set_upload_policy) {
+@@ -253,7 +259,9 @@
+ }
+ 
+ void DumpWithoutCrashing() {
++#if !defined(OS_BSD)
+   CRASHPAD_SIMULATE_CRASH();
++#endif
+ }
+ 
+ void GetReports(std::vector<Report>* reports) {
diff --git a/www/iridium/files/patch-components_crash_content_browser_BUILD.gn b/www/iridium/files/patch-components_crash_content_browser_BUILD.gn
index dcdecb6d24b2..99ff4da3a8fe 100644
--- a/www/iridium/files/patch-components_crash_content_browser_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_content_browser_BUILD.gn
@@ -1,21 +1,23 @@
---- components/crash/content/browser/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ components/crash/content/browser/BUILD.gn
-@@ -16,7 +16,7 @@ source_set("browser") {
- 
-   deps = [
-     "//base",
--    "//breakpad:client",
-+    #"//breakpad:client",
+--- components/crash/content/browser/BUILD.gn.orig	2018-06-13 00:10:13.000000000 +0200
++++ components/crash/content/browser/BUILD.gn	2018-07-18 23:37:00.046473000 +0200
+@@ -24,10 +24,9 @@
      "//components/crash/content/app",
      "//content/public/browser",
      "//content/public/common",
-@@ -39,7 +39,7 @@ source_set("browser") {
+-    "//third_party/breakpad:client",
+   ]
+ 
+-  if (is_linux || is_android) {
++  if ((is_linux && !is_bsd) || is_android) {
+     set_sources_assignment_filter([])
+ 
+     # Want this file on both Linux and Android.
+@@ -43,7 +42,7 @@
+ 
    # This is not in the GYP build but this target includes breakpad client
    # headers, so add the dependency here.
-   if (is_posix && !is_ios) {
--    configs += [ "//breakpad:client_config" ]
--    public_configs = [ "//breakpad:client_config" ]
-+    #configs += [ "//breakpad:client_config" ]
-+    #public_configs = [ "//breakpad:client_config" ]
+-  if ((is_posix && !is_ios) || is_fuchsia) {
++  if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) {
+     configs += [ "//third_party/breakpad:client_config" ]
+     public_configs = [ "//third_party/breakpad:client_config" ]
    }
- }
diff --git a/www/iridium/files/patch-components_crash_core_common_BUILD.gn b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
new file mode 100644
index 000000000000..76e8026f1942
--- /dev/null
+++ b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
@@ -0,0 +1,28 @@
+--- components/crash/core/common/BUILD.gn.orig	2018-08-01 00:08:38.000000000 +0200
++++ components/crash/core/common/BUILD.gn	2018-08-05 12:52:29.173813000 +0200
+@@ -6,7 +6,7 @@
+ 
+ declare_args() {
+   # If set to true, this will stub out and disable the entire crash key system.
+-  use_crash_key_stubs = is_fuchsia
++  use_crash_key_stubs = is_fuchsia || is_bsd
+ }
+ 
+ group("common") {
+@@ -88,7 +88,6 @@
+       ]
+     }
+ 
+-    deps += [ "//third_party/breakpad:client" ]
+   }
+ }
+ 
+@@ -143,7 +142,7 @@
+     sources += [ "objc_zombie_unittest.mm" ]
+   }
+ 
+-  if (!is_mac && !is_win && !is_fuchsia) {
++  if (!is_mac && !is_win && !is_fuchsia && !is_bsd) {
+     include_dirs = [ "//third_party/breakpad/breakpad/src/" ]
+     sources += [ "crash_key_breakpad_unittest.cc" ]
+   }
diff --git a/www/iridium/files/patch-components_download_quarantine_quarantine_linux.cc b/www/iridium/files/patch-components_download_quarantine_quarantine_linux.cc
new file mode 100644
index 000000000000..a9ad97c67ce8
--- /dev/null
+++ b/www/iridium/files/patch-components_download_quarantine_quarantine_linux.cc
@@ -0,0 +1,49 @@
+--- components/download/quarantine/quarantine_linux.cc.orig	2018-07-19 22:21:43.332341000 +0200
++++ components/download/quarantine/quarantine_linux.cc	2018-07-19 22:24:04.361819000 +0200
+@@ -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/files/file_util.h"
+@@ -29,17 +33,20 @@
+                               size_t value_size,
+                               int flags) {
+   base::AssertBlockingAllowed();
++#if !defined(OS_BSD)
+   int result = setxattr(path, name, value, value_size, flags);
+   if (result) {
+     DPLOG(ERROR) << "Could not set extended attribute " << name << " on file "
+                  << path;
+     return false;
+   }
++#endif
+   return true;
+ }
+ 
+ std::string GetExtendedFileAttribute(const char* path, const char* name) {
+   base::AssertBlockingAllowed();
++#if !defined(OS_BSD)
+   ssize_t len = getxattr(path, name, nullptr, 0);
+   if (len <= 0)
+     return std::string();
+@@ -49,6 +56,9 @@
+   if (len < static_cast<ssize_t>(buffer.size()))
+     return std::string();
+   return std::string(buffer.begin(), buffer.end());
++#else
++  return std::string();
++#endif
+ }
+ 
+ }  // namespace
diff --git a/www/iridium/files/patch-components_feature_engagement_public_event_constants.cc b/www/iridium/files/patch-components_feature_engagement_public_event_constants.cc
new file mode 100644
index 000000000000..7128d32a0722
--- /dev/null
+++ b/www/iridium/files/patch-components_feature_engagement_public_event_constants.cc
@@ -0,0 +1,14 @@
+--- components/feature_engagement/public/event_constants.cc.orig	2017-12-24 11:50:13.400967000 +0100
++++ components/feature_engagement/public/event_constants.cc	2017-12-24 11:50:56.302146000 +0100
+@@ -24,9 +24,9 @@
+ 
+ #endif  // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || 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)
+ 
+ #if defined(OS_IOS)
+ const char kChromeOpened[] = "chrome_opened";
diff --git a/www/iridium/files/patch-components_feature_engagement_public_event_constants.h b/www/iridium/files/patch-components_feature_engagement_public_event_constants.h
new file mode 100644
index 000000000000..d39d1a593ae8
--- /dev/null
+++ b/www/iridium/files/patch-components_feature_engagement_public_event_constants.h
@@ -0,0 +1,20 @@
+--- components/feature_engagement/public/event_constants.h.orig	2017-12-24 11:50:25.527960000 +0100
++++ components/feature_engagement/public/event_constants.h	2017-12-24 11:51:24.453190000 +0100
+@@ -42,7 +42,7 @@
+ extern const char kIncognitoWindowSessionTimeMet[];
+ #endif  // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP)
+ 
+-#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.
+@@ -50,7 +50,7 @@
+ // 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)
+ 
+ #if defined(OS_IOS)
+ // The user has opened Chrome (cold start or from background).
diff --git a/www/iridium/files/patch-components_feedback_anonymizer__tool.cc b/www/iridium/files/patch-components_feedback_anonymizer__tool.cc
index 2fc696bdca66..59a7c5ffad92 100644
--- a/www/iridium/files/patch-components_feedback_anonymizer__tool.cc
+++ b/www/iridium/files/patch-components_feedback_anonymizer__tool.cc
@@ -1,9 +1,9 @@
---- components/feedback/anonymizer_tool.cc.orig	2017-04-19 19:06:32 UTC
-+++ components/feedback/anonymizer_tool.cc
-@@ -10,7 +10,11 @@
- #include "base/strings/string_number_conversions.h"
+--- components/feedback/anonymizer_tool.cc.orig	2018-03-20 23:05:22.000000000 +0100
++++ components/feedback/anonymizer_tool.cc	2018-03-24 13:39:35.199314000 +0100
+@@ -11,7 +11,11 @@
  #include "base/strings/string_util.h"
  #include "base/strings/stringprintf.h"
+ #include "content/public/browser/browser_thread.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-components_flags__ui_flags__state.cc b/www/iridium/files/patch-components_flags__ui_flags__state.cc
index 92b0f5ba8d2a..ad57ac48b3b6 100644
--- a/www/iridium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/iridium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig	2017-04-19 19:06:32 UTC
+--- components/flags_ui/flags_state.cc.orig	2017-06-05 19:03:05 UTC
 +++ components/flags_ui/flags_state.cc
-@@ -566,7 +566,7 @@ int FlagsState::GetCurrentPlatform() {
+@@ -567,7 +567,7 @@ int FlagsState::GetCurrentPlatform() {
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;
diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__client.h b/www/iridium/files/patch-components_gcm__driver_gcm__client.h
index e05ba84a6f97..776b370d5cb0 100644
--- a/www/iridium/files/patch-components_gcm__driver_gcm__client.h
+++ b/www/iridium/files/patch-components_gcm__driver_gcm__client.h
@@ -1,10 +1,10 @@
---- components/gcm_driver/gcm_client.h.orig	2017-04-19 19:06:32 UTC
-+++ components/gcm_driver/gcm_client.h
-@@ -82,6 +82,7 @@ class GCMClient {
+--- components/gcm_driver/gcm_client.h.orig	2018-06-13 00:10:13.000000000 +0200
++++ components/gcm_driver/gcm_client.h	2018-07-18 23:49:52.697459000 +0200
+@@ -82,6 +82,7 @@
      PLATFORM_CROS,
      PLATFORM_IOS,
      PLATFORM_ANDROID,
 +    PLATFORM_BSD,
-     PLATFORM_UNKNOWN
+     PLATFORM_UNSPECIFIED
    };
  
diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
index 3c9641eb52c0..14405d76b15a 100644
--- a/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
+++ b/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc
@@ -1,12 +1,12 @@
---- components/gcm_driver/gcm_client_impl.cc.orig	2017-04-19 19:06:32 UTC
-+++ components/gcm_driver/gcm_client_impl.cc
-@@ -136,6 +136,9 @@ void ToCheckinProtoVersion(
+--- components/gcm_driver/gcm_client_impl.cc.orig	2018-06-13 00:10:13.000000000 +0200
++++ components/gcm_driver/gcm_client_impl.cc	2018-07-18 23:56:44.202609000 +0200
+@@ -152,6 +152,9 @@
      case GCMClient::PLATFORM_CROS:
        platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS;
        break;
-+    case GCMClient::PLATFORM_BSD: // TODO what the hell are those?
++    case GCMClient::PLATFORM_BSD:
 +      platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX;
 +      break;
-     case GCMClient::PLATFORM_UNKNOWN:
+     case GCMClient::PLATFORM_UNSPECIFIED:
        // For unknown platform, return as LINUX.
        platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX;
diff --git a/www/iridium/files/patch-components_metrics_BUILD.gn b/www/iridium/files/patch-components_metrics_BUILD.gn
index 281a7cf34871..e15d4f2f9a23 100644
--- a/www/iridium/files/patch-components_metrics_BUILD.gn
+++ b/www/iridium/files/patch-components_metrics_BUILD.gn
@@ -1,34 +1,14 @@
---- components/metrics/BUILD.gn.orig	2017-04-19 19:06:32 UTC
-+++ components/metrics/BUILD.gn
-@@ -118,6 +118,13 @@ static_library("metrics") {
-   if (is_win) {
-     sources -= [ "machine_id_provider_stub.cc" ]
+--- components/metrics/BUILD.gn.orig	2017-12-15 02:04:14.000000000 +0100
++++ components/metrics/BUILD.gn	2017-12-30 02:31:51.554746000 +0100
+@@ -137,6 +137,11 @@
+   if (is_fuchsia) {
+     sources += [ "drive_metrics_provider_fuchsia.cc" ]
    }
 +  
 +  if (is_bsd) {
-+    sources -= [
-+      "system_memory_stats_recorder_linux.cc"
-+    ]
++    sources -= [ "system_memory_stats_recorder_linux.cc" ]
 +  }
 +
  }
  
- if (!is_ios) {
-@@ -295,7 +302,7 @@ static_library("test_support") {
-   ]
- }
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   static_library("serialization") {
-     sources = [
-       "serialization/metric_sample.cc",
-@@ -358,7 +365,7 @@ source_set("unit_tests") {
-     "//ui/gfx/geometry",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [ "serialization/serialization_utils_unittest.cc" ]
-     deps += [ ":serialization" ]
-   }
+ # The component metrics provider is a separate target because it depends upon
diff --git a/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
index ec3f1524a5c3..db5d92f1d6f8 100644
--- a/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
+++ b/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	2017-04-19 19:06:32 UTC
+--- components/metrics/system_memory_stats_recorder_linux.cc.orig	2017-06-05 19:03:05 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(RecordMemoryStats
+@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
        break;
      }
    }
diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js
index 1b394b548d70..74a71cf2e786 100644
--- a/www/iridium/files/patch-components_neterror_resources_neterror.js
+++ b/www/iridium/files/patch-components_neterror_resources_neterror.js
@@ -1,6 +1,6 @@
---- components/neterror/resources/neterror.js.orig	2017-04-19 19:06:32 UTC
+--- components/neterror/resources/neterror.js.orig	2017-06-05 19:03:06 UTC
 +++ components/neterror/resources/neterror.js
-@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings
+@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings) {
  }
  
  var primaryControlOnLeft = true;
diff --git a/www/iridium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc b/www/iridium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc
new file mode 100644
index 000000000000..d59b65ddc883
--- /dev/null
+++ b/www/iridium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc
@@ -0,0 +1,11 @@
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig	2017-12-24 12:05:09.663658000 +0100
++++ components/network_session_configurator/browser/network_session_configurator.cc	2017-12-24 12:05:50.949666000 +0100
+@@ -460,7 +460,7 @@
+   }
+ #endif  // #if !defined(OS_ANDROID)
+ 
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
+ #else
+   return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE;
diff --git a/www/iridium/files/patch-components_new_or_sad_tab_strings.grdp b/www/iridium/files/patch-components_new_or_sad_tab_strings.grdp
new file mode 100644
index 000000000000..9568626c9cb4
--- /dev/null
+++ b/www/iridium/files/patch-components_new_or_sad_tab_strings.grdp
@@ -0,0 +1,38 @@
+--- components/new_or_sad_tab_strings.grdp.orig	2017-12-15 02:04:14.000000000 +0100
++++ components/new_or_sad_tab_strings.grdp	2017-12-24 11:49:23.903168000 +0100
+@@ -48,7 +48,7 @@
+           Open page in a new Incognito window (⇧⌘N)
+         </message>
+       </if>
+-      <if expr="is_win or is_linux or chromeos">
++      <if expr="is_win or is_posix or chromeos">
+         <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>
+@@ -63,7 +63,7 @@
+           Close other tabs or apps
+         </message>
+       </if>
+-      <if expr="is_linux and not chromeos">
++      <if expr="is_posix and not chromeos">
+         <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>
+@@ -73,7 +73,7 @@
+           Close other apps
+         </message>
+       </if>
+-      <if expr="is_linux and not chromeos">
++      <if expr="is_posix and not chromeos">
+         <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>
+@@ -88,7 +88,7 @@
+           Restart Chromium
+         </message>
+       </if>
+-      <if expr="is_win or is_linux or is_macosx or chromeos">
++      <if expr="is_win or is_posix or is_macosx or chromeos">
+         <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer.">
+           Restart your computer
+         </message>
diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt.h b/www/iridium/files/patch-components_os__crypt_os__crypt.h
index 5eb2565dc001..95fb43e24e2e 100644
--- a/www/iridium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/iridium/files/patch-components_os__crypt_os__crypt.h
@@ -1,20 +1,47 @@
---- components/os_crypt/os_crypt.h.orig	2017-04-19 19:06:32 UTC
-+++ components/os_crypt/os_crypt.h
-@@ -13,7 +13,7 @@
+--- components/os_crypt/os_crypt.h.orig	2017-09-05 21:05:17.000000000 +0200
++++ components/os_crypt/os_crypt.h	2017-09-06 19:12:09.251431000 +0200
+@@ -14,9 +14,9 @@
  #include "base/strings/string16.h"
  #include "build/build_config.h"
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "components/os_crypt/key_storage_linux.h"
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
+ class KeyStorageLinux;
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
++#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
  
-@@ -23,7 +23,7 @@
+ namespace os_crypt {
+ struct Config;
+@@ -28,13 +28,13 @@
  // true for Linux, if a password management tool is available.
  class OSCrypt {
   public:
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // If |store_type| is a known password store, we will attempt to use it.
-   // In any other case, we default to auto-detecting the store.
-   // This should not be changed after OSCrypt has been used.
+   // Set the configuration of OSCrypt.
+   static void SetConfig(std::unique_ptr<os_crypt::Config> config);
+ 
+   // Returns true iff the real secret key (not hardcoded one) is available.
+   static bool IsEncryptionAvailable();
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ 
+   // Encrypt a string16. The output (second argument) is really an array of
+   // bytes, but we're passing it back as a std::string.
+@@ -67,7 +67,7 @@
+   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
+ };
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
+ // For unit testing purposes, inject methods to be used.
+ // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
+ // If the provider returns |nullptr|, a hardcoded password will be used.
+@@ -80,6 +80,6 @@
+ // Clears any caching and most lazy initialisations performed by the production
+ // code. Should be used after any test which required a password.
+ void ClearCacheForTesting();
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
++#endif  // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
+ 
+ #endif  // COMPONENTS_OS_CRYPT_OS_CRYPT_H_
diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt__unittest.cc b/www/iridium/files/patch-components_os__crypt_os__crypt__unittest.cc
new file mode 100644
index 000000000000..398385b87bac
--- /dev/null
+++ b/www/iridium/files/patch-components_os__crypt_os__crypt__unittest.cc
@@ -0,0 +1,11 @@
+--- components/os_crypt/os_crypt_unittest.cc.orig	2017-12-15 02:04:15.000000000 +0100
++++ components/os_crypt/os_crypt_unittest.cc	2017-12-24 11:56:52.206820000 +0100
+@@ -18,7 +18,7 @@
+ #include "components/os_crypt/os_crypt_mocker.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "components/os_crypt/os_crypt_mocker_linux.h"
+ #endif
+ 
diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password_reuse_defines.h b/www/iridium/files/patch-components_password__manager_core_browser_password_reuse_defines.h
new file mode 100644
index 000000000000..d2a4470cdc91
--- /dev/null
+++ b/www/iridium/files/patch-components_password__manager_core_browser_password_reuse_defines.h
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_reuse_defines.h.orig	2018-03-20 23:05:22.000000000 +0100
++++ components/password_manager/core/browser/password_reuse_defines.h	2018-03-24 13:50:16.794379000 +0100
+@@ -6,7 +6,7 @@
+ #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_REUSE_DEFINES_H_
+ 
+ #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \
+-    defined(OS_LINUX) || defined(OS_CHROMEOS)
++    defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Enable the detection when the sync password is typed not on the sync domain.
+ #define SYNC_PASSWORD_REUSE_DETECTION_ENABLED
+ #endif
diff --git a/www/iridium/files/patch-components_plugins_renderer_BUILD.gn b/www/iridium/files/patch-components_plugins_renderer_BUILD.gn
deleted file mode 100644
index 95a3a2fd40ad..000000000000
--- a/www/iridium/files/patch-components_plugins_renderer_BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
---- components/plugins/renderer/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ components/plugins/renderer/BUILD.gn
-@@ -20,6 +20,7 @@ static_library("renderer") {
-   }
- 
-   deps = [
-+    "//v8",
-     "//content/public/child",
-     "//content/public/common",
-     "//content/public/renderer",
-@@ -28,6 +29,5 @@ static_library("renderer") {
-     "//third_party/WebKit/public:blink",
-     "//third_party/re2",
-     "//ui/base",
--    "//v8",
-   ]
- }
diff --git a/www/iridium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/iridium/files/patch-components_plugins_renderer_plugin__placeholder.cc
index e91036d176df..f188f9ef0136 100644
--- a/www/iridium/files/patch-components_plugins_renderer_plugin__placeholder.cc
+++ b/www/iridium/files/patch-components_plugins_renderer_plugin__placeholder.cc
@@ -1,9 +1,9 @@
---- components/plugins/renderer/plugin_placeholder.cc.orig	2017-04-19 19:06:33 UTC
-+++ components/plugins/renderer/plugin_placeholder.cc
+--- components/plugins/renderer/plugin_placeholder.cc.orig	2018-06-13 00:10:13.000000000 +0200
++++ components/plugins/renderer/plugin_placeholder.cc	2018-07-19 00:02:51.619981000 +0200
 @@ -11,7 +11,11 @@
  #include "gin/object_template_builder.h"
- #include "third_party/WebKit/public/web/WebElement.h"
- #include "third_party/WebKit/public/web/WebPluginContainer.h"
+ #include "third_party/blink/public/web/web_element.h"
+ #include "third_party/blink/public/web/web_plugin_container.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-components_policy_BUILD.gn b/www/iridium/files/patch-components_policy_BUILD.gn
deleted file mode 100644
index 5859d031bb18..000000000000
--- a/www/iridium/files/patch-components_policy_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
---- components/policy/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ components/policy/BUILD.gn
-@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re
- gen_policy_templates_common = true
- gen_policy_templates_win = is_win
- gen_policy_templates_linux = is_linux
-+gen_policy_templates_bsd = is_bsd
- gen_policy_templates_android = is_android
- gen_policy_templates_mac = is_mac
- 
-@@ -159,7 +160,7 @@ grit("grit_policy_templates") {
-     outputs += policy_templates_android_outputs
-     defines += [ "gen_policy_templates_android" ]
-   }
--  if (gen_policy_templates_linux) {
-+  if (gen_policy_templates_linux || gen_policy_templates_bsd) {
-     outputs += policy_templates_linux_outputs
-     defines += [ "gen_policy_templates_linux" ]
-   }
diff --git a/www/iridium/files/patch-components_policy_resources_policy__templates.json b/www/iridium/files/patch-components_policy_resources_policy__templates.json
index ca54d4ae55f7..6b28081bfabd 100644
--- a/www/iridium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/iridium/files/patch-components_policy_resources_policy__templates.json
@@ -1,47 +1,83 @@
---- components/policy/resources/policy_templates.json.orig	2017-04-24 14:40:29 UTC
-+++ components/policy/resources/policy_templates.json
-@@ -964,7 +964,7 @@
-           'name': 'RemoteAccessHostMatchUsername',
-           'type': 'main',
-           'schema': { 'type': 'boolean' },
--          'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'],
-+          'supported_on': ['chrome.linux:25-', 'chrome.freebsd:25-', 'chrome.mac:25-', 'chrome_os:42-'],
-           'features': {
-             'dynamic_refresh': True,
-             'per_profile': False,
-@@ -2139,7 +2139,7 @@
-           'name': 'GSSAPILibraryName',
-           'type': 'string',
-           'schema': { 'type': 'string' },
--          'supported_on': ['chrome.linux:9-'],
-+          'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
-           'features': {
-             'dynamic_refresh': False,
-             'per_profile': False,
-@@ -4815,7 +4815,7 @@
+--- components/policy/resources/policy_templates.json.orig	2018-02-24 16:25:13.000000000 +0100
++++ components/policy/resources/policy_templates.json	2018-03-03 23:01:15.812578000 +0100
+@@ -593,7 +593,7 @@
+       'name': 'HomepageLocation',
+       'type': 'string',
+       'schema': { 'type': 'string' },
+-      'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
++      'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'chrome.bsd:9-'],
+       'features': {
+         'can_be_recommended': True,
+         'dynamic_refresh': True,
+@@ -621,7 +621,7 @@
+       'name': 'HomepageIsNewTabPage',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+-      'supported_on': ['chrome.*:8-', 'chrome_os:11-'],
++      'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'chrome.bsd:9-'],
+       'features': {
+         'can_be_recommended': True,
+         'dynamic_refresh': True,
+@@ -648,7 +648,7 @@
+       'name': 'NewTabPageLocation',
+       'type': 'string',
+       'schema': { 'type': 'string' },
+-      'supported_on': ['chrome.*:58-', 'chrome_os:58-'],
++      'supported_on': ['chrome.*:58-', 'chrome_os:58-', 'chrome.bsd:9-'],
+       'features': {
+         'can_be_recommended': True,
+         'dynamic_refresh': True,
+@@ -1339,7 +1339,7 @@
+       'name': 'RemoteAccessHostMatchUsername',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+-      'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'],
++      'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-', 'chrome.bsd:25-'],
+       'features': {
+         'dynamic_refresh': True,
+         'per_profile': False,
+@@ -2567,7 +2567,7 @@
+       'name': 'GSSAPILibraryName',
+       'type': 'string',
+       'schema': { 'type': 'string' },
+-      'supported_on': ['chrome.linux:9-'],
++      'supported_on': ['chrome.linux:9-', 'chrome.bsd:9-'],
+       'features': {
+         'dynamic_refresh': False,
+         'per_profile': False,
+@@ -2619,7 +2619,7 @@
+       'name': 'NtlmV2Enabled',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+-      'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'],
++      'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-', 'chrome.bsd:63-'],
+       'features': {
+         'dynamic_refresh': True,
+         'per_profile': False,
+@@ -5229,7 +5229,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
 -      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
-+      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
++      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-', 'chrome.bsd:30-'],
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -5723,7 +5723,7 @@
+@@ -6157,7 +6157,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },
 -      'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
-+      'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
++      'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.bsd:19-'],
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -6250,7 +6250,7 @@
+@@ -6669,7 +6669,7 @@
        'name': 'FullscreenAllowed',
        'type': 'main',
        'schema': { 'type': 'boolean' },
 -      'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'],
-+      'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.freebsd:31-'],
++      'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.bsd:31-'],
        'features': {
          'dynamic_refresh': True,
          'per_profile': True,
diff --git a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
index 9ce300c3dc33..902948b771fc 100644
--- a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
+++ b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py
@@ -1,11 +1,20 @@
---- components/policy/tools/generate_policy_source.py.orig	2017-04-19 19:06:33 UTC
-+++ components/policy/tools/generate_policy_source.py
-@@ -103,7 +103,7 @@ class PolicyDetails:
+--- components/policy/tools/generate_policy_source.py.orig	2017-12-15 02:04:15.000000000 +0100
++++ components/policy/tools/generate_policy_source.py	2017-12-24 12:04:08.751317000 +0100
+@@ -91,7 +91,7 @@
+         raise RuntimeError('is_device_only is only allowed for Chrome OS: "%s"'
+                            % p)
+       if platform not in ['chrome_frame', 'chrome_os',
+-                          'android', 'webview_android',
++                          'android', 'webview_android', 'chrome.bsd',
+                           'chrome.win', 'chrome.linux', 'chrome.mac',
+                           'chrome.fuchsia', 'chrome.*']:
+         raise RuntimeError('Platform "%s" is not supported' % platform)
+@@ -111,7 +111,7 @@
        if platform.startswith('chrome.'):
          platform_sub = platform[7:]
          if platform_sub == '*':
--          self.platforms.extend(['win', 'mac', 'linux'])
-+          self.platforms.extend(['win', 'mac', 'linux', 'bsd'])
+-          self.platforms.extend(['win', 'mac', 'linux', 'fuchsia'])
++          self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'bsd'])
          else:
            self.platforms.append(platform_sub)
        else:
diff --git a/www/iridium/files/patch-components_filesystem_file__system__app.cc b/www/iridium/files/patch-components_services_filesystem_file_system_app.cc
index 87a2c07af344..d783fd680a08 100644
--- a/www/iridium/files/patch-components_filesystem_file__system__app.cc
+++ b/www/iridium/files/patch-components_services_filesystem_file_system_app.cc
@@ -1,6 +1,6 @@
---- components/filesystem/file_system_app.cc.orig	2017-05-02 19:02:50 UTC
-+++ components/filesystem/file_system_app.cc
-@@ -23,7 +23,7 @@
+--- components/services/filesystem/file_system_app.cc.orig	2018-05-09 21:05:46.000000000 +0200
++++ components/services/filesystem/file_system_app.cc	2018-08-16 09:56:02.296148000 +0200
+@@ -20,7 +20,7 @@
  #elif defined(OS_ANDROID)
  #include "base/base_paths_android.h"
  #include "base/path_service.h"
@@ -9,12 +9,12 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MACOSX)
-@@ -75,7 +75,7 @@ base::FilePath FileSystemApp::GetUserDat
+@@ -75,7 +75,7 @@
      CHECK(PathService::Get(base::DIR_APP_DATA, &path));
  #elif defined(OS_ANDROID)
      CHECK(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,
+     path = base::nix::GetXDGDirectory(
+         env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn
index e5cdb683bdb4..d9c7fdf1829f 100644
--- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,6 +1,6 @@
---- components/storage_monitor/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ components/storage_monitor/BUILD.gn
-@@ -65,6 +65,21 @@ static_library("storage_monitor") {
+--- components/storage_monitor/BUILD.gn.orig	2017-12-15 02:04:15.000000000 +0100
++++ components/storage_monitor/BUILD.gn	2017-12-30 01:29:29.688538000 +0100
+@@ -65,6 +65,17 @@
      ]
    }
  
@@ -8,10 +8,6 @@
 +    sources -= [
 +      "mtab_watcher_linux.cc",
 +      "mtab_watcher_linux.h",
-+      "storage_monitor_linux.cc",
-+      "storage_monitor_linux.h",
-+      "udev_util_linux.cc",
-+      "udev_util_linux.h",
 +    ]
 +    sources += [
 +      "storage_monitor_freebsd.cc",
diff --git a/www/iridium/files/patch-components_storage__monitor_storage__monitor.cc b/www/iridium/files/patch-components_storage__monitor_storage__monitor.cc
deleted file mode 100644
index 4886d38b929a..000000000000
--- a/www/iridium/files/patch-components_storage__monitor_storage__monitor.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- components/storage_monitor/storage_monitor.cc.orig	2017-04-19 19:06:33 UTC
-+++ components/storage_monitor/storage_monitor.cc
-@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
- 
- void StorageMonitor::EnsureInitialized(base::Closure callback) {
-   DCHECK(thread_checker_.CalledOnValidThread());
-+//#if !defined(OS_BSD) //XXX(rene) why disabled?
-   if (initialized_) {
-     if (!callback.is_null())
-       callback.Run();
-@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(b
- 
-   initializing_ = true;
-   Init();
-+//#endif
- }
- 
- bool StorageMonitor::IsInitialized() const {
diff --git a/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
index 1b77d7f0624f..8542281e52cd 100644
--- a/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
+++ b/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
@@ -1,6 +1,6 @@
---- components/storage_monitor/storage_monitor_freebsd.cc.orig	2017-04-28 14:23:59 UTC
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig	2017-06-11 01:51:38 UTC
 +++ components/storage_monitor/storage_monitor_freebsd.cc
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,54 @@
 +// 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.
@@ -31,53 +31,6 @@
 +
 +namespace {
 +
-+// udev device property constants.
-+const char kBlockSubsystemKey[] = "block";
-+const char kDiskDeviceTypeKey[] = "disk";
-+const char kFsUUID[] = "ID_FS_UUID";
-+const char kLabel[] = "ID_FS_LABEL";
-+const char kModel[] = "ID_MODEL";
-+const char kModelID[] = "ID_MODEL_ID";
-+const char kRemovableSysAttr[] = "removable";
-+const char kSerialShort[] = "ID_SERIAL_SHORT";
-+const char kSizeSysAttr[] = "size";
-+const char kVendor[] = "ID_VENDOR";
-+const char kVendorID[] = "ID_VENDOR_ID";
-+
-+StorageMonitor::EjectStatus EjectPathOnFileThread(
-+    const base::FilePath& path,
-+    const base::FilePath& device) {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-+
-+  static const char kUmountBinary[] = "/sbin/umount";
-+  std::vector<std::string> command;
-+  command.push_back(kUmountBinary);
-+  command.push_back(path.value());
-+
-+  base::LaunchOptions options;
-+  base::Process process = base::LaunchProcess(command, options);
-+  if (!process.IsValid())
-+    return StorageMonitor::EJECT_FAILURE;
-+
-+  int exit_code = -1;
-+  if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
-+                                      &exit_code)) {
-+    process.Terminate(-1, false);
-+    base::EnsureProcessTerminated(std::move(process));
-+    return StorageMonitor::EJECT_FAILURE;
-+  }
-+
-+  // TODO(gbillock): Make sure this is found in documentation
-+  // somewhere. Experimentally it seems to hold that exit code
-+  // 1 means device is in use.
-+  if (exit_code == 1)
-+    return StorageMonitor::EJECT_IN_USE;
-+  if (exit_code != 0)
-+    return StorageMonitor::EJECT_FAILURE;
-+
-+  return StorageMonitor::EJECT_OK;
-+}
-+
 +}  // namespace
 +
 +StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
diff --git a/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
index 2ef1c3cce693..cb2113e9435e 100644
--- a/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
+++ b/www/iridium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
@@ -1,4 +1,4 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig	2017-04-28 14:23:59 UTC
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2017-04-22 13:58:19 UTC
 +++ components/storage_monitor/storage_monitor_freebsd.h
 @@ -0,0 +1,45 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
diff --git a/www/iridium/files/patch-components_sync_base_get__session__name.cc b/www/iridium/files/patch-components_sync_base_get__session__name.cc
index 380c33d62a44..c857b222d2e4 100644
--- a/www/iridium/files/patch-components_sync_base_get__session__name.cc
+++ b/www/iridium/files/patch-components_sync_base_get__session__name.cc
@@ -1,4 +1,4 @@
---- components/sync/base/get_session_name.cc.orig	2017-04-19 19:06:33 UTC
+--- components/sync/base/get_session_name.cc.orig	2017-06-05 19:03:06 UTC
 +++ components/sync/base/get_session_name.cc
 @@ -15,7 +15,7 @@
  
@@ -9,7 +9,7 @@
  #include "components/sync/base/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "components/sync/base/get_session_name_ios.h"
-@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously(
+@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() {
        session_name = "Chromebook";
        break;
    }
diff --git a/www/iridium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc b/www/iridium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc
deleted file mode 100644
index c473b400228f..000000000000
--- a/www/iridium/files/patch-components_tracing_child_child__memory__dump__manager__delegate__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/tracing/child/child_memory_dump_manager_delegate_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ components/tracing/child/child_memory_dump_manager_delegate_impl.cc
-@@ -52,7 +52,7 @@ void ChildMemoryDumpManagerDelegateImpl:
-     base::trace_event::MemoryDumpManager::GetInstance()->Initialize(
-       this /* delegate */, false /* is_coordinator */);
- 
--#if !defined(OS_LINUX) && !defined(OS_NACL)
-+#if !defined(OS_LINUX) && !defined(OS_NACL) && !defined(OS_BSD)
-     // On linux the browser process takes care of dumping process metrics.
-     // The child process is not allowed to do so due to BPF sandbox.
-     tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
diff --git a/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc b/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc
deleted file mode 100644
index 0665a62829ce..000000000000
--- a/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc
+++ /dev/null
@@ -1,81 +0,0 @@
---- components/tracing/common/process_metrics_memory_dump_provider.cc.orig	2017-04-19 19:06:33 UTC
-+++ components/tracing/common/process_metrics_memory_dump_provider.cc
-@@ -56,7 +56,7 @@ base::LazyInstance<
-              std::unique_ptr<ProcessMetricsMemoryDumpProvider>>>::Leaky
-     g_dump_providers_map = LAZY_INSTANCE_INITIALIZER;
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- const char kClearPeakRssCommand[] = "5";
- 
- const uint32_t kMaxLineSize = 4096;
-@@ -190,13 +190,13 @@ bool GetResidentSizeFromStatmFile(int fd
-   return num_scanned == 1;
- }
- 
--#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- 
- std::unique_ptr<base::ProcessMetrics> CreateProcessMetrics(
-     base::ProcessId process) {
-   if (process == base::kNullProcessId)
-     return base::ProcessMetrics::CreateCurrentProcessMetrics();
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   // Just pass ProcessId instead of handle since they are the same in linux and
-   // android.
-   return base::ProcessMetrics::CreateProcessMetrics(process);
-@@ -205,7 +205,7 @@ std::unique_ptr<base::ProcessMetrics> Cr
-   // additional information like ProcessHandle or port provider.
-   NOTREACHED();
-   return std::unique_ptr<base::ProcessMetrics>();
--#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- }
- 
- }  // namespace
-@@ -217,7 +217,7 @@ uint64_t ProcessMetricsMemoryDumpProvide
- ProcessMetricsMemoryDumpProvider::FactoryFunction
-     ProcessMetricsMemoryDumpProvider::factory_for_testing = nullptr;
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- 
- // static
- FILE* ProcessMetricsMemoryDumpProvider::proc_smaps_for_testing = nullptr;
-@@ -244,7 +244,7 @@ bool ProcessMetricsMemoryDumpProvider::D
-     pmd->set_has_process_mmaps();
-   return res;
- }
--#endif  // defined(OS_LINUX) || defined(OS_ANDROID)
-+#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- 
- #if defined(OS_WIN)
- bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps(
-@@ -620,7 +620,7 @@ bool ProcessMetricsMemoryDumpProvider::D
- 
- #if !defined(OS_IOS)
-   peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize();
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   if (is_rss_peak_resettable_) {
-     std::string clear_refs_file =
-         "/proc/" +
-@@ -670,7 +670,7 @@ bool ProcessMetricsMemoryDumpProvider::D
- void ProcessMetricsMemoryDumpProvider::PollFastMemoryTotal(
-     uint64_t* memory_total) {
-   *memory_total = 0;
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   int statm_fd = fast_polling_statm_fd_for_testing;
-   if (statm_fd == -1) {
-     if (!fast_polling_statm_fd_.is_valid()) {
-@@ -698,7 +698,7 @@ void ProcessMetricsMemoryDumpProvider::P
- }
- 
- void ProcessMetricsMemoryDumpProvider::SuspendFastMemoryPolling() {
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   fast_polling_statm_fd_.reset();
- #endif
- }
diff --git a/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h b/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h
deleted file mode 100644
index fb1e1791c314..000000000000
--- a/www/iridium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/tracing/common/process_metrics_memory_dump_provider.h.orig	2017-04-19 19:06:33 UTC
-+++ components/tracing/common/process_metrics_memory_dump_provider.h
-@@ -57,7 +57,7 @@ class TRACING_EXPORT ProcessMetricsMemor
- #elif defined(OS_WIN)
-   FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
-                            TestWinModuleReading);
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
-                            DoubleRegister);
- #endif
-@@ -70,7 +70,7 @@ class TRACING_EXPORT ProcessMetricsMemor
-   static uint64_t rss_bytes_for_testing;
-   static FactoryFunction factory_for_testing;
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-   static FILE* proc_smaps_for_testing;
-   static int fast_polling_statm_fd_for_testing;
- 
diff --git a/www/iridium/files/patch-components_update__client_update__query__params.cc b/www/iridium/files/patch-components_update__client_update__query__params.cc
index 747606e34f85..e2c9a5a76e5a 100644
--- a/www/iridium/files/patch-components_update__client_update__query__params.cc
+++ b/www/iridium/files/patch-components_update__client_update__query__params.cc
@@ -1,6 +1,6 @@
---- components/update_client/update_query_params.cc.orig	2017-04-19 19:06:33 UTC
+--- components/update_client/update_query_params.cc.orig	2017-06-05 19:03:06 UTC
 +++ components/update_client/update_query_params.cc
-@@ -34,6 +34,8 @@ const char kOs[] =
+@@ -35,6 +35,8 @@ const char kOs[] =
      "linux";
  #elif defined(OS_OPENBSD)
      "openbsd";
diff --git a/www/iridium/files/patch-components_variations_proto_study.proto b/www/iridium/files/patch-components_variations_proto_study.proto
deleted file mode 100644
index 8e5b7eabe5e3..000000000000
--- a/www/iridium/files/patch-components_variations_proto_study.proto
+++ /dev/null
@@ -1,10 +0,0 @@
---- components/variations/proto/study.proto.orig	2017-04-19 19:06:33 UTC
-+++ components/variations/proto/study.proto
-@@ -188,6 +188,7 @@ message Study {
-     PLATFORM_CHROMEOS = 3;
-     PLATFORM_ANDROID  = 4;
-     PLATFORM_IOS      = 5;
-+    PLATFORM_BSD      = 6;
-   }
- 
-   // Possible form factors Chrome is running on.
diff --git a/www/iridium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/iridium/files/patch-components_webcrypto_algorithms_test__helpers.cc
index 83f54165e96b..9a74c3a7fd29 100644
--- a/www/iridium/files/patch-components_webcrypto_algorithms_test__helpers.cc
+++ b/www/iridium/files/patch-components_webcrypto_algorithms_test__helpers.cc
@@ -1,9 +1,9 @@
---- components/webcrypto/algorithms/test_helpers.cc.orig	2017-04-19 19:06:33 UTC
-+++ components/webcrypto/algorithms/test_helpers.cc
+--- components/webcrypto/algorithms/test_helpers.cc.orig	2018-06-13 00:10:16.000000000 +0200
++++ components/webcrypto/algorithms/test_helpers.cc	2018-07-19 00:07:52.270703000 +0200
 @@ -25,7 +25,11 @@
  #include "components/webcrypto/status.h"
- #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
- #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
+ #include "third_party/blink/public/platform/web_crypto_algorithm_params.h"
+ #include "third_party/blink/public/platform/web_crypto_key_algorithm.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-content_app_BUILD.gn b/www/iridium/files/patch-content_app_BUILD.gn
deleted file mode 100644
index af5c313738fd..000000000000
--- a/www/iridium/files/patch-content_app_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/app/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ content/app/BUILD.gn
-@@ -68,7 +68,7 @@ template("implement_content_app") {
-     ]
-   }
- 
--  if (is_linux && enable_plugins) {
-+  if ((is_linux || is_bsd) && enable_plugins) {
-     content_app_deps += [ "//content/ppapi_plugin:ppapi_plugin_sources" ]
-   }
- 
diff --git a/www/iridium/files/patch-content_app_content__main__runner.cc b/www/iridium/files/patch-content_app_content__main__runner.cc
deleted file mode 100644
index 6cb01e35ea4e..000000000000
--- a/www/iridium/files/patch-content_app_content__main__runner.cc
+++ /dev/null
@@ -1,42 +0,0 @@
---- content/app/content_main_runner.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/app/content_main_runner.cc
-@@ -92,10 +92,10 @@
- #include "base/posix/global_descriptors.h"
- #include "content/public/common/content_descriptors.h"
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "content/public/common/zygote_fork_delegate_linux.h"
- #endif
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- #include "content/zygote/zygote_main.h"
- #endif
- 
-@@ -365,7 +365,7 @@ struct MainFunction {
-   int (*function)(const MainFunctionParams&);
- };
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- // On platforms that use the zygote, we have a special subset of
- // subprocesses that are launched via the zygote.  This function
- // fills in some process-launching bits around ZygoteMain().
-@@ -426,7 +426,7 @@ int RunZygote(const MainFunctionParams& 
-   NOTREACHED() << "Unknown zygote process type: " << process_type;
-   return 1;
- }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- 
- static void RegisterMainThreadFactories() {
- #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
-@@ -492,7 +492,7 @@ int RunNamedProcessTypeMain(
-     }
-   }
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   // Zygote startup is special -- see RunZygote comments above
-   // for why we don't use ZygoteMain directly.
-   if (process_type == switches::kZygoteProcess)
diff --git a/www/iridium/files/patch-content_app_content_main_runner.cc b/www/iridium/files/patch-content_app_content_main_runner.cc
new file mode 100644
index 000000000000..c43a5475530d
--- /dev/null
+++ b/www/iridium/files/patch-content_app_content_main_runner.cc
@@ -0,0 +1,33 @@
+--- content/app/content_main_runner.cc.orig	2018-05-09 21:05:47.000000000 +0200
++++ content/app/content_main_runner.cc	2018-08-16 20:25:13.984643000 +0200
+@@ -84,10 +84,10 @@
+ #include "base/posix/global_descriptors.h"
+ #include "content/public/common/content_descriptors.h"
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "content/public/common/zygote_fork_delegate_linux.h"
+ #endif
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #include "content/zygote/zygote_main.h"
+ #include "sandbox/linux/services/libc_interceptor.h"
+ #endif
+@@ -153,7 +153,7 @@
+ namespace content {
+ extern int GpuMain(const content::MainFunctionParams&);
+ #if BUILDFLAG(ENABLE_PLUGINS)
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) && !defined(OS_BSD)
+ extern int PluginMain(const content::MainFunctionParams&);
+ #endif
+ extern int PpapiPluginMain(const MainFunctionParams&);
+@@ -702,7 +702,7 @@
+         kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
+ #endif  // !OS_ANDROID
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+     g_fds->Set(kCrashDumpSignal,
+                kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor);
+ #endif  // OS_LINUX || OS_OPENBSD
diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn
index cb60cd2ce3fd..698caaac8c56 100644
--- a/www/iridium/files/patch-content_browser_BUILD.gn
+++ b/www/iridium/files/patch-content_browser_BUILD.gn
@@ -1,8 +1,8 @@
---- content/browser/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/BUILD.gn
-@@ -1464,11 +1464,6 @@ source_set("browser") {
-       "memory/memory_monitor_chromeos.cc",
-       "memory/memory_monitor_chromeos.h",
+--- content/browser/BUILD.gn.orig	2018-08-01 00:08:43.000000000 +0200
++++ content/browser/BUILD.gn	2018-08-04 21:53:48.299617000 +0200
+@@ -1802,11 +1802,6 @@
+       "tracing/cros_tracing_agent.cc",
+       "tracing/cros_tracing_agent.h",
      ]
 -  } else {
 -    sources += [
@@ -11,54 +11,4 @@
 -    ]
    }
  
-   if (!is_win) {
-@@ -1540,7 +1535,7 @@ source_set("browser") {
- 
-   # Desktop screen capture implementations, conditionally built depending on
-   # the available implementations for each platform.
--  if (is_linux || is_mac || is_win) {
-+  if (is_linux || is_bsd || is_mac || is_win) {
-     defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
-     sources += [
-       "media/capture/cursor_renderer.cc",
-@@ -1727,7 +1722,7 @@ source_set("browser") {
-     }
-   }
- 
--  if (is_linux && use_aura) {
-+  if ((is_linux || is_bsd) && use_aura) {
-     deps += [ "//build/linux:fontconfig" ]
-   }
- 
-@@ -1880,6 +1875,17 @@ source_set("browser") {
-       "//chromeos",
-       "//chromeos:power_manager_proto",
-     ]
-+  } else if (is_bsd) {
-+    sources -= [
-+        "zygote_host/zygote_communication_linux.cc",
-+        "zygote_host/zygote_communication_linux.h",
-+        "zygote_host/zygote_handle_linux.cc",
-+        "zygote_host/zygote_host_impl_linux.cc",
-+        "zygote_host/zygote_host_impl_linux.h",
-+        "../zygote/zygote_linux.cc",
-+        "../zygote/zygote_linux.h",
-+        "../zygote/zygote_main_linux.cc",
-+    ]
-   }
- 
-   if (enable_mojo_media) {
-@@ -1998,11 +2004,11 @@ source_set("browser") {
-     ]
-   }
- 
--  if (is_linux && use_dbus) {
-+  if ((is_linux || is_bsd) && use_dbus) {
-     deps += [ "//dbus" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//third_party/boringssl" ]
-   }
- 
+   if (is_chromeos || is_android || is_chromecast) {
diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility.h b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility.h
deleted file mode 100644
index a31b6800d819..000000000000
--- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/accessibility/browser_accessibility.h.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/accessibility/browser_accessibility.h
-@@ -40,7 +40,7 @@
- #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
- #endif
- 
--#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS)
- #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
- #endif
- 
diff --git a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__manager.h b/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
deleted file mode 100644
index 369d986b8455..000000000000
--- a/www/iridium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/accessibility/browser_accessibility_manager.h.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/accessibility/browser_accessibility_manager.h
-@@ -36,7 +36,7 @@ class BrowserAccessibilityManager;
- class BrowserAccessibilityManagerAndroid;
- #elif defined(OS_WIN)
- class BrowserAccessibilityManagerWin;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
- class BrowserAccessibilityManagerAuraLinux;
- #elif defined(OS_MACOSX)
- class BrowserAccessibilityManagerMac;
-@@ -248,7 +248,7 @@ class CONTENT_EXPORT BrowserAccessibilit
-   BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
-   BrowserAccessibilityManagerAuraLinux*
-       ToBrowserAccessibilityManagerAuraLinux();
- #endif
diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc
index 4a82d008a8d4..c780e1acdfcd 100644
--- a/www/iridium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc
@@ -1,39 +1,25 @@
---- content/browser/browser_main_loop.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/browser_main_loop.cc
-@@ -210,6 +210,11 @@
- #include "gpu/vulkan/vulkan_implementation.h"
+--- content/browser/browser_main_loop.cc.orig	2018-05-09 21:05:48.000000000 +0200
++++ content/browser/browser_main_loop.cc	2018-08-16 18:22:41.212943000 +0200
+@@ -240,6 +240,11 @@
+ #include "services/ui/common/image_cursors_set.h"
  #endif
  
 +#if defined(OS_BSD)
-+#include "content/common/sandbox_linux/sandbox_linux.h"
-+#include "content/child/child_process_sandbox_support_impl_linux.h"
++#include "content/browser/sandbox_host_linux.h"
++#include "content/public/common/common_sandbox_support_linux.h"
 +#endif
 +
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -218,7 +223,7 @@
- namespace content {
- namespace {
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void SetupSandbox(const base::CommandLine& parsed_command_line) {
-   TRACE_EVENT0("startup", "SetupSandbox");
-   if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
-@@ -584,10 +589,15 @@ void BrowserMainLoop::Init() {
- void BrowserMainLoop::EarlyInitialization() {
-   TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   // No thread should be created before this call, as SetupSandbox()
-   // will end-up using fork().
-   SetupSandbox(parsed_command_line_);
+@@ -548,6 +553,11 @@
+   // by now since a thread to start the ServiceManager has been created
+   // before the browser main loop starts.
+   DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
 +#elif defined(OS_BSD)
-+  RenderSandboxHostLinux::GetInstance()->Init();
++  SandboxHostLinux::GetInstance()->Init();
 +  base::FileHandleMappingVector fds_to_map;
-+  const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
++  const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket();
 +  fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD()));
  #endif
  
diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index 9c98c104da85..54077c2ec693 100644
--- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,22 +1,47 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/child_process_launcher_helper_linux.cc
-@@ -67,6 +67,7 @@ ChildProcessLauncherHelper::LaunchProces
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2018-05-09 21:05:48.000000000 +0200
++++ content/browser/child_process_launcher_helper_linux.cc	2018-08-16 10:43:09.493456000 +0200
+@@ -18,7 +18,9 @@
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/result_codes.h"
+ #include "content/public/common/sandboxed_process_launcher_delegate.h"
++#if !defined(OS_BSD)
+ #include "content/public/common/zygote_handle.h"
++#endif
+ #include "gpu/config/gpu_switches.h"
+ #include "services/service_manager/sandbox/linux/sandbox_linux.h"
+ 
+@@ -71,6 +73,7 @@
      int* launch_result) {
    *is_synchronous_launch = true;
  
 +#if !defined(OS_BSD)
-   ZygoteHandle* zygote_handle =
-       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ?
-       nullptr : delegate_->GetZygote();
-@@ -86,6 +87,7 @@ ChildProcessLauncherHelper::LaunchProces
-     process.zygote = *zygote_handle;
+   ZygoteHandle zygote_handle =
+       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
+           ? nullptr
+@@ -84,7 +87,6 @@
+         GetProcessType());
+     *launch_result = LAUNCH_RESULT_SUCCESS;
+ 
+-#if !defined(OS_OPENBSD)
+     if (handle) {
+       // This is just a starting score for a renderer or extension (the
+       // only types of processes that will be started this way).  It will
+@@ -95,13 +97,13 @@
+       ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
+           handle, kLowestRendererOomScore);
+     }
+-#endif
+ 
+     Process process;
+     process.process = base::Process(handle);
+     process.zygote = zygote_handle;
      return process;
    }
 +#endif
  
    Process process;
    process.process = base::LaunchProcess(*command_line(), options);
-@@ -105,10 +107,12 @@ base::TerminationStatus ChildProcessLaun
+@@ -119,10 +121,12 @@
      const ChildProcessLauncherHelper::Process& process,
      bool known_dead,
      int* exit_code) {
@@ -29,8 +54,8 @@
    if (known_dead) {
      return base::GetKnownDeadTerminationStatus(
          process.process.Handle(), exit_code);
-@@ -127,13 +131,17 @@ void ChildProcessLauncherHelper::ForceNo
-     ChildProcessLauncherHelper::Process process) {
+@@ -144,13 +148,17 @@
+   DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
 +#if !defined(OS_BSD)
@@ -46,4 +71,4 @@
 +#endif
  }
  
- // static
+ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
diff --git a/www/iridium/files/patch-content_browser_devtools_protocol_color__picker.cc b/www/iridium/files/patch-content_browser_devtools_protocol_color__picker.cc
deleted file mode 100644
index 256f998fd97e..000000000000
--- a/www/iridium/files/patch-content_browser_devtools_protocol_color__picker.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/devtools/protocol/color_picker.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/devtools/protocol/color_picker.cc
-@@ -153,7 +153,7 @@ void ColorPicker::UpdateCursor() {
-   // magnified projection only with centered hotspot.
-   // Mac Retina requires cursor to be > 120px in order to render smoothly.
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   const float kCursorSize = 63;
-   const float kDiameter = 63;
-   const float kHotspotOffset = 32;
diff --git a/www/iridium/files/patch-content_browser_download_base__file.cc b/www/iridium/files/patch-content_browser_download_base__file.cc
deleted file mode 100644
index 7259a0375d3a..000000000000
--- a/www/iridium/files/patch-content_browser_download_base__file.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/download/base_file.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/download/base_file.cc
-@@ -380,7 +380,7 @@ DownloadInterruptReason BaseFile::LogInt
-   return reason;
- }
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- 
- namespace {
- 
-@@ -463,7 +463,7 @@ DownloadInterruptReason BaseFile::Annota
-   }
-   return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
- }
--#else  // !OS_WIN && !OS_MACOSX && !OS_LINUX
-+#else  // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD
- DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
-     const std::string& client_guid,
-     const GURL& source_url,
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
deleted file mode 100644
index a915ad82fe69..000000000000
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -396,7 +396,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
-     // strings even if all features are blacklisted. If all GPU features are
-     // disabled, the GPU process will only initialize GL bindings, create a GL
-     // context, and collect full GPU info.
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) || !defined(OS_BSD)
-     if (reason) {
-       *reason = "All GPU features are blacklisted.";
-     }
-@@ -513,8 +513,10 @@ void GpuDataManagerImplPrivate::SetGLStr
-   gpu_info.gl_renderer = gl_renderer;
-   gpu_info.gl_version = gl_version;
- 
-+#if !defined(OS_BSD)
-   gpu::IdentifyActiveGPU(&gpu_info);
-   gpu::CollectDriverInfoGL(&gpu_info);
-+#endif
- 
-   UpdateGpuInfo(gpu_info);
-   UpdateGpuSwitchingManager(gpu_info);
-@@ -572,10 +574,12 @@ void GpuDataManagerImplPrivate::Initiali
-     // Skip collecting the basic driver info if SetGpuInfo() is already called.
-     if (IsCompleteGpuInfoAvailable()) {
-       gpu_info = gpu_info_;
-+#ifndef OS_BSD
-     } else {
-       TRACE_EVENT0("startup",
-                    "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
-       gpu::CollectBasicGraphicsInfo(&gpu_info);
-+#endif
-     }
- 
-     if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
-@@ -686,7 +690,9 @@ void GpuDataManagerImplPrivate::UpdateGp
-     return;
- 
-   bool was_info_available = IsCompleteGpuInfoAvailable();
-+#ifndef OS_BSD
-   gpu::MergeGPUInfo(&gpu_info_, gpu_info);
-+#endif
-   if (IsCompleteGpuInfoAvailable()) {
-     complete_gpu_info_already_requested_ = true;
-   } else if (was_info_available) {
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
deleted file mode 100644
index abdca9652e3a..000000000000
--- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -156,7 +156,7 @@ class CONTENT_EXPORT GpuDataManagerImplP
-                            UnblockOtherDomainFrom3DAPIs);
-   FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
-                            UnblockThisDomainFrom3DAPIs);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
-                            SetGLStrings);
-   FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest,
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/iridium/files/patch-content_browser_gpu_gpu__internals__ui.cc
deleted file mode 100644
index 6f216ef38b8a..000000000000
--- a/www/iridium/files/patch-content_browser_gpu_gpu__internals__ui.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/browser/gpu/gpu_internals_ui.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/gpu/gpu_internals_ui.cc
-@@ -43,7 +43,7 @@
- #include "third_party/skia/include/core/SkMilestone.h"
- #include "ui/gl/gpu_switching_manager.h"
- 
--#if defined(OS_LINUX) && defined(USE_X11)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
- #include <X11/Xlib.h>
- #endif
- #if defined(OS_WIN)
-@@ -51,7 +51,7 @@
- #include "ui/gfx/win/physical_size.h"
- #endif
- 
--#if defined(OS_LINUX) && defined(USE_X11)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
- #include "ui/base/x/x11_util.h"       // nogncheck
- #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
- #endif
-@@ -204,7 +204,7 @@ base::DictionaryValue* GpuInfoAsDictiona
-                                              gpu_info.gl_ws_version));
-   basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
-                                              gpu_info.gl_ws_extensions));
--#if defined(OS_LINUX) && defined(USE_X11)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
-   basic_info->Append(NewDescriptionValuePair("Window manager",
-                                              ui::GuessWindowManagerName()));
-   {
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
deleted file mode 100644
index 5ed494d03a45..000000000000
--- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/gpu/gpu_process_host.cc
-@@ -1024,7 +1024,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
-   std::unique_ptr<base::CommandLine> cmd_line =
-       base::MakeUnique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
- #else
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
-                                            ChildProcessHost::CHILD_NORMAL;
- #else
diff --git a/www/iridium/files/patch-content_browser_media_media__internals.cc b/www/iridium/files/patch-content_browser_media_media__internals.cc
index 71a3e83cb4e0..be90730d1c07 100644
--- a/www/iridium/files/patch-content_browser_media_media__internals.cc
+++ b/www/iridium/files/patch-content_browser_media_media__internals.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_internals.cc.orig	2017-04-19 19:06:33 UTC
+--- content/browser/media/media_internals.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/browser/media/media_internals.cc
-@@ -774,7 +774,7 @@ void MediaInternals::UpdateVideoCaptureD
+@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
      device_dict->SetString("name", descriptor.GetNameAndModel());
      device_dict->Set("formats", format_list);
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/iridium/files/patch-content_browser_memory_memory__coordinator__impl.cc b/www/iridium/files/patch-content_browser_memory_memory__coordinator__impl.cc
deleted file mode 100644
index 7255b1f5f590..000000000000
--- a/www/iridium/files/patch-content_browser_memory_memory__coordinator__impl.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- content/browser/memory/memory_coordinator_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/memory/memory_coordinator_impl.cc
-@@ -90,8 +90,12 @@ void MemoryCoordinatorHandleImpl::AddChi
- struct MemoryCoordinatorImplSingletonTraits
-     : public base::LeakySingletonTraits<MemoryCoordinatorImpl> {
-   static MemoryCoordinatorImpl* New() {
-+#if defined(OS_BSD)
-+    return nullptr;
-+#else
-     return new MemoryCoordinatorImpl(base::ThreadTaskRunnerHandle::Get(),
-                                      CreateMemoryMonitor());
-+#endif
-   }
- };
- 
diff --git a/www/iridium/files/patch-content_browser_memory_memory__monitor.cc b/www/iridium/files/patch-content_browser_memory_memory__monitor.cc
index b8f05805dc31..d97fb80334a0 100644
--- a/www/iridium/files/patch-content_browser_memory_memory__monitor.cc
+++ b/www/iridium/files/patch-content_browser_memory_memory__monitor.cc
@@ -1,21 +1,11 @@
---- content/browser/memory/memory_monitor.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/memory/memory_monitor.cc
-@@ -8,6 +8,7 @@
- 
- namespace content {
- 
-+#if !defined(OS_FREEBSD)
- // static
- MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() {
-   return base::Singleton<
-@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMem
-     base::SystemMemoryInfoKB* mem_info) {
+--- content/browser/memory/memory_monitor.cc.orig	2018-01-04 21:05:50.000000000 +0100
++++ content/browser/memory/memory_monitor.cc	2018-01-27 19:06:05.251190000 +0100
+@@ -22,7 +22,7 @@
    base::GetSystemMemoryInfo(mem_info);
  }
-+#endif // !defined(OS_FREEBSD)
  
 -#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) && !defined(OS_FREEBSD)
++#if defined(OS_MACOSX) || defined(OS_BSD)
  // TODO(bashi,bcwhite): Remove when memory monitor for mac is available.
  std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
    NOTREACHED();
diff --git a/www/iridium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc b/www/iridium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc
new file mode 100644
index 000000000000..6d5736168798
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc
@@ -0,0 +1,16 @@
+--- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig	2018-06-13 00:10:16.000000000 +0200
++++ content/browser/memory/swap_metrics_driver_impl_linux.cc	2018-07-21 00:28:47.747286000 +0200
+@@ -44,9 +44,13 @@
+ SwapMetricsDriver::SwapMetricsUpdateResult
+ SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) {
+   base::VmStatInfo vmstat;
++#if !defined(OS_BSD)
+   if (!base::GetVmStatInfo(&vmstat)) {
+     return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
+   }
++#else
++    return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
++#endif
+ 
+   uint64_t in_counts = vmstat.pswpin - last_pswpin_;
+   uint64_t out_counts = vmstat.pswpout - last_pswpout_;
diff --git a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc
deleted file mode 100644
index 0c619fa080c5..000000000000
--- a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- content/browser/ppapi_plugin_process_host.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/ppapi_plugin_process_host.cc
-@@ -55,9 +55,9 @@
- 
- namespace content {
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- ZygoteHandle g_ppapi_zygote;
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- // NOTE: changes to this class need to be reviewed by the security team.
- class PpapiPluginSandboxedProcessLauncherDelegate
-@@ -111,7 +111,7 @@ class PpapiPluginSandboxedProcessLaunche
-     return true;
-   }
- 
--#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   ZygoteHandle* GetZygote() override {
-     const base::CommandLine& browser_command_line =
-         *base::CommandLine::ForCurrentProcess();
-@@ -205,13 +205,13 @@ PpapiPluginProcessHost* PpapiPluginProce
-   return NULL;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- // static
- void PpapiPluginProcessHost::EarlyZygoteLaunch() {
-   DCHECK(!g_ppapi_zygote);
-   g_ppapi_zygote = CreateZygote();
- }
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- // static
- void PpapiPluginProcessHost::DidCreateOutOfProcessInstance(
-@@ -363,7 +363,7 @@ bool PpapiPluginProcessHost::Init(const 
-   base::CommandLine::StringType plugin_launcher =
-       browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF :
-                                         ChildProcessHost::CHILD_NORMAL;
- #else
diff --git a/www/iridium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc b/www/iridium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc
deleted file mode 100644
index 80794c4b03b6..000000000000
--- a/www/iridium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/renderer_host/media/video_capture_manager.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/renderer_host/media/video_capture_manager.cc
-@@ -645,7 +645,7 @@ VideoCaptureManager::DoStartTabCaptureOn
-   DCHECK(IsOnDeviceThread());
- 
-   std::unique_ptr<VideoCaptureDevice> video_capture_device;
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-   video_capture_device = WebContentsVideoCaptureDevice::Create(id);
- #endif
- 
-@@ -675,7 +675,7 @@ VideoCaptureManager::DoStartDesktopCaptu
-   }
- 
-   if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-     video_capture_device = WebContentsVideoCaptureDevice::Create(id);
-     IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED);
-     if (desktop_id.audio_share) {
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
index 8a37fe2c789d..b83deb938730 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,11 +1,29 @@
---- content/browser/renderer_host/render_message_filter.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/renderer_host/render_message_filter.cc
-@@ -89,7 +89,7 @@
+--- content/browser/renderer_host/render_message_filter.cc.orig	2018-06-13 00:10:17.000000000 +0200
++++ content/browser/renderer_host/render_message_filter.cc	2018-07-19 11:46:53.426069000 +0200
+@@ -76,7 +76,7 @@
+ #if defined(OS_MACOSX)
  #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
  #endif
- 
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include "base/linux_util.h"
  #include "base/threading/platform_thread.h"
  #endif
+@@ -194,7 +194,7 @@
+   std::move(callback).Run(route_id);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void RenderMessageFilter::SetThreadPriorityOnFileThread(
+     base::PlatformThreadId ns_tid,
+     base::ThreadPriority priority) {
+@@ -215,7 +215,7 @@
+ }
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void RenderMessageFilter::SetThreadPriority(int32_t ns_tid,
+                                             base::ThreadPriority priority) {
+   constexpr base::TaskTraits kTraits = {
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
index 3eda08ad248d..c0edfd2507bf 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h
@@ -1,11 +1,19 @@
---- content/browser/renderer_host/render_message_filter.h.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/renderer_host/render_message_filter.h
-@@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter
-       const std::list<base::ProcessHandle>& handles);
+--- content/browser/renderer_host/render_message_filter.h.orig	2018-06-13 00:10:17.000000000 +0200
++++ content/browser/renderer_host/render_message_filter.h	2018-07-20 17:25:54.254096000 +0200
+@@ -114,14 +114,14 @@
+       const url::Origin& cache_storage_origin,
+       const std::string& cache_storage_cache_name) override;
+   void HasGpuProcess(HasGpuProcessCallback callback) override;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   void SetThreadPriority(int32_t ns_tid,
+                          base::ThreadPriority priority) override;
+ #endif
+ 
    void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid,
                                       base::ThreadPriority priority);
-   void OnSetThreadPriority(base::PlatformThreadId ns_tid,
+ #endif
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
deleted file mode 100644
index 5f249d3ac7cf..000000000000
--- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ /dev/null
@@ -1,52 +0,0 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -378,11 +378,11 @@ SiteProcessMap* GetSiteProcessMapForBrow
-   return map;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- // This static member variable holds the zygote communication information for
- // the renderer.
- ZygoteHandle g_render_zygote;
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- // NOTE: changes to this class need to be reviewed by the security team.
- class RendererSandboxedProcessLauncherDelegate
-@@ -405,7 +405,7 @@ class RendererSandboxedProcessLauncherDe
-     return GetContentClient()->browser()->PreSpawnRenderer(policy);
-   }
- 
--#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   ZygoteHandle* GetZygote() override {
-     const base::CommandLine& browser_command_line =
-         *base::CommandLine::ForCurrentProcess();
-@@ -655,7 +655,7 @@ void RenderProcessHost::SetMaxRendererPr
-   g_max_renderer_count_override = count;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- // static
- void RenderProcessHostImpl::EarlyZygoteLaunch() {
-   DCHECK(!g_render_zygote);
-@@ -665,7 +665,7 @@ void RenderProcessHostImpl::EarlyZygoteL
-   ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus(
-       (*GetGenericZygote())->GetSandboxStatus());
- }
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- RenderProcessHostImpl::RenderProcessHostImpl(
-     BrowserContext* browser_context,
-@@ -813,7 +813,7 @@ bool RenderProcessHostImpl::Init() {
-   renderer_prefix =
-       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF
-                                       : ChildProcessHost::CHILD_NORMAL;
- #else
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
new file mode 100644
index 000000000000..1979cf623514
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -0,0 +1,15 @@
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2017-08-02 01:07:45.102330000 +0200
++++ content/browser/renderer_host/render_process_host_impl.h	2017-08-02 01:09:10.056596000 +0200
+@@ -290,10 +290,10 @@
+     is_for_guests_only_ = is_for_guests_only;
+   }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   // Launch the zygote early in the browser startup.
+   static void EarlyZygoteLaunch();
+-#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+   void RecomputeAndUpdateWebKitPreferences();
+ 
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index b9754b11794a..4cb3b1d5ed56 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/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	2017-04-19 19:06:33 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr
+@@ -142,7 +142,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 6baa618efc5d..9b17803027c7 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/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	2017-04-19 19:06:33 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -116,7 +116,7 @@
+@@ -114,7 +114,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
-@@ -2031,7 +2031,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
+@@ -2040,7 +2040,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2231,7 +2231,7 @@ void RenderWidgetHostViewAura::ForwardKe
+@@ -2241,7 +2241,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent(
    if (!target_host)
      return;
  
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index f40b8d12544c..8c5d9bc91d40 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/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	2017-04-19 19:06:33 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -546,7 +546,7 @@ bool RenderWidgetHostViewEventHandler::C
+@@ -548,7 +548,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/iridium/files/patch-content_browser_tracing_tracing__controller__impl.cc b/www/iridium/files/patch-content_browser_tracing_tracing__controller__impl.cc
deleted file mode 100644
index 6c766bac646d..000000000000
--- a/www/iridium/files/patch-content_browser_tracing_tracing__controller__impl.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/tracing/tracing_controller_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/tracing/tracing_controller_impl.cc
-@@ -476,7 +476,7 @@ void TracingControllerImpl::AddTraceMess
-     return;
-   }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // On Linux the browser process dumps process metrics for child process due to
-   // sandbox.
-   tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess(
-@@ -504,7 +504,7 @@ void TracingControllerImpl::RemoveTraceM
-     return;
-   }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   tracing::ProcessMetricsMemoryDumpProvider::UnregisterForProcess(
-       trace_message_filter->peer_pid());
- #endif
diff --git a/www/iridium/files/patch-content_browser_utility__process__host__impl.cc b/www/iridium/files/patch-content_browser_utility__process__host__impl.cc
deleted file mode 100644
index 53a1355b6f89..000000000000
--- a/www/iridium/files/patch-content_browser_utility__process__host__impl.cc
+++ /dev/null
@@ -1,94 +0,0 @@
---- content/browser/utility_process_host_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/browser/utility_process_host_impl.cc
-@@ -44,9 +44,9 @@
- #include "services/service_manager/public/cpp/interface_provider.h"
- #include "ui/base/ui_base_switches.h"
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "content/public/browser/zygote_handle_linux.h"
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- #if defined(OS_WIN)
- #include "sandbox/win/src/sandbox_policy.h"
-@@ -55,11 +55,11 @@
- 
- namespace content {
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- namespace {
- ZygoteHandle g_utility_zygote;
- }  // namespace
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- // NOTE: changes to this class need to be reviewed by the security team.
- class UtilitySandboxedProcessLauncherDelegate
-@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel
-         launch_elevated_(launch_elevated)
- #elif defined(OS_POSIX)
-         env_(env)
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-         ,
-         no_sandbox_(no_sandbox)
--#endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID)
-+#endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID) && !defined(OS_BSD)
- #endif  // OS_WIN
-   {}
- 
-@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel
- 
- #elif defined(OS_POSIX)
- 
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   ZygoteHandle* GetZygote() override {
-     if (no_sandbox_ || !exposed_dir_.empty())
-       return nullptr;
-     return GetGenericZygote();
-   }
--#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   base::EnvironmentMap GetEnvironment() override { return env_; }
- #endif  // OS_WIN
- 
-@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel
-   bool launch_elevated_;
- #elif defined(OS_POSIX)
-   base::EnvironmentMap env_;
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   bool no_sandbox_;
--#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- #endif  // OS_WIN
- };
- 
-@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo
-       is_batch_mode_(false),
-       no_sandbox_(false),
-       run_elevated_(false),
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
- #else
-       child_flags_(ChildProcessHost::CHILD_NORMAL),
-@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con
-   name_ = name;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- // static
- void UtilityProcessHostImpl::EarlyZygoteLaunch() {
-   DCHECK(!g_utility_zygote);
-   g_utility_zygote = CreateZygote();
- }
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- bool UtilityProcessHostImpl::StartProcess() {
-   if (started_)
diff --git a/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.cc b/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
new file mode 100644
index 000000000000..384527871162
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
@@ -0,0 +1,69 @@
+--- content/browser/webui/web_ui_data_source_impl.cc.orig	2018-07-19 22:40:51.613006000 +0200
++++ content/browser/webui/web_ui_data_source_impl.cc	2018-07-19 22:47:18.163395000 +0200
+@@ -112,24 +112,24 @@
+ WebUIDataSourceImpl::~WebUIDataSourceImpl() {
+ }
+ 
+-void WebUIDataSourceImpl::AddString(base::StringPiece name,
++void WebUIDataSourceImpl::AddString(const std::string& name,
+                                     const base::string16& value) {
+   // TODO(dschuyler): Share only one copy of these strings.
+   localized_strings_.SetKey(name, base::Value(value));
+-  replacements_[name.as_string()] = base::UTF16ToUTF8(value);
++  replacements_[name] = base::UTF16ToUTF8(value);
+ }
+ 
+-void WebUIDataSourceImpl::AddString(base::StringPiece name,
++void WebUIDataSourceImpl::AddString(const std::string& name,
+                                     const std::string& value) {
+   localized_strings_.SetKey(name, base::Value(value));
+-  replacements_[name.as_string()] = value;
++  replacements_[name] = value;
+ }
+ 
+-void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) {
++void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) {
+   std::string utf8_str =
+       base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids));
+   localized_strings_.SetKey(name, base::Value(utf8_str));
+-  replacements_[name.as_string()] = utf8_str;
++  replacements_[name] = utf8_str;
+ }
+ 
+ void WebUIDataSourceImpl::AddLocalizedStrings(
+@@ -139,7 +139,7 @@
+                                               &replacements_);
+ }
+ 
+-void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) {
++void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) {
+   localized_strings_.SetBoolean(name, value);
+   // TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_|
+   // or similar. These values haven't been found as strings for
+@@ -148,21 +148,21 @@
+   // replacements.
+ }
+ 
+-void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) {
++void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) {
+   localized_strings_.SetInteger(name, value);
+ }
+ 
+-void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) {
++void WebUIDataSourceImpl::SetJsonPath(const std::string& path) {
+   DCHECK(json_path_.empty());
+   DCHECK(!path.empty());
+ 
+-  json_path_ = path.as_string();
++  json_path_ = path;
+   excluded_paths_.insert(json_path_);
+ }
+ 
+-void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path,
++void WebUIDataSourceImpl::AddResourcePath(const std::string &path,
+                                           int resource_id) {
+-  path_to_idr_map_[path.as_string()] = resource_id;
++  path_to_idr_map_[path] = resource_id;
+ }
+ 
+ void WebUIDataSourceImpl::SetDefaultResource(int resource_id) {
diff --git a/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.h b/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.h
new file mode 100644
index 000000000000..a1f1441e3a7b
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_webui_web_ui_data_source_impl.h
@@ -0,0 +1,25 @@
+--- content/browser/webui/web_ui_data_source_impl.h.orig	2018-07-19 22:41:03.715788000 +0200
++++ content/browser/webui/web_ui_data_source_impl.h	2018-07-19 22:49:20.849552000 +0200
+@@ -30,15 +30,15 @@
+                                            public WebUIDataSource {
+  public:
+   // WebUIDataSource implementation:
+-  void AddString(base::StringPiece name, const base::string16& value) override;
+-  void AddString(base::StringPiece name, const std::string& value) override;
+-  void AddLocalizedString(base::StringPiece name, int ids) override;
++  void AddString(const std::string& name, const base::string16& value) override;
++  void AddString(const std::string& name, const std::string& value) override;
++  void AddLocalizedString(const std::string& name, int ids) override;
+   void AddLocalizedStrings(
+       const base::DictionaryValue& localized_strings) override;
+-  void AddBoolean(base::StringPiece name, bool value) override;
+-  void AddInteger(base::StringPiece name, int32_t value) override;
+-  void SetJsonPath(base::StringPiece path) override;
+-  void AddResourcePath(base::StringPiece path, int resource_id) override;
++  void AddBoolean(const std::string& name, bool value) override;
++  void AddInteger(const std::string& name, int32_t value) override;
++  void SetJsonPath(const std::string& path) override;
++  void AddResourcePath(const std::string& path, int resource_id) override;
+   void SetDefaultResource(int resource_id) override;
+   void SetRequestFilter(
+       const WebUIDataSource::HandleRequestCallback& callback) override;
diff --git a/www/iridium/files/patch-content_browser_webui_web_ui_impl.cc b/www/iridium/files/patch-content_browser_webui_web_ui_impl.cc
new file mode 100644
index 000000000000..5f95a35d8bab
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_webui_web_ui_impl.cc
@@ -0,0 +1,14 @@
+--- content/browser/webui/web_ui_impl.cc.orig	2018-07-19 22:41:18.526274000 +0200
++++ content/browser/webui/web_ui_impl.cc	2018-07-19 22:50:47.735965000 +0200
+@@ -247,9 +247,9 @@
+   ExecuteJavascript(GetJavascriptCall(function_name, args));
+ }
+ 
+-void WebUIImpl::RegisterMessageCallback(base::StringPiece message,
++void WebUIImpl::RegisterMessageCallback(const std::string &message,
+                                         const MessageCallback& callback) {
+-  message_callbacks_.emplace(message, callback);
++  message_callbacks_.insert(std::make_pair(message, callback));
+ }
+ 
+ void WebUIImpl::ProcessWebUIMessage(const GURL& source_url,
diff --git a/www/iridium/files/patch-content_browser_webui_web_ui_impl.h b/www/iridium/files/patch-content_browser_webui_web_ui_impl.h
new file mode 100644
index 000000000000..3fdc1a8d2d00
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_webui_web_ui_impl.h
@@ -0,0 +1,11 @@
+--- content/browser/webui/web_ui_impl.h.orig	2018-07-19 22:41:27.362717000 +0200
++++ content/browser/webui/web_ui_impl.h	2018-07-19 22:51:17.719203000 +0200
+@@ -52,7 +52,7 @@
+   int GetBindings() const override;
+   void SetBindings(int bindings) override;
+   void AddMessageHandler(std::unique_ptr<WebUIMessageHandler> handler) override;
+-  void RegisterMessageCallback(base::StringPiece message,
++  void RegisterMessageCallback(const std::string& message,
+                                const MessageCallback& callback) override;
+   void ProcessWebUIMessage(const GURL& source_url,
+                            const std::string& message,
diff --git a/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc b/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc
new file mode 100644
index 000000000000..561d9496fba4
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.cc
@@ -0,0 +1,40 @@
+--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2018-08-16 15:33:51.777119000 +0200
++++ content/browser/zygote_host/zygote_host_impl_linux.cc	2018-08-16 15:35:37.865301000 +0200
+@@ -72,6 +72,7 @@
+ }
+ 
+ void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
++#if !defined(OS_BSD)
+   if (command_line.HasSwitch(switches::kNoSandbox)) {
+     return;
+   }
+@@ -130,6 +131,7 @@
+            "you can try using --"
+         << switches::kNoSandbox << ".";
+   }
++#endif
+ }
+ 
+ void ZygoteHostImpl::AddZygotePid(pid_t pid) {
+@@ -154,6 +156,7 @@
+     base::CommandLine* cmd_line,
+     base::ScopedFD* control_fd,
+     base::FileHandleMappingVector additional_remapped_fds) {
++#if !defined(OS_BSD)
+   int fds[2];
+   CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
+   CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
+@@ -218,9 +221,12 @@
+ 
+   AddZygotePid(pid);
+   return pid;
++#else
++  return 0;
++#endif
+ }
+ 
+-#if !defined(OS_OPENBSD)
++#if !defined(OS_BSD)
+ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
+                                             int score) {
+   // 1) You can't change the oom_score_adj of a non-dumpable process
diff --git a/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h b/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h
new file mode 100644
index 000000000000..0f2599868969
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_zygote_host_zygote_host_impl_linux.h
@@ -0,0 +1,13 @@
+--- content/browser/zygote_host/zygote_host_impl_linux.h.orig	2018-08-16 15:34:11.475341000 +0200
++++ content/browser/zygote_host/zygote_host_impl_linux.h	2018-08-16 15:36:05.256933000 +0200
+@@ -41,8 +41,10 @@
+                      base::ScopedFD* control_fd,
+                      base::FileHandleMappingVector additional_remapped_fds);
+ 
++#if !defined(OS_BSD)
+   void AdjustRendererOOMScore(base::ProcessHandle process_handle,
+                               int score) override;
++#endif
+ 
+  private:
+   friend struct base::DefaultSingletonTraits<ZygoteHostImpl>;
diff --git a/www/iridium/files/patch-content_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc
deleted file mode 100644
index 3e2c0ae2cacb..000000000000
--- a/www/iridium/files/patch-content_child_child__process.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/child/child_process.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/child/child_process.cc
-@@ -133,7 +133,7 @@ void ChildProcess::ReleaseProcess() {
-     main_thread_->OnProcessFinalRelease();
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void ChildProcess::SetIOThreadPriority(
-     base::ThreadPriority io_thread_priority) {
-   main_thread_->SetThreadPriority(io_thread_.GetThreadId(), io_thread_priority);
diff --git a/www/iridium/files/patch-content_child_child__process.h b/www/iridium/files/patch-content_child_child__process.h
deleted file mode 100644
index 7c9704e99204..000000000000
--- a/www/iridium/files/patch-content_child_child__process.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/child/child_process.h.orig	2017-04-19 19:06:33 UTC
-+++ content/child/child_process.h
-@@ -82,7 +82,7 @@ class CONTENT_EXPORT ChildProcess {
-   void AddRefProcess();
-   void ReleaseProcess();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   void SetIOThreadPriority(base::ThreadPriority io_thread_priority);
- #endif
- 
diff --git a/www/iridium/files/patch-content_child_child__thread__impl.cc b/www/iridium/files/patch-content_child_child__thread__impl.cc
deleted file mode 100644
index 81a97b393980..000000000000
--- a/www/iridium/files/patch-content_child_child__thread__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/child/child_thread_impl.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/child/child_thread_impl.cc
-@@ -699,7 +699,7 @@ std::unique_ptr<base::SharedMemory> Chil
-   return base::MakeUnique<base::SharedMemory>(shared_buf, false);
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void ChildThreadImpl::SetThreadPriority(base::PlatformThreadId id,
-                                         base::ThreadPriority priority) {
-   Send(new ChildProcessHostMsg_SetThreadPriority(id, priority));
diff --git a/www/iridium/files/patch-content_child_child__thread__impl.h b/www/iridium/files/patch-content_child_child__thread__impl.h
deleted file mode 100644
index 47c1eff9899c..000000000000
--- a/www/iridium/files/patch-content_child_child__thread__impl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/child/child_thread_impl.h.orig	2017-04-19 19:06:33 UTC
-+++ content/child/child_thread_impl.h
-@@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl
-   static std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
-       size_t buf_size);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   void SetThreadPriority(base::PlatformThreadId id,
-                          base::ThreadPriority priority);
- #endif
diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn
index 8ff43c05c1a2..6ebd6237de44 100644
--- a/www/iridium/files/patch-content_common_BUILD.gn
+++ b/www/iridium/files/patch-content_common_BUILD.gn
@@ -1,28 +1,15 @@
---- content/common/BUILD.gn.orig	2017-04-19 19:06:33 UTC
-+++ content/common/BUILD.gn
-@@ -503,7 +503,7 @@ source_set("common") {
+--- content/common/BUILD.gn.orig	2018-06-13 00:10:17.000000000 +0200
++++ content/common/BUILD.gn	2018-07-20 00:38:14.267181000 +0200
+@@ -430,6 +430,12 @@
+     libs += [ "android" ]
    }
  
-   if (!use_seccomp_bpf) {
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       sources -= [
-         "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
-         "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
-@@ -517,6 +517,16 @@ source_set("common") {
-         "sandbox_linux/bpf_utility_policy_linux.h",
-         "sandbox_linux/sandbox_bpf_base_policy_linux.cc",
-         "sandbox_linux/sandbox_bpf_base_policy_linux.h",
-+        "sandbox_linux/sandbox_seccomp_bpf_linux.cc",
-+        "sandbox_linux/sandbox_seccomp_bpf_linux.h",
-+      ]
-+    }
-+    if (is_bsd) {
-+      sources -= [
-+        "quarantine/quarantine_linux.cc",
-+        "sandbox_linux/sandbox_linux.cc",
-+        "sandbox_linux/sandbox_linux.h",
-+        "sandbox_linux/sandbox_init_linux.cc",
-       ]
-     }
-     if (is_android) {
++  if (is_bsd) {
++    sources -= [
++      "sandbox_init_linux.cc",
++    ]
++  }
++
+   if (is_debug && !is_component_build && enable_plugins) {
+     # Content depends on the PPAPI message logging stuff; if this isn't here,
+     # some unit test binaries won't compile. This only worked in release mode
diff --git a/www/iridium/files/patch-content_common_child__process__messages.h b/www/iridium/files/patch-content_common_child__process__messages.h
deleted file mode 100644
index d9d8582ae089..000000000000
--- a/www/iridium/files/patch-content_common_child__process__messages.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/common/child_process_messages.h.orig	2017-04-19 19:06:33 UTC
-+++ content/common/child_process_messages.h
-@@ -26,7 +26,7 @@
- #include "ui/gfx/ipc/gfx_param_traits.h"
- #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/threading/platform_thread.h"
- #endif
- 
-@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects:
-   IPC_STRUCT_TRAITS_MEMBER(process_id)
- IPC_STRUCT_TRAITS_END()
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- IPC_ENUM_TRAITS_MAX_VALUE(base::ThreadPriority,
-                           base::ThreadPriority::REALTIME_AUDIO)
- #endif
-@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcess
- IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ReleaseCachedFonts)
- #endif  // defined(OS_WIN)
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Asks the browser to change the priority of thread.
- IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_SetThreadPriority,
-                      base::PlatformThreadId,
diff --git a/www/iridium/files/patch-content_common_common_sandbox_support_linux.cc b/www/iridium/files/patch-content_common_common_sandbox_support_linux.cc
new file mode 100644
index 000000000000..3ecc98082147
--- /dev/null
+++ b/www/iridium/files/patch-content_common_common_sandbox_support_linux.cc
@@ -0,0 +1,11 @@
+--- content/common/common_sandbox_support_linux.cc.orig	2018-08-04 19:46:27.654459000 +0200
++++ content/common/common_sandbox_support_linux.cc	2018-08-04 19:46:40.138833000 +0200
+@@ -5,6 +5,7 @@
+ #include "content/public/common/common_sandbox_support_linux.h"
+ 
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ #include <limits>
+ #include <memory>
+
diff --git a/www/iridium/files/patch-content_common_content__switches__internal.cc b/www/iridium/files/patch-content_common_content__switches__internal.cc
deleted file mode 100644
index 0977c854a6ea..000000000000
--- a/www/iridium/files/patch-content_common_content__switches__internal.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/common/content_switches_internal.cc.orig	2017-04-19 19:06:33 UTC
-+++ content/common/content_switches_internal.cc
-@@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable
- #endif
- 
- bool IsUseZoomForDSFEnabledByDefault() {
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
-   return true;
- #elif defined(OS_WIN)
-   return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
diff --git a/www/iridium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc b/www/iridium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
deleted file mode 100644
index 69c0bf655f1a..000000000000
--- a/www/iridium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc
-@@ -7,7 +7,9 @@
- #include <errno.h>
- #include <signal.h>
- #include <stddef.h>
-+#if 0 // no OS_FREEBSD here?
- #include <sys/prctl.h>
-+#endif
- #include <unistd.h>
- 
- #include "base/command_line.h"
-@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableSt
-     return true;
-   }
- 
-+#if 0 // no OS_FREEBSD here?
-   if (prctl(PR_SET_DUMPABLE, 0) != 0) {
-     PLOG(ERROR) << "Failed to set non-dumpable flag";
-     return false;
-   }
- 
-   return prctl(PR_GET_DUMPABLE) == 0;
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace content
diff --git a/www/iridium/files/patch-content_common_user_agent.cc b/www/iridium/files/patch-content_common_user_agent.cc
new file mode 100644
index 000000000000..834a1691682f
--- /dev/null
+++ b/www/iridium/files/patch-content_common_user_agent.cc
@@ -0,0 +1,17 @@
+--- content/common/user_agent.cc.orig	2017-12-23 22:30:16.333353000 +0100
++++ content/common/user_agent.cc	2017-12-23 22:32:27.429827000 +0100
+@@ -131,6 +131,14 @@
+ #endif
+   );  // NOLINT
+ 
++#if defined(OS_BSD)
++#if defined(__x86_64__)
++  base::StringAppendF(&os_cpu, "; Linux x86_64");
++#else
++  base::StringAppendF(&os_cpu, "; Linux i686");
++#endif
++#endif
++
+   return os_cpu;
+ }
+ 
diff --git a/www/iridium/files/patch-content_common_view__messages.h b/www/iridium/files/patch-content_common_view__messages.h
index 77344b30003d..e70a51653ac4 100644
--- a/www/iridium/files/patch-content_common_view__messages.h
+++ b/www/iridium/files/patch-content_common_view__messages.h
@@ -1,6 +1,6 @@
---- content/common/view_messages.h.orig	2017-04-19 19:06:34 UTC
+--- content/common/view_messages.h.orig	2017-06-05 19:03:07 UTC
 +++ content/common/view_messages.h
-@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere
+@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
    IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video)
    IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
diff --git a/www/iridium/files/patch-content_gpu_BUILD.gn b/www/iridium/files/patch-content_gpu_BUILD.gn
index fad94ee0628b..66bc40d92c15 100644
--- a/www/iridium/files/patch-content_gpu_BUILD.gn
+++ b/www/iridium/files/patch-content_gpu_BUILD.gn
@@ -1,10 +1,11 @@
---- content/gpu/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ content/gpu/BUILD.gn
-@@ -98,6 +98,7 @@ target(link_target_type, "gpu_sources") 
+--- content/gpu/BUILD.gn.orig	2018-06-13 00:10:17.000000000 +0200
++++ content/gpu/BUILD.gn	2018-07-19 12:07:20.670815000 +0200
+@@ -127,7 +127,7 @@
  
-   if (use_x11) {
-     deps += [ "//ui/events/platform/x11" ]
-+    configs += [ "//build/config/linux:x11" ]
+   # Use DRI on desktop Linux builds.
+   if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
+-      (!is_chromecast || is_cast_desktop_build)) {
++      (!is_chromecast || is_cast_desktop_build) && !is_bsd) {
+     configs += [ "//build/config/linux/dri" ]
    }
- 
-   if (use_ozone) {
+ }
diff --git a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc b/www/iridium/files/patch-content_gpu_gpu__child__thread.cc
deleted file mode 100644
index 2426bcefc074..000000000000
--- a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- content/gpu/gpu_child_thread.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/gpu/gpu_child_thread.cc
-@@ -398,6 +398,7 @@ void GpuChildThread::OnCollectGraphicsIn
-   }
- #endif
- 
-+#if !defined(OS_BSD)
- #if defined(OS_WIN)
-   // GPU full info collection should only happen on un-sandboxed GPU process
-   // or single process/in-process gpu mode on Windows.
-@@ -420,6 +421,7 @@ void GpuChildThread::OnCollectGraphicsIn
-     base::MessageLoop::current()->QuitWhenIdle();
-   }
- #endif  // OS_WIN
-+#endif  // XXX(rene) !FreeBSD
- }
- 
- void GpuChildThread::OnClean() {
diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc
index accef8f0c411..ad458367a988 100644
--- a/www/iridium/files/patch-content_gpu_gpu__main.cc
+++ b/www/iridium/files/patch-content_gpu_gpu__main.cc
@@ -1,29 +1,47 @@
---- content/gpu/gpu_main.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/gpu/gpu_main.cc
-@@ -98,7 +98,7 @@ namespace content {
+--- content/gpu/gpu_main.cc.orig	2018-02-24 16:25:14.000000000 +0100
++++ content/gpu/gpu_main.cc	2018-03-04 01:23:12.209864000 +0100
+@@ -76,7 +76,7 @@
+ #include "ui/gfx/x/x11_switches.h"  // nogncheck
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "content/common/font_config_ipc_linux.h"
+ #include "content/gpu/gpu_sandbox_hook_linux.h"
+ #include "content/public/common/common_sandbox_support_linux.h"
+@@ -102,7 +102,7 @@
  
  namespace {
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread*);
- #elif defined(OS_WIN)
- bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
-@@ -152,7 +152,7 @@ class ContentSandboxHelper : public gpu:
- 
-   bool EnsureSandboxInitialized(
-       gpu::GpuWatchdogThread* watchdog_thread) override {
+ bool StartSandboxLinux(gpu::GpuWatchdogThread*,
+                        const gpu::GPUInfo*,
+                        const gpu::GpuPreferences&);
+@@ -163,7 +163,7 @@
+   bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
+                                 const gpu::GPUInfo* gpu_info,
+                                 const gpu::GpuPreferences& gpu_prefs) override {
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
-     return StartSandboxLinux(watchdog_thread);
+     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
  #elif defined(OS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -313,7 +313,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -340,7 +340,7 @@
  
  namespace {
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) && !defined(OS_BSD)
- bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread) {
-   TRACE_EVENT0("gpu,startup", "Initialize sandbox");
+ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
+                        const gpu::GPUInfo* gpu_info,
+                        const gpu::GpuPreferences& gpu_prefs) {
+@@ -378,7 +378,7 @@
+ 
+   return res;
+ }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) && !defined(OS_BSD)
  
+ #if defined(OS_WIN)
+ bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) {
diff --git a/www/iridium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc b/www/iridium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
new file mode 100644
index 000000000000..e0c500be24ea
--- /dev/null
+++ b/www/iridium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
@@ -0,0 +1,11 @@
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig	2018-03-03 20:54:40.697792000 +0100
++++ content/gpu/gpu_sandbox_hook_linux.cc	2018-03-03 20:54:56.999743000 +0100
+@@ -95,7 +95,7 @@
+ #endif
+ }
+ 
+-constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
++constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
+ 
+ void AddV4L2GpuWhitelist(
+     std::vector<BrokerFilePermission>* permissions,
diff --git a/www/iridium/files/patch-content_gpu_in__process__gpu__thread.cc b/www/iridium/files/patch-content_gpu_in__process__gpu__thread.cc
deleted file mode 100644
index 13d080922412..000000000000
--- a/www/iridium/files/patch-content_gpu_in__process__gpu__thread.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/gpu/in_process_gpu_thread.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/gpu/in_process_gpu_thread.cc
-@@ -54,8 +54,6 @@ void InProcessGpuThread::Init() {
-   gpu::GPUInfo gpu_info;
-   if (!gl::init::InitializeGLOneOff())
-     VLOG(1) << "gl::init::InitializeGLOneOff failed";
--  else
--    gpu::CollectContextGraphicsInfo(&gpu_info);
- 
-   gpu::GpuFeatureInfo gpu_feature_info =
-       gpu::GetGpuFeatureInfo(gpu_info, *base::CommandLine::ForCurrentProcess());
diff --git a/www/iridium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc b/www/iridium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc
new file mode 100644
index 000000000000..e38610fc080b
--- /dev/null
+++ b/www/iridium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc
@@ -0,0 +1,11 @@
+--- content/ppapi_plugin/ppapi_plugin_main.cc.orig	2018-02-24 16:25:14.000000000 +0100
++++ content/ppapi_plugin/ppapi_plugin_main.cc	2018-03-04 01:29:08.347119000 +0100
+@@ -125,6 +125,8 @@
+       service_manager::SandboxTypeFromCommandLine(command_line),
+       service_manager::SandboxLinux::PreSandboxHook(),
+       service_manager::SandboxLinux::Options());
++#elif defined(OS_BSD)
++  NOTIMPLEMENTED();
+ #endif
+ 
+   ChildProcess ppapi_process;
diff --git a/www/iridium/files/patch-content_public_browser_web_ui.h b/www/iridium/files/patch-content_public_browser_web_ui.h
new file mode 100644
index 000000000000..900db61288d8
--- /dev/null
+++ b/www/iridium/files/patch-content_public_browser_web_ui.h
@@ -0,0 +1,19 @@
+--- content/public/browser/web_ui.h.orig	2018-07-20 15:49:47.533832000 +0200
++++ content/public/browser/web_ui.h	2018-07-20 15:50:46.750401000 +0200
+@@ -9,7 +9,6 @@
+ 
+ #include "base/callback.h"
+ #include "base/strings/string16.h"
+-#include "base/strings/string_piece.h"
+ #include "content/common/content_export.h"
+ #include "ui/base/page_transition_types.h"
+ 
+@@ -73,7 +72,7 @@
+   // Used by WebUIMessageHandlers. If the given message is already registered,
+   // the call has no effect.
+   using MessageCallback = base::RepeatingCallback<void(const base::ListValue*)>;
+-  virtual void RegisterMessageCallback(base::StringPiece message,
++  virtual void RegisterMessageCallback(const std::string& message,
+                                        const MessageCallback& callback) = 0;
+ 
+   // This is only needed if an embedder overrides handling of a WebUIMessage and
diff --git a/www/iridium/files/patch-content_public_browser_web_ui_data_source.h b/www/iridium/files/patch-content_public_browser_web_ui_data_source.h
new file mode 100644
index 000000000000..7451607d73ad
--- /dev/null
+++ b/www/iridium/files/patch-content_public_browser_web_ui_data_source.h
@@ -0,0 +1,51 @@
+--- content/public/browser/web_ui_data_source.h.orig	2018-07-20 15:50:02.520469000 +0200
++++ content/public/browser/web_ui_data_source.h	2018-07-20 15:53:16.811577000 +0200
+@@ -13,7 +13,6 @@
+ 
+ #include "base/callback.h"
+ #include "base/strings/string16.h"
+-#include "base/strings/string_piece.h"
+ #include "content/common/content_export.h"
+ 
+ namespace base {
+@@ -45,33 +44,33 @@
+       std::unique_ptr<base::DictionaryValue> update);
+ 
+   // Adds a string keyed to its name to our dictionary.
+-  virtual void AddString(base::StringPiece name,
++  virtual void AddString(const std::string& name,
+                          const base::string16& value) = 0;
+ 
+   // Adds a string keyed to its name to our dictionary.
+-  virtual void AddString(base::StringPiece name, const std::string& value) = 0;
++  virtual void AddString(const std::string& name, const std::string& value) = 0;
+ 
+   // Adds a localized string with resource |ids| keyed to its name to our
+   // dictionary.
+-  virtual void AddLocalizedString(base::StringPiece name, int ids) = 0;
++  virtual void AddLocalizedString(const std::string& name, int ids) = 0;
+ 
+   // Add strings from |localized_strings| to our dictionary.
+   virtual void AddLocalizedStrings(
+       const base::DictionaryValue& localized_strings) = 0;
+ 
+   // Adds a boolean keyed to its name to our dictionary.
+-  virtual void AddBoolean(base::StringPiece name, bool value) = 0;
++  virtual void AddBoolean(const std::string& name, bool value) = 0;
+ 
+   // Adds a signed 32-bit integer keyed to its name to our dictionary. Larger
+   // integers may not be exactly representable in JavaScript. See
+   // MAX_SAFE_INTEGER in /v8/src/globals.h.
+-  virtual void AddInteger(base::StringPiece name, int32_t value) = 0;
++  virtual void AddInteger(const std::string& name, int32_t value) = 0;
+ 
+   // Sets the path which will return the JSON strings.
+-  virtual void SetJsonPath(base::StringPiece path) = 0;
++  virtual void SetJsonPath(const std::string& path) = 0;
+ 
+   // Adds a mapping between a path name and a resource to return.
+-  virtual void AddResourcePath(base::StringPiece path, int resource_id) = 0;
++  virtual void AddResourcePath(const std::string& path, int resource_id) = 0;
+ 
+   // Sets the resource to returned when no other paths match.
+   virtual void SetDefaultResource(int resource_id) = 0;
diff --git a/www/iridium/files/patch-content_public_browser_zygote_host_linux.h b/www/iridium/files/patch-content_public_browser_zygote_host_linux.h
new file mode 100644
index 000000000000..f8fd480d1d4f
--- /dev/null
+++ b/www/iridium/files/patch-content_public_browser_zygote_host_linux.h
@@ -0,0 +1,16 @@
+--- content/public/browser/zygote_host_linux.h.orig	2018-08-16 15:32:17.788486000 +0200
++++ content/public/browser/zygote_host_linux.h	2018-08-16 15:32:45.497597000 +0200
+@@ -30,11 +30,13 @@
+   // after the first render has been forked.
+   virtual int GetRendererSandboxStatus() const = 0;
+ 
++#if !defined(OS_BSD)
+   // Adjust the OOM score of the given renderer's PID.  The allowed
+   // range for the score is [0, 1000], where higher values are more
+   // likely to be killed by the OOM killer.
+   virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle,
+                                       int score) = 0;
++#endif
+ };
+ 
+ }  // namespace content
diff --git a/www/iridium/files/patch-content_public_common_child__process__host.h b/www/iridium/files/patch-content_public_common_child__process__host.h
index aeebc99f3111..0ec797f1c8d6 100644
--- a/www/iridium/files/patch-content_public_common_child__process__host.h
+++ b/www/iridium/files/patch-content_public_common_child__process__host.h
@@ -1,6 +1,6 @@
---- content/public/common/child_process_host.h.orig	2017-04-19 19:06:34 UTC
+--- content/public/common/child_process_host.h.orig	2017-06-05 19:03:07 UTC
 +++ content/public/common/child_process_host.h
-@@ -54,7 +54,7 @@ class CONTENT_EXPORT ChildProcessHost : 
+@@ -46,7 +46,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
      // No special behavior requested.
      CHILD_NORMAL = 0,
  
@@ -9,7 +9,7 @@
      // 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.
-@@ -63,7 +63,7 @@ class CONTENT_EXPORT ChildProcessHost : 
+@@ -55,7 +55,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,
diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc
index 1eeccd159f80..914b3fea0b04 100644
--- a/www/iridium/files/patch-content_public_common_content__switches.cc
+++ b/www/iridium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2017-04-19 19:06:34 UTC
+--- content/public/common/content_switches.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/public/common/content_switches.cc
-@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideo
+@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
      "disable-vaapi-accelerated-video-encode";
  #endif
  
diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h
index d7035c6cbe4e..e52d1be3dd8c 100644
--- a/www/iridium/files/patch-content_public_common_content__switches.h
+++ b/www/iridium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2017-04-19 19:06:34 UTC
+--- content/public/common/content_switches.h.orig	2017-06-05 19:03:07 UTC
 +++ content/public/common/content_switches.h
-@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisabl
+@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
  
diff --git a/www/iridium/files/patch-content_public_common_renderer__preferences.h b/www/iridium/files/patch-content_public_common_renderer__preferences.h
index 4a5a14052710..971d50f4904a 100644
--- a/www/iridium/files/patch-content_public_common_renderer__preferences.h
+++ b/www/iridium/files/patch-content_public_common_renderer__preferences.h
@@ -1,6 +1,6 @@
---- content/public/common/renderer_preferences.h.orig	2017-04-19 19:06:34 UTC
+--- content/public/common/renderer_preferences.h.orig	2017-06-05 19:03:07 UTC
 +++ content/public/common/renderer_preferences.h
-@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreference
+@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreferences {
    // Country iso of the mobile network for content detection purpose.
    std::string network_contry_iso;
  
diff --git a/www/iridium/files/patch-content_public_common_zygote_features.gni b/www/iridium/files/patch-content_public_common_zygote_features.gni
new file mode 100644
index 000000000000..73aa9f265135
--- /dev/null
+++ b/www/iridium/files/patch-content_public_common_zygote_features.gni
@@ -0,0 +1,8 @@
+--- content/public/common/zygote_features.gni.orig	2018-08-16 15:28:02.754824000 +0200
++++ content/public/common/zygote_features.gni	2018-08-16 15:28:13.402037000 +0200
+@@ -2,4 +2,4 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
+-use_zygote_handle = is_posix && !is_android && !is_mac
++use_zygote_handle = is_posix && !is_android && !is_mac && !is_bsd
diff --git a/www/iridium/files/patch-content_public_test_browser__test__base.cc b/www/iridium/files/patch-content_public_test_browser__test__base.cc
index 8f203ac3f714..6c747929dc9c 100644
--- a/www/iridium/files/patch-content_public_test_browser__test__base.cc
+++ b/www/iridium/files/patch-content_public_test_browser__test__base.cc
@@ -1,13 +1,13 @@
---- content/public/test/browser_test_base.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/public/test/browser_test_base.cc
-@@ -6,6 +6,10 @@
- 
- #include <stddef.h>
+--- content/public/test/browser_test_base.cc.orig	2018-02-24 16:25:14.000000000 +0100
++++ content/public/test/browser_test_base.cc	2018-03-04 01:33:57.278528000 +0100
+@@ -49,6 +49,10 @@
+ #include "ui/gl/gl_implementation.h"
+ #include "ui/gl/gl_switches.h"
  
 +#if defined(OS_FREEBSD)
 +#include <sys/signal.h>
 +#endif
 +
- #include "base/bind.h"
- #include "base/command_line.h"
- #include "base/debug/stack_trace.h"
+ #if defined(OS_POSIX)
+ #include "base/process/process_handle.h"
+ #endif
diff --git a/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
new file mode 100644
index 000000000000..6601575b8643
--- /dev/null
+++ b/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
@@ -0,0 +1,11 @@
+--- content/renderer/media/stream/processed_local_audio_source.cc.orig	2018-07-19 12:34:51.152323000 +0200
++++ content/renderer/media/stream/processed_local_audio_source.cc	2018-07-19 12:35:37.574081000 +0200
+@@ -282,7 +282,7 @@
+                                         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
diff --git a/www/iridium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc b/www/iridium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc
deleted file mode 100644
index efb2042b2d60..000000000000
--- a/www/iridium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- content/renderer/media/webrtc/processed_local_audio_source.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/renderer/media/webrtc/processed_local_audio_source.cc
-@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture(
-                                         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)
--  // We have a special situation on Linux where the microphone volume can be
-+#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+  // We have a special situation on POSIX 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
-   // even if the reported maximum levels is N, the actual microphone level can
diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc
index 19d8e97b4e56..90e5758b7e5f 100644
--- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/renderer/render_thread_impl.cc
-@@ -206,11 +206,13 @@
+--- content/renderer/render_thread_impl.cc.orig	2018-05-09 21:05:49.000000000 +0200
++++ content/renderer/render_thread_impl.cc	2018-08-16 10:56:34.644130000 +0200
+@@ -214,12 +214,21 @@
  #include "content/common/external_ipc_dumper.h"
  #endif
  
@@ -12,23 +12,40 @@
  #endif
 +#endif
  
++#if defined(OS_BSD)
++#include <stddef.h>
++#include <stdint.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
++
  using base::ThreadRestrictions;
  using blink::WebDocument;
-@@ -1379,7 +1381,7 @@ media::GpuVideoAcceleratorFactories* Ren
-   const bool enable_video_accelerator =
-       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
+ using blink::WebFrame;
+@@ -1096,7 +1105,7 @@
+   GetConnector()->BindInterface(mojom::kBrowserServiceName,
+                                 mojo::MakeRequest(&storage_partition_service_));
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   render_message_filter()->SetThreadPriority(
+       ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
+   render_message_filter()->SetThreadPriority(
+@@ -1304,7 +1313,7 @@
+                      false));
+   GetContentClient()->renderer()->PostCompositorThreadCreated(
+       compositor_task_runner_.get());
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   render_message_filter()->SetThreadPriority(compositor_thread_->ThreadId(),
+                                              base::ThreadPriority::DISPLAY);
+ #endif
+@@ -1584,7 +1593,7 @@
+        gpu::kGpuFeatureStatusEnabled);
    const bool enable_gpu_memory_buffer_video_frames =
+       !is_gpu_compositing_disabled_ &&
 -#if defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
+ #elif defined(OS_WIN)
        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
-       !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
-       !gpu_channel_host->gpu_info().software_rendering;
-@@ -1712,6 +1714,8 @@ void RenderThreadImpl::GetRendererMemory
- #else
-   size_t malloc_usage = minfo.hblkhd + minfo.arena;
- #endif
-+#elif defined(OS_BSD)
-+  size_t malloc_usage = 0;
- #else
-   size_t malloc_usage = GetMallocUsage();
- #endif
diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 2311ab52faf1..86bea927e1d2 100644
--- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -112,7 +112,7 @@
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2018-06-13 00:10:17.000000000 +0200
++++ content/renderer/renderer_blink_platform_impl.cc	2018-07-19 13:00:02.053483000 +0200
+@@ -136,7 +136,7 @@
  
  #if defined(OS_POSIX)
  #include "base/file_descriptor_posix.h"
@@ -9,48 +9,48 @@
  #include <map>
  #include <string>
  
-@@ -206,7 +206,7 @@ class RendererBlinkPlatformImpl::FileUti
-   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
+@@ -249,7 +249,7 @@
+   scoped_refptr<mojom::ThreadSafeFileUtilitiesHostPtr> file_utilities_host_;
  };
  
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
+-#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
  class RendererBlinkPlatformImpl::SandboxSupport
      : public blink::WebSandboxSupport {
   public:
-@@ -252,7 +252,7 @@ RendererBlinkPlatformImpl::RendererBlink
-       renderer_scheduler_(renderer_scheduler),
-       blink_interface_provider_(
-           new BlinkInterfaceProviderImpl(remote_interfaces)) {
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
+@@ -293,7 +293,7 @@
+       default_task_runner_(main_thread_scheduler->DefaultTaskRunner()),
+       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
+       main_thread_scheduler_(main_thread_scheduler) {
+-#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
    if (g_sandbox_enabled && sandboxEnabled()) {
      sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
    } else {
-@@ -288,7 +288,7 @@ RendererBlinkPlatformImpl::~RendererBlin
+@@ -341,7 +341,7 @@
  }
  
  void RendererBlinkPlatformImpl::Shutdown() {
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
-   // SandboxSupport contains a map of WebFontFamily objects, which hold
-   // WebCStrings, which become invalidated when blink is shut down. Hence, we
-   // need to clear that map now, just before blink::shutdown() is called.
-@@ -336,7 +336,7 @@ blink::WebFileUtilities* RendererBlinkPl
+-#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
+   // SandboxSupport contains a map of WebFallbackFont 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()
+@@ -449,7 +449,7 @@
  }
  
- blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
--#if defined(OS_ANDROID) || defined(OS_WIN)
-+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
+ blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
+-#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FUCHSIA)
++#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD)
    // These platforms do not require sandbox support.
    return NULL;
  #else
-@@ -543,7 +543,7 @@ bool RendererBlinkPlatformImpl::SandboxS
-   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
+@@ -657,7 +657,7 @@
+   return content::LoadFont(src_font, out, font_id);
  }
  
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
  
- void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
+ void RendererBlinkPlatformImpl::SandboxSupport::GetFallbackFontForCharacter(
      blink::WebUChar32 character,
diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 1b3430ef03c6..8204fc563cc8 100644
--- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,11 +1,11 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2017-04-19 19:06:34 UTC
-+++ content/renderer/renderer_blink_platform_impl.h
-@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
+--- content/renderer/renderer_blink_platform_impl.h.orig	2017-12-15 02:04:18.000000000 +0100
++++ content/renderer/renderer_blink_platform_impl.h	2017-12-24 15:04:12.309104000 +0100
+@@ -286,7 +286,7 @@
    class FileUtilities;
    std::unique_ptr<FileUtilities> file_utilities_;
  
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
+-#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
    class SandboxSupport;
    std::unique_ptr<SandboxSupport> sandbox_support_;
  #endif
diff --git a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
index 7090b6bafc6a..56a8db8d3799 100644
--- a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
+++ b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2017-04-19 19:06:34 UTC
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/renderer/renderer_main_platform_delegate_linux.cc
-@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf
+@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ
  }
  
  bool RendererMainPlatformDelegate::EnableSandbox() {
@@ -8,7 +8,7 @@
    // The setuid sandbox is started in the zygote process: zygote_main_linux.cc
    // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md
    //
-@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl
+@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
      CHECK_EQ(errno, EPERM);
    }
  #endif  // __x86_64__
diff --git a/www/iridium/files/patch-content_renderer_renderer_main.cc b/www/iridium/files/patch-content_renderer_renderer_main.cc
new file mode 100644
index 000000000000..163e6d46450c
--- /dev/null
+++ b/www/iridium/files/patch-content_renderer_renderer_main.cc
@@ -0,0 +1,20 @@
+--- content/renderer/renderer_main.cc.orig	2018-08-01 00:08:45.000000000 +0200
++++ content/renderer/renderer_main.cc	2018-08-04 19:44:52.562529000 +0200
+@@ -218,7 +218,7 @@
+   InitializeWebRtcModule();
+ 
+   {
+-#if defined(OS_WIN) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
+     // TODO(markus): Check if it is OK to unconditionally move this
+     // instruction down.
+     auto render_process = RenderProcessImpl::Create();
+@@ -228,7 +228,7 @@
+     bool run_loop = true;
+     if (!no_sandbox)
+       run_loop = platform.EnableSandbox();
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+     auto render_process = RenderProcessImpl::Create();
+     RenderThreadImpl::Create(std::move(main_message_loop),
+                              std::move(main_thread_scheduler));
diff --git a/www/iridium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc b/www/iridium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc
index 0e068336ee75..661be8d4d4d4 100644
--- a/www/iridium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc
+++ b/www/iridium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc
@@ -1,15 +1,15 @@
---- content/renderer/webscrollbarbehavior_impl_aura.cc.orig	2017-04-19 19:06:34 UTC
+--- content/renderer/webscrollbarbehavior_impl_aura.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/renderer/webscrollbarbehavior_impl_aura.cc
-@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen
-       blink::WebPointerProperties::Button mouseButton,
-       bool shiftKeyPressed,
-       bool altKeyPressed) {
+@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::ShouldCenterOnThumb(
+     blink::WebPointerProperties::Button mouseButton,
+     bool shiftKeyPressed,
+     bool altKeyPressed) {
 -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (mouseButton == blink::WebPointerProperties::Button::Middle)
+   if (mouseButton == blink::WebPointerProperties::Button::kMiddle)
      return true;
  #endif
-@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::shouldSna
+@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::ShouldSnapBackToDragOri
  // 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).
diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn
deleted file mode 100644
index 0167eba7577f..000000000000
--- a/www/iridium/files/patch-content_shell_BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
---- content/shell/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ content/shell/BUILD.gn
-@@ -295,7 +295,7 @@ static_library("content_shell_lib") {
-     ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [
-       "//build/linux:fontconfig",
-       "//ui/gfx:test_support",
-@@ -319,7 +319,7 @@ static_library("content_shell_lib") {
-     ]
-   }
- 
--  if (is_posix && !is_mac) {
-+  if (is_posix && !is_mac && !is_bsd) {
-     deps += [
-       "//components/crash/content/app",
-       "//components/crash/content/browser",
-@@ -368,7 +368,7 @@ static_library("content_shell_lib") {
-     ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//third_party/freetype-android:freetype" ]
-   }
- 
-@@ -539,7 +539,7 @@ if (is_android) {
-       }
-     }
- 
--    if (is_linux && !is_component_build) {
-+    if ((is_linux || is_bsd) && !is_component_build) {
-       # Set rpath to find our own libfreetype even in a non-component build.
-       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-     }
diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
index 0d8886b4b2a4..f8a4b60779d4 100644
--- a/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
+++ b/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_browser_context.cc.orig	2017-04-19 19:06:34 UTC
+--- content/shell/browser/shell_browser_context.cc.orig	2017-06-05 19:03:07 UTC
 +++ content/shell/browser/shell_browser_context.cc
 @@ -25,7 +25,7 @@
  
@@ -9,7 +9,7 @@
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MACOSX)
  #include "base/base_paths_mac.h"
-@@ -97,7 +97,7 @@ void ShellBrowserContext::InitWhileIOAll
+@@ -101,7 +101,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
  #if defined(OS_WIN)
    CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
    path_ = path_.Append(std::wstring(L"content_shell"));
diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index aa34865eaaae..365f1b1f6dcc 100644
--- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2017-04-24 14:40:29 UTC
-+++ content/shell/browser/shell_browser_main_parts.cc
-@@ -46,7 +46,7 @@
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2017-12-15 02:04:18.000000000 +0100
++++ content/shell/browser/shell_browser_main_parts.cc	2017-12-24 15:15:04.473424000 +0100
+@@ -49,7 +49,7 @@
  #if defined(USE_AURA) && defined(USE_X11)
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
@@ -9,10 +9,10 @@
  #include "ui/base/ime/input_method_initializer.h"
  #endif
  #if defined(OS_CHROMEOS)
-@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMess
- }
- 
- void ShellBrowserMainParts::PreEarlyInitialization() {
+@@ -133,7 +133,7 @@
+ #if defined(USE_X11)
+   ui::SetDefaultX11ErrorHandlers();
+ #endif
 -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
 +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
    ui::InitializeInputMethodForTesting();
diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn
deleted file mode 100644
index 968e41e4bfa4..000000000000
--- a/www/iridium/files/patch-content_test_BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
---- content/test/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ content/test/BUILD.gn
-@@ -785,7 +785,7 @@ test("content_browsertests") {
-     }
-   }
- 
--  if (is_android || is_linux || is_mac || is_win) {
-+  if (is_android || is_linux || is_bsd || is_mac || is_win) {
-     data += [
-       "$root_out_dir/content_shell.pak",
-       "data/",
-@@ -1425,7 +1425,7 @@ test("content_unittests") {
-     sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
-   }
- 
--  if (is_android || is_linux || is_mac || is_win) {
-+  if (is_android || is_linux || is_bsd || is_mac || is_win) {
-     data = [
-       "$root_out_dir/content_shell.pak",
-       "data/",
-@@ -1632,7 +1632,7 @@ test("content_unittests") {
-       "//ui/shell_dialogs:shell_dialogs",
-     ]
- 
--    if (is_linux || is_mac || is_win) {
-+    if (is_linux || is_bsd || is_mac || is_win) {
-       sources +=
-           [ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
-       deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-@@ -1670,7 +1670,7 @@ test("content_unittests") {
-     }
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (use_dbus) {
-       deps += [ "//dbus:test_support" ]
-     }
diff --git a/www/iridium/files/patch-content_test_content_test_suite.cc b/www/iridium/files/patch-content_test_content_test_suite.cc
new file mode 100644
index 000000000000..479bdc199172
--- /dev/null
+++ b/www/iridium/files/patch-content_test_content_test_suite.cc
@@ -0,0 +1,18 @@
+--- content/test/content_test_suite.cc.orig	2017-12-15 02:04:18.000000000 +0100
++++ content/test/content_test_suite.cc	2017-12-24 15:49:56.061177000 +0100
+@@ -87,6 +87,7 @@
+   // 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);
++#if !defined(OS_BSD)
+   if (!is_child_process) {
+     gpu::GPUInfo gpu_info;
+     gpu::CollectBasicGraphicsInfo(&gpu_info);
+@@ -99,6 +100,7 @@
+         gpu_feature_info.disabled_extensions);
+     gl::init::InitializeExtensionSettingsOneOffPlatform();
+   }
++#endif
+   testing::TestEventListeners& listeners =
+       testing::UnitTest::GetInstance()->listeners();
+   listeners.Append(new TestInitializationListener);
diff --git a/www/iridium/files/patch-content_utility_utility_main.cc b/www/iridium/files/patch-content_utility_utility_main.cc
new file mode 100644
index 000000000000..674dacd2a4f1
--- /dev/null
+++ b/www/iridium/files/patch-content_utility_utility_main.cc
@@ -0,0 +1,11 @@
+--- content/utility/utility_main.cc.orig	2018-01-20 16:08:49.686959000 +0100
++++ content/utility/utility_main.cc	2018-01-20 16:09:13.242607000 +0100
+@@ -45,7 +45,7 @@
+   if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog))
+     WaitForDebugger("Utility");
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   // Initializes the sandbox before any threads are created.
+   // TODO(jorgelo): move this after GTK initialization when we enable a strict
+   // Seccomp-BPF policy.
diff --git a/www/iridium/files/patch-content_zygote_zygote_linux.cc b/www/iridium/files/patch-content_zygote_zygote_linux.cc
new file mode 100644
index 000000000000..35f42858a8ee
--- /dev/null
+++ b/www/iridium/files/patch-content_zygote_zygote_linux.cc
@@ -0,0 +1,15 @@
+--- content/zygote/zygote_linux.cc.orig	2018-08-16 15:29:57.557439000 +0200
++++ content/zygote/zygote_linux.cc	2018-08-16 15:30:18.097569000 +0200
+@@ -1,6 +1,7 @@
+ // Copyright (c) 2012 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.
++#if 0
+ 
+ #include "content/zygote/zygote_linux.h"
+ 
+@@ -666,3 +667,4 @@
+ }
+ 
+ }  // namespace content
++#endif
diff --git a/www/iridium/files/patch-content_zygote_zygote_main_linux.cc b/www/iridium/files/patch-content_zygote_zygote_main_linux.cc
new file mode 100644
index 000000000000..345fbe77ab0d
--- /dev/null
+++ b/www/iridium/files/patch-content_zygote_zygote_main_linux.cc
@@ -0,0 +1,48 @@
+--- content/zygote/zygote_main_linux.cc.orig	2018-08-16 15:24:32.575502000 +0200
++++ content/zygote/zygote_main_linux.cc	2018-08-16 15:26:32.569493000 +0200
+@@ -11,7 +11,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -101,6 +103,7 @@
+ // created through the setuid sandbox.
+ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+                              base::OnceClosure post_fork_parent_callback) {
++#if !defined(OS_BSD)
+   DCHECK(setuid_sandbox);
+   DCHECK(setuid_sandbox->IsSuidSandboxChild());
+ 
+@@ -133,6 +136,9 @@
+ 
+   CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers());
+   return true;
++#else
++  return false;
++#endif
+ }
+ 
+ static void DropAllCapabilities(int proc_fd) {
+@@ -178,6 +184,7 @@
+ 
+ bool ZygoteMain(
+     std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
++#if !defined(OS_BSD)
+   sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
+ 
+   auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
+@@ -239,6 +246,9 @@
+ 
+   // This function call can return multiple times, once per fork().
+   return zygote.ProcessRequests();
++#else
++  return false;
++#endif
+ }
+ 
+ }  // namespace content
diff --git a/www/iridium/files/patch-crypto_nss__util.cc b/www/iridium/files/patch-crypto_nss__util.cc
deleted file mode 100644
index 249910cbcc3b..000000000000
--- a/www/iridium/files/patch-crypto_nss__util.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- crypto/nss_util.cc.orig	2017-04-19 19:06:34 UTC
-+++ crypto/nss_util.cc
-@@ -20,7 +20,7 @@
- #include "base/threading/thread_task_runner_handle.h"
- #include "crypto/nss_util_internal.h"
- 
--#if defined(OS_OPENBSD)
-+#if defined(OS_BSD)
- #include <sys/mount.h>
- #include <sys/param.h>
- #endif
-@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con
-   base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
-   if (base::GetFileSystemType(database_dir, &fs_type))
-     db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
--#elif defined(OS_OPENBSD)
-+#elif defined(OS_BSD)
-   struct statfs buf;
-   if (statfs(database_dir.value().c_str(), &buf) == 0)
--    db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0);
-+    db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0);
- #else
-   NOTIMPLEMENTED();
- #endif
diff --git a/www/iridium/files/patch-device_BUILD.gn b/www/iridium/files/patch-device_BUILD.gn
deleted file mode 100644
index 1feb2146b8ec..000000000000
--- a/www/iridium/files/patch-device_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ device/BUILD.gn
-@@ -200,7 +200,7 @@ test("device_unittests") {
-     ]
-   }
- 
--  if ((is_chromeos || is_linux) && use_dbus) {
-+  if ((is_chromeos || is_linux || is_bsd) && use_dbus) {
-     configs += [ "//build/config/linux/dbus" ]
- 
-     sources += [
diff --git a/www/iridium/files/patch-device_battery_BUILD.gn b/www/iridium/files/patch-device_battery_BUILD.gn
deleted file mode 100644
index 8c51ce4f7726..000000000000
--- a/www/iridium/files/patch-device_battery_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/battery/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ device/battery/BUILD.gn
-@@ -47,7 +47,7 @@ if (!is_android) {
-       ]
-     }
- 
--    if (is_linux && !is_chromeos) {
-+    if ((is_linux || is_bsd) && !is_chromeos) {
-       if (use_dbus) {
-         configs += [ "//build/config/linux/dbus" ]
-         deps += [ "//dbus" ]
diff --git a/www/iridium/files/patch-device_bluetooth_BUILD.gn b/www/iridium/files/patch-device_bluetooth_BUILD.gn
index a27c4596720c..2f442e9cdf33 100644
--- a/www/iridium/files/patch-device_bluetooth_BUILD.gn
+++ b/www/iridium/files/patch-device_bluetooth_BUILD.gn
@@ -1,6 +1,6 @@
---- device/bluetooth/BUILD.gn.orig	2017-04-19 19:06:34 UTC
+--- device/bluetooth/BUILD.gn.orig	2017-06-05 19:03:07 UTC
 +++ device/bluetooth/BUILD.gn
-@@ -200,7 +200,7 @@ component("bluetooth") {
+@@ -202,7 +202,7 @@ component("bluetooth") {
      ]
    }
  
diff --git a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
index 26527f14a500..e53aab806c9f 100644
--- a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
+++ b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,6 +1,6 @@
---- device/gamepad/gamepad_provider.cc.orig	2017-04-19 19:06:34 UTC
+--- device/gamepad/gamepad_provider.cc.orig	2017-06-05 19:03:07 UTC
 +++ device/gamepad/gamepad_provider.cc
-@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::un
+@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
      monitor->AddDevicesChangedObserver(this);
  
    polling_thread_.reset(new base::Thread("Gamepad polling thread"));
diff --git a/www/iridium/files/patch-device_geolocation_BUILD.gn b/www/iridium/files/patch-device_geolocation_BUILD.gn
deleted file mode 100644
index 1f4d0ae14b36..000000000000
--- a/www/iridium/files/patch-device_geolocation_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/geolocation/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ device/geolocation/BUILD.gn
-@@ -89,7 +89,7 @@ component("geolocation") {
-   if (is_android) {
-     sources -= [ "wifi_data_provider_common.cc" ]
-   }
--  if (is_chromeos || (is_linux && !use_dbus)) {
-+  if (is_chromeos || (is_linux && !use_dbus) || is_bsd) {
-     sources -= [ "wifi_data_provider_linux.cc" ]
-   }
-   if (is_linux && use_dbus) {
diff --git a/www/iridium/files/patch-device_geolocation_location__arbitrator.cc b/www/iridium/files/patch-device_geolocation_location__arbitrator.cc
index b316169411bf..873d77eb2e4c 100644
--- a/www/iridium/files/patch-device_geolocation_location__arbitrator.cc
+++ b/www/iridium/files/patch-device_geolocation_location__arbitrator.cc
@@ -1,11 +1,11 @@
---- device/geolocation/location_arbitrator.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/geolocation/location_arbitrator.cc
-@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr
- 
+--- device/geolocation/location_arbitrator.cc.orig	2017-12-15 02:04:18.000000000 +0100
++++ device/geolocation/location_arbitrator.cc	2017-12-24 15:54:40.400280000 +0100
+@@ -173,7 +173,7 @@
  std::unique_ptr<LocationProvider>
  LocationArbitrator::NewSystemLocationProvider() {
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+-    defined(OS_FUCHSIA)
++    defined(OS_FUCHSIA) || defined(OS_BSD)
    return nullptr;
  #else
    return device::NewSystemLocationProvider();
diff --git a/www/iridium/files/patch-device_hid_BUILD.gn b/www/iridium/files/patch-device_hid_BUILD.gn
deleted file mode 100644
index 3839cd3a872f..000000000000
--- a/www/iridium/files/patch-device_hid_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
---- device/hid/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ device/hid/BUILD.gn
-@@ -56,6 +56,13 @@ source_set("hid") {
-     deps += [ "//device/udev_linux" ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "hid_connection_linux.cc",
-+      "hid_connection_linux.h",
-+    ]
-+  }
-+
-   if (is_chromeos) {
-     deps += [ "//chromeos" ]
-   }
diff --git a/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h b/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h
deleted file mode 100644
index f1731ef81610..000000000000
--- a/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/media_transfer_protocol/media_transfer_protocol_daemon_client.h.orig	2017-04-19 19:06:34 UTC
-+++ device/media_transfer_protocol/media_transfer_protocol_daemon_client.h
-@@ -19,7 +19,7 @@
- #include "base/macros.h"
- #include "build/build_config.h"
- 
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
- #error "Only used on Linux and ChromeOS"
- #endif
- 
diff --git a/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h b/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h
deleted file mode 100644
index c12a44a23603..000000000000
--- a/www/iridium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig	2017-04-19 19:06:34 UTC
-+++ device/media_transfer_protocol/media_transfer_protocol_manager.h
-@@ -15,7 +15,7 @@
- #include "base/memory/ref_counted.h"
- #include "build/build_config.h"
- 
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
- #error "Only used on Linux and ChromeOS"
- #endif
- 
diff --git a/www/iridium/files/patch-device_sensors_data__fetcher__shared__memory.h b/www/iridium/files/patch-device_sensors_data__fetcher__shared__memory.h
deleted file mode 100644
index 3e393135e0e7..000000000000
--- a/www/iridium/files/patch-device_sensors_data__fetcher__shared__memory.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/sensors/data_fetcher_shared_memory.h.orig	2017-04-19 19:06:34 UTC
-+++ device/sensors/data_fetcher_shared_memory.h
-@@ -44,7 +44,7 @@ class DEVICE_SENSOR_EXPORT DataFetcherSh
-   bool Start(ConsumerType consumer_type, void* buffer) override;
-   bool Stop(ConsumerType consumer_type) override;
- 
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- #if !defined(OS_CHROMEOS)
-   DeviceMotionHardwareBuffer* motion_buffer_ = nullptr;
-   DeviceOrientationHardwareBuffer* orientation_buffer_ = nullptr;
diff --git a/www/iridium/files/patch-device_serial_BUILD.gn b/www/iridium/files/patch-device_serial_BUILD.gn
index 5e66e46f4d31..95bf26832ae0 100644
--- a/www/iridium/files/patch-device_serial_BUILD.gn
+++ b/www/iridium/files/patch-device_serial_BUILD.gn
@@ -1,24 +1,25 @@
---- device/serial/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ device/serial/BUILD.gn
-@@ -6,7 +6,7 @@ import("//build/config/features.gni")
+--- device/serial/BUILD.gn.orig	2017-12-15 02:04:18.000000000 +0100
++++ device/serial/BUILD.gn	2017-12-25 06:34:10.834395000 +0100
+@@ -6,7 +6,7 @@
  import("//mojo/public/tools/bindings/mojom.gni")
  
  # Library works only on desktop platforms.
--assert(is_win || is_linux || is_mac)
-+assert(is_win || is_linux || is_bsd || is_mac)
+-if (is_win || is_linux || is_mac) {
++if (is_win || is_linux || is_mac || is_bsd) {
+   config("platform_support") {
+     visibility = [ ":serial" ]
+     if (is_win) {
+@@ -57,6 +57,13 @@
+       "//net",
+       "//third_party/re2",
+     ]
++
++    if (is_bsd) {
++      sources -= [
++        "serial_device_enumerator_linux.cc",
++        "serial_device_enumerator_linux.h",
++      ]
++    }
  
- config("platform_support") {
-   visibility = [ ":serial" ]
-@@ -55,6 +55,12 @@ static_library("serial") {
-   if (use_udev) {
-     deps += [ "//device/udev_linux" ]
-   }
-+  if (is_bsd) {
-+    sources -= [
-+      "serial_device_enumerator_linux.cc",
-+      "serial_device_enumerator_linux.h"
-+    ]
-+  }
-   if (is_chromeos) {
-     deps += [
-       "//chromeos",
+     if (use_udev) {
+       deps += [ "//device/udev_linux" ]
diff --git a/www/iridium/files/patch-device_serial_serial__io__handler__posix.cc b/www/iridium/files/patch-device_serial_serial__io__handler__posix.cc
index b515cc9b1848..d5f4c912ba32 100644
--- a/www/iridium/files/patch-device_serial_serial__io__handler__posix.cc
+++ b/www/iridium/files/patch-device_serial_serial__io__handler__posix.cc
@@ -1,6 +1,6 @@
---- device/serial/serial_io_handler_posix.cc.orig	2017-04-19 19:06:34 UTC
+--- device/serial/serial_io_handler_posix.cc.orig	2017-06-05 19:03:07 UTC
 +++ device/serial/serial_io_handler_posix.cc
-@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate,
+@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)
      BITRATE_TO_SPEED_CASE(38400)
diff --git a/www/iridium/files/patch-device_usb_BUILD.gn b/www/iridium/files/patch-device_usb_BUILD.gn
new file mode 100644
index 000000000000..b48d215b1fe4
--- /dev/null
+++ b/www/iridium/files/patch-device_usb_BUILD.gn
@@ -0,0 +1,21 @@
+--- device/usb/BUILD.gn.orig	2017-06-16 17:45:56.630063000 +0200
++++ device/usb/BUILD.gn	2017-06-16 17:59:22.070474000 +0200
+@@ -97,10 +97,17 @@
+     libs = [ "setupapi.lib" ]
+   }
+ 
+-  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",
+     ]
+   }
+ 
diff --git a/www/iridium/files/patch-device_usb_usb__context.cc b/www/iridium/files/patch-device_usb_usb__context.cc
index 1379b24fcf9c..1e07396fa3a4 100644
--- a/www/iridium/files/patch-device_usb_usb__context.cc
+++ b/www/iridium/files/patch-device_usb_usb__context.cc
@@ -1,20 +1,6 @@
---- device/usb/usb_context.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_context.cc
-@@ -9,8 +9,13 @@
- #include "base/macros.h"
- #include "base/threading/simple_thread.h"
- #include "device/usb/usb_error.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/interrupt.h"
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
-@@ -58,7 +63,9 @@ void UsbContext::UsbEventHandler::Run() 
+--- device/usb/usb_context.cc.orig	2018-06-13 00:10:18.000000000 +0200
++++ device/usb/usb_context.cc	2018-07-20 12:52:29.240720000 +0200
+@@ -58,7 +58,9 @@
  
  void UsbContext::UsbEventHandler::Stop() {
    base::subtle::Release_Store(&running_, 0);
diff --git a/www/iridium/files/patch-device_usb_usb__context__unittest.cc b/www/iridium/files/patch-device_usb_usb__context__unittest.cc
deleted file mode 100644
index f54b7d76f1ab..000000000000
--- a/www/iridium/files/patch-device_usb_usb__context__unittest.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb_context_unittest.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_context_unittest.cc
-@@ -7,7 +7,11 @@
- #include "build/build_config.h"
- #include "device/usb/usb_context.h"
- #include "testing/gtest/include/gtest/gtest.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/iridium/files/patch-device_usb_usb__device__handle__impl.cc b/www/iridium/files/patch-device_usb_usb__device__handle__impl.cc
deleted file mode 100644
index 3ba8fcde82e4..000000000000
--- a/www/iridium/files/patch-device_usb_usb__device__handle__impl.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- device/usb/usb_device_handle_impl.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_device_handle_impl.cc
-@@ -25,7 +25,11 @@
- #include "device/usb/usb_error.h"
- #include "device/usb/usb_service.h"
- #include "net/base/io_buffer.h"
--#include "third_party/libusb/src/libusb/libusb.h"
-+#if defined(OS_FREEBSD)
-+#  include "libusb.h"
-+#else
-+#  include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/iridium/files/patch-device_usb_usb__device__handle__impl.h b/www/iridium/files/patch-device_usb_usb__device__handle__impl.h
deleted file mode 100644
index 4cf2a1875c27..000000000000
--- a/www/iridium/files/patch-device_usb_usb__device__handle__impl.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- device/usb/usb_device_handle_impl.h.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_device_handle_impl.h
-@@ -18,7 +18,12 @@
- #include "base/memory/ref_counted.h"
- #include "base/threading/thread_checker.h"
- #include "device/usb/usb_device_handle.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace base {
- class SequencedTaskRunner;
diff --git a/www/iridium/files/patch-device_usb_usb__device__impl.cc b/www/iridium/files/patch-device_usb_usb__device__impl.cc
deleted file mode 100644
index e29998454a2d..000000000000
--- a/www/iridium/files/patch-device_usb_usb__device__impl.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb_device_impl.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_device_impl.cc
-@@ -22,7 +22,11 @@
- #include "device/usb/usb_descriptors.h"
- #include "device/usb/usb_device_handle_impl.h"
- #include "device/usb/usb_error.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/iridium/files/patch-device_usb_usb__error.cc b/www/iridium/files/patch-device_usb_usb__error.cc
index b650b7733252..56ead98022de 100644
--- a/www/iridium/files/patch-device_usb_usb__error.cc
+++ b/www/iridium/files/patch-device_usb_usb__error.cc
@@ -1,14 +1,11 @@
---- device/usb/usb_error.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_error.cc
-@@ -4,7 +4,11 @@
- 
- #include "device/usb/usb_error.h"
- 
-+#if defined(__FreeBSD__)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
+--- device/usb/usb_error.cc.orig	2018-06-13 00:10:18.000000000 +0200
++++ device/usb/usb_error.cc	2018-07-20 12:55:34.901660000 +0200
+@@ -9,7 +9,7 @@
  namespace device {
  
+ std::string ConvertPlatformUsbErrorToString(int errcode) {
+-  return libusb_strerror(static_cast<libusb_error>(errcode));
++  return "";
+ }
+ 
+ }  // namespace device
diff --git a/www/iridium/files/patch-device_usb_usb__service__impl.cc b/www/iridium/files/patch-device_usb_usb__service__impl.cc
index 861a8249b284..9b37f5c8bd92 100644
--- a/www/iridium/files/patch-device_usb_usb__service__impl.cc
+++ b/www/iridium/files/patch-device_usb_usb__service__impl.cc
@@ -1,19 +1,6 @@
---- device/usb/usb_service_impl.cc.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_service_impl.cc
-@@ -25,7 +25,11 @@
- #include "device/usb/usb_error.h"
- #include "device/usb/webusb_descriptors.h"
- #include "net/base/io_buffer.h"
--#include "third_party/libusb/src/libusb/libusb.h"
-+#if defined(OS_FREEBSD)
-+#  include <libusb.h>
-+#else
-+#  include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- #if defined(OS_WIN)
- #define INITGUID
-@@ -231,8 +235,10 @@ UsbServiceImpl::UsbServiceImpl(
+--- device/usb/usb_service_impl.cc.orig	2018-06-13 00:10:18.000000000 +0200
++++ device/usb/usb_service_impl.cc	2018-07-20 12:49:59.699912000 +0200
+@@ -239,8 +239,10 @@
  }
  
  UsbServiceImpl::~UsbServiceImpl() {
@@ -21,10 +8,10 @@
    if (hotplug_enabled_)
      libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
 +#endif // !defined(OS_FREEBSD)
-   for (auto* platform_device : ignored_devices_)
-     libusb_unref_device(platform_device);
  }
-@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped
+ 
+ void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) {
+@@ -295,6 +297,7 @@
  
    context_ = std::move(context);
  
@@ -32,7 +19,7 @@
    int rv = libusb_hotplug_register_callback(
        context_->context(),
        static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped
+@@ -307,6 +310,7 @@
  
    // This will call any enumeration callbacks queued while initializing.
    RefreshDevices();
@@ -40,19 +27,19 @@
  
  #if defined(OS_WIN)
    DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped
+@@ -503,6 +507,7 @@
    device->OnDisconnect();
  }
  
 +#if !defined(OS_FREEBSD)
  // static
  int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
-                                                 PlatformUsbDevice device,
-@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
+                                                 libusb_device* device_raw,
+@@ -537,6 +542,7 @@
  
    return 0;
  }
 +#endif // !defined(OS_FREEBSD)
  
- void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
-   DCHECK(CalledOnValidThread());
+ void UsbServiceImpl::OnPlatformDeviceAdded(
+     ScopedLibusbDeviceRef platform_device) {
diff --git a/www/iridium/files/patch-device_usb_usb__service__impl.h b/www/iridium/files/patch-device_usb_usb__service__impl.h
index 115e64abf2d6..a59648c035d4 100644
--- a/www/iridium/files/patch-device_usb_usb__service__impl.h
+++ b/www/iridium/files/patch-device_usb_usb__service__impl.h
@@ -1,34 +1,20 @@
---- device/usb/usb_service_impl.h.orig	2017-04-19 19:06:34 UTC
-+++ device/usb/usb_service_impl.h
-@@ -15,7 +15,13 @@
- #include "build/build_config.h"
- #include "device/usb/usb_context.h"
- #include "device/usb/usb_device_impl.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
-+
- 
- #if defined(OS_WIN)
- #include "base/scoped_observer.h"
-@@ -73,11 +79,13 @@ class UsbServiceImpl :
+--- device/usb/usb_service_impl.h.orig	2018-06-13 00:10:18.000000000 +0200
++++ device/usb/usb_service_impl.h	2018-07-20 12:47:42.413625000 +0200
+@@ -73,11 +73,13 @@
                   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,
-                                          PlatformUsbDevice device,
+                                          libusb_device* device,
                                           libusb_hotplug_event event,
                                           void* user_data);
 +#endif
    // These functions release a reference to the provided platform device.
-   void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
-   void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
-@@ -94,7 +102,9 @@ class UsbServiceImpl :
+   void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device);
+   void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device);
+@@ -95,7 +97,9 @@
    // connected instead of only when a full enumeration is requested.
    // TODO(reillyg): Support this on all platforms. crbug.com/411715
    bool hotplug_enabled_ = false;
diff --git a/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
index 1b226d273ab4..4866eea42910 100644
--- a/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
+++ b/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
@@ -1,9 +1,9 @@
---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2017-04-19 19:06:34 UTC
-+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
-@@ -29,7 +29,11 @@
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2018-03-20 23:05:25.000000000 +0100
++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc	2018-03-24 17:41:04.749250000 +0100
+@@ -28,7 +28,11 @@
+ #include "extensions/common/extension.h"
  #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
  #include "net/http/http_util.h"
- #include "net/url_request/url_request.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message_service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message_service.cc
new file mode 100644
index 000000000000..3f7cf8b54963
--- /dev/null
+++ b/www/iridium/files/patch-extensions_browser_api_messaging_message_service.cc
@@ -0,0 +1,20 @@
+--- extensions/browser/api/messaging/message_service.cc.orig	2017-12-24 16:01:52.241792000 +0100
++++ extensions/browser/api/messaging/message_service.cc	2017-12-24 16:02:30.296242000 +0100
+@@ -59,7 +59,7 @@
+ 
+ const char kReceivingEndDoesntExistError[] =
+     "Could not establish connection. Receiving end does not exist.";
+-#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 kMissingPermissionError[] =
+     "Access to native messaging requires nativeMessaging permission.";
+ const char kProhibitedByPoliciesError[] =
+@@ -330,7 +330,7 @@
+   if (!source)
+     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 =
diff --git a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
index d94b27c67d46..50781b4c63ac 100644
--- a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
+++ b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__event__router__factory.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig	2017-04-19 19:06:34 UTC
+--- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig	2017-06-05 19:03:07 UTC
 +++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc
 @@ -13,6 +13,7 @@
  
@@ -8,7 +8,7 @@
  // static
  NetworkingPrivateEventRouter*
  NetworkingPrivateEventRouterFactory::GetForProfile(
-@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory
+@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsCre
  bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const {
    return true;
  }
diff --git a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc
new file mode 100644
index 000000000000..6e4e78c45718
--- /dev/null
+++ b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc
@@ -0,0 +1,20 @@
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2018-01-21 13:32:48.139964000 +0100
++++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc	2018-01-21 13:33:33.051307000 +0100
+@@ -11,7 +11,7 @@
+ 
+ #if defined(OS_CHROMEOS)
+ #include "extensions/browser/api/networking_private/networking_private_chromeos.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "extensions/browser/api/networking_private/networking_private_linux.h"
+ #elif defined(OS_WIN) || defined(OS_MACOSX)
+ #include "components/wifi/wifi_service.h"
+@@ -61,7 +61,7 @@
+   NetworkingPrivateDelegate* delegate;
+ #if defined(OS_CHROMEOS)
+   delegate = new NetworkingPrivateChromeOS(browser_context);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   delegate = new NetworkingPrivateLinux();
+ #elif defined(OS_WIN) || defined(OS_MACOSX)
+   std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
diff --git a/www/iridium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/iridium/files/patch-extensions_browser_api_serial_serial__api.cc
deleted file mode 100644
index 5b69f283de98..000000000000
--- a/www/iridium/files/patch-extensions_browser_api_serial_serial__api.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- extensions/browser/api/serial/serial_api.cc.orig	2017-04-19 19:06:34 UTC
-+++ extensions/browser/api/serial/serial_api.cc
-@@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare()
- void SerialGetDevicesFunction::Work() {
-   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
- 
-+#if !defined(OS_BSD)
-   std::unique_ptr<device::SerialDeviceEnumerator> enumerator =
-       device::SerialDeviceEnumerator::Create();
-   std::vector<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
-   results_ = serial::GetDevices::Results::Create(
-       mojo::ConvertTo<std::vector<serial::DeviceInfo>>(devices));
-+#endif
- }
- 
- SerialConnectFunction::SerialConnectFunction() {
diff --git a/www/iridium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/iridium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
index 64959cb94e89..86bde7e99dd7 100644
--- a/www/iridium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
+++ b/www/iridium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
@@ -1,9 +1,9 @@
---- extensions/browser/api/web_request/form_data_parser.cc.orig	2017-04-19 19:06:34 UTC
-+++ extensions/browser/api/web_request/form_data_parser.cc
+--- extensions/browser/api/web_request/form_data_parser.cc.orig	2018-06-13 00:10:18.000000000 +0200
++++ extensions/browser/api/web_request/form_data_parser.cc	2018-07-19 13:36:19.375722000 +0200
 @@ -15,7 +15,11 @@
  #include "base/values.h"
  #include "net/base/escape.h"
- #include "net/url_request/url_request.h"
+ #include "net/http/http_request_headers.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
diff --git a/www/iridium/files/patch-extensions_common_api__permission_features.json b/www/iridium/files/patch-extensions_common_api__permission_features.json
new file mode 100644
index 000000000000..eeabd65225a2
--- /dev/null
+++ b/www/iridium/files/patch-extensions_common_api__permission_features.json
@@ -0,0 +1,29 @@
+--- extensions/common/api/_permission_features.json.orig	2018-01-21 13:35:05.074386000 +0100
++++ extensions/common/api/_permission_features.json	2018-01-21 13:36:11.759479000 +0100
+@@ -128,7 +128,7 @@
+   "bluetoothPrivate": {
+     "channel": "stable",
+     "extension_types": ["platform_app"],
+-    "platforms": ["chromeos", "win", "mac", "linux"],
++    "platforms": ["chromeos", "win", "mac", "linux", "bsd"],
+     "whitelist": [
+       "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
+       "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
+@@ -422,7 +422,7 @@
+   }, {
+     "channel": "stable",
+     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
+-    "platforms": ["chromeos", "mac", "win", "linux"],
++    "platforms": ["chromeos", "mac", "win", "linux", "bsd"],
+     "whitelist": [
+       "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
+       "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
+@@ -452,7 +452,7 @@
+   "networkingPrivate": {
+     "channel": "stable",
+     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
+-    "platforms": ["chromeos", "mac", "win", "linux"],
++    "platforms": ["chromeos", "mac", "win", "linux", "bsd"],
+     "whitelist": [
+       // DO NOT ADD ANY MORE ENTRIES HERE.
+       // networkingPrivate is being migrated to networking.onc.
diff --git a/www/iridium/files/patch-extensions_common_feature_switch.cc b/www/iridium/files/patch-extensions_common_feature_switch.cc
new file mode 100644
index 000000000000..cba8db1323dc
--- /dev/null
+++ b/www/iridium/files/patch-extensions_common_feature_switch.cc
@@ -0,0 +1,14 @@
+--- extensions/common/feature_switch.cc.orig	2018-03-20 23:05:25.000000000 +0100
++++ extensions/common/feature_switch.cc	2018-03-24 17:46:50.886191000 +0100
+@@ -46,11 +46,7 @@
+                          FeatureSwitch::DEFAULT_ENABLED),
+         load_media_router_component_extension(
+             kLoadMediaRouterComponentExtensionFlag,
+-#if defined(GOOGLE_CHROME_BUILD)
+             FeatureSwitch::DEFAULT_ENABLED)
+-#else
+-            FeatureSwitch::DEFAULT_DISABLED)
+-#endif  // defined(GOOGLE_CHROME_BUILD)
+   {
+   }
+ 
diff --git a/www/iridium/files/patch-extensions_common_features_feature.cc b/www/iridium/files/patch-extensions_common_features_feature.cc
new file mode 100644
index 000000000000..f8decc7f2947
--- /dev/null
+++ b/www/iridium/files/patch-extensions_common_features_feature.cc
@@ -0,0 +1,11 @@
+--- extensions/common/features/feature.cc.orig	2018-01-21 13:38:52.998785000 +0100
++++ extensions/common/features/feature.cc	2018-01-21 13:39:29.946264000 +0100
+@@ -26,6 +26,8 @@
+   return MACOSX_PLATFORM;
+ #elif defined(OS_WIN)
+   return WIN_PLATFORM;
++#elif defined(OS_BSD)
++  return LINUX_PLATFORM;
+ #else
+   return UNSPECIFIED_PLATFORM;
+ #endif
diff --git a/www/iridium/files/patch-gpu_BUILD.gn b/www/iridium/files/patch-gpu_BUILD.gn
deleted file mode 100644
index b1e3465b5410..000000000000
--- a/www/iridium/files/patch-gpu_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/BUILD.gn
-@@ -96,7 +96,7 @@ test("command_buffer_gles2_tests") {
-     libs += [ "android" ]
-     deps += [ "//ui/android:ui_java" ]
-   }
--  if (is_linux && !is_component_build) {
-+  if ((is_linux || is_bsd) && !is_component_build) {
-     configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-   }
- }
diff --git a/www/iridium/files/patch-gpu_config_BUILD.gn b/www/iridium/files/patch-gpu_config_BUILD.gn
deleted file mode 100644
index 6c0ff48a0330..000000000000
--- a/www/iridium/files/patch-gpu_config_BUILD.gn
+++ /dev/null
@@ -1,27 +0,0 @@
---- gpu/config/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/config/BUILD.gn
-@@ -8,7 +8,8 @@ import("//build/config/ui.gni")
- 
- declare_args() {
-   # Use the PCI lib to collect GPU information on Linux.
--  use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
-+  use_libpci = (is_linux || is_bsd) &&
-+               (!is_chromecast || is_cast_desktop_build) &&
-                (use_x11 || use_ozone)
- }
- 
-@@ -101,6 +102,14 @@ source_set("config_sources") {
-       ]
-     }
-   }
-+
-+  if (is_bsd) {
-+    sources -= [
-+      "gpu_info_collector_linux.cc",
-+      "gpu_info_collector_linux.h"
-+    ]
-+  }
-+
-   if (is_mac) {
-     libs = [
-       "IOKit.framework",
diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc
index 6167136d871a..63b73889d355 100644
--- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,9 +1,9 @@
---- gpu/config/gpu_control_list.cc.orig	2017-04-19 19:06:34 UTC
-+++ gpu/config/gpu_control_list.cc
-@@ -19,7 +19,11 @@
- #include "base/sys_info.h"
+--- gpu/config/gpu_control_list.cc.orig	2017-12-15 02:04:19.000000000 +0100
++++ gpu/config/gpu_control_list.cc	2017-12-24 16:25:45.151636000 +0100
+@@ -16,7 +16,11 @@
+ #include "base/values.h"
+ #include "build/build_config.h"
  #include "gpu/config/gpu_info.h"
- #include "gpu/config/gpu_util.h"
 +#if defined(OS_BSD)
 +#include <re2/re2.h>
 +#else
@@ -12,8 +12,8 @@
  
  namespace gpu {
  namespace {
-@@ -1183,7 +1187,7 @@ GpuControlList::GpuControlListEntry::GLT
- GpuControlList::GpuControlListEntry::GetDefaultGLType() {
+@@ -211,7 +215,7 @@
+ GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
  #if defined(OS_CHROMEOS)
    return kGLTypeGL;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
@@ -21,10 +21,10 @@
    return kGLTypeGL;
  #elif defined(OS_MACOSX)
    return kGLTypeGL;
-@@ -1642,7 +1646,7 @@ GpuControlList::OsType GpuControlList::G
-   return kOsWin;
- #elif defined(OS_ANDROID)
+@@ -644,7 +648,7 @@
    return kOsAndroid;
+ #elif defined(OS_FUCHSIA)
+   return kOsFuchsia;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    return kOsLinux;
diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list__unittest.cc b/www/iridium/files/patch-gpu_config_gpu__control__list__unittest.cc
deleted file mode 100644
index ee60865ae3bb..000000000000
--- a/www/iridium/files/patch-gpu_config_gpu__control__list__unittest.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- gpu/config/gpu_control_list_unittest.cc.orig	2017-04-19 19:06:34 UTC
-+++ gpu/config/gpu_control_list_unittest.cc
-@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs
-   features = control_list->MakeDecision(
-       GpuControlList::kOsLinux, kOsVersion, gpu_info());
-   EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
--    defined(OS_OPENBSD)
-+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
-   // ControlList entries will be filtered to the current OS only upon loading.
-   EXPECT_TRUE(control_list->LoadList(
-       vendor_json, GpuControlList::kCurrentOsOnly));
diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc
deleted file mode 100644
index f5750b5467b4..000000000000
--- a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- gpu/config/gpu_info_collector.cc.orig	2017-04-19 19:06:34 UTC
-+++ gpu/config/gpu_info_collector.cc
-@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL(
-   gpu_info->pixel_shader_version = glsl_version;
-   gpu_info->vertex_shader_version = glsl_version;
- 
-+#if !defined(OS_BSD)
-   IdentifyActiveGPU(gpu_info);
-   return CollectDriverInfoGL(gpu_info);
-+#endif
- }
- 
- void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector__linux.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector__linux.cc
new file mode 100644
index 000000000000..ac00119d61d6
--- /dev/null
+++ b/www/iridium/files/patch-gpu_config_gpu__info__collector__linux.cc
@@ -0,0 +1,14 @@
+--- gpu/config/gpu_info_collector_linux.cc.orig	2018-08-16 22:39:32.660704000 +0200
++++ gpu/config/gpu_info_collector_linux.cc	2018-08-16 22:40:00.267758000 +0200
+@@ -8,7 +8,11 @@
+ #include "gpu/config/gpu_info_collector.h"
+ #include "gpu/config/gpu_switches.h"
+ #include "third_party/angle/src/gpu_info_util/SystemInfo.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace gpu {
+ 
diff --git a/www/iridium/files/patch-gpu_config_gpu__test__config.cc b/www/iridium/files/patch-gpu_config_gpu__test__config.cc
index b2c8de76102f..304858ebfbc9 100644
--- a/www/iridium/files/patch-gpu_config_gpu__test__config.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__test__config.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_test_config.cc.orig	2017-04-19 19:06:34 UTC
-+++ gpu/config/gpu_test_config.cc
-@@ -24,7 +24,7 @@ namespace {
+--- gpu/config/gpu_test_config.cc.orig	2018-03-20 23:05:26.000000000 +0100
++++ gpu/config/gpu_test_config.cc	2018-03-26 13:47:37.264475000 +0200
+@@ -24,7 +24,7 @@
  GPUTestConfig::OS GetCurrentOS() {
  #if defined(OS_CHROMEOS)
    return GPUTestConfig::kOsChromeOS;
@@ -9,22 +9,3 @@
    return GPUTestConfig::kOsLinux;
  #elif defined(OS_WIN)
    int32_t major_version = 0;
-@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
-   bool rt;
-   if (gpu_info == NULL) {
-     GPUInfo my_gpu_info;
-+#if defined(OS_FREEBSD)
-+    rt = false;
-+    LOG(WARNING) << "CollectGpuID not present on FreeBSD";
-+#else
-     CollectInfoResult result = CollectGpuID(
-         &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
-     if (result != kCollectInfoSuccess) {
-@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
-     } else {
-       rt = SetGPUInfo(my_gpu_info);
-     }
-+#endif
-   } else {
-     rt = SetGPUInfo(*gpu_info);
-   }
diff --git a/www/iridium/files/patch-gpu_gles2__conform__support_BUILD.gn b/www/iridium/files/patch-gpu_gles2__conform__support_BUILD.gn
deleted file mode 100644
index 82d02b2c1408..000000000000
--- a/www/iridium/files/patch-gpu_gles2__conform__support_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpu/gles2_conform_support/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/gles2_conform_support/BUILD.gn
-@@ -60,7 +60,7 @@ executable("gles2_conform_support") {
-     "//gpu/gles2_conform_support/egl",
-     "//ui/gl",
-   ]
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "native/egl_native_aura.cc",
-       "native/egl_native_x11.cc",
-@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) {
-       # Must be done this way for warning flags to be ordered correctly.
-       ":gles2_conform_test_warnings",
-     ]
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       if (!is_chromeos) {
-         deps += [ "//build/config/linux/gtk2" ]
-       }
diff --git a/www/iridium/files/patch-gpu_gles2__conform__support_native_BUILD.gn b/www/iridium/files/patch-gpu_gles2__conform__support_native_BUILD.gn
deleted file mode 100644
index 92ca9db6337d..000000000000
--- a/www/iridium/files/patch-gpu_gles2__conform__support_native_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/gles2_conform_support/native/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/gles2_conform_support/native/BUILD.gn
-@@ -20,7 +20,7 @@ source_set("native") {
-     "//gpu/gles2_conform_support/egl",
-     "//ui/gl",
-   ]
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "egl_native_aura.cc",
-       "egl_native_x11.cc",
diff --git a/www/iridium/files/patch-gpu_ipc_client_BUILD.gn b/www/iridium/files/patch-gpu_ipc_client_BUILD.gn
deleted file mode 100644
index 8e5c1bbe3e2b..000000000000
--- a/www/iridium/files/patch-gpu_ipc_client_BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
---- gpu/ipc/client/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/ipc/client/BUILD.gn
-@@ -44,6 +44,7 @@ source_set("ipc_client_sources") {
-   configs += [
-     "//build/config/compiler:no_size_t_to_int_warning",
-     "//gpu:gpu_implementation",
-+    "//build/config/linux:x11",
-   ]
-   deps = [
-     "//base",
diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc b/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
new file mode 100644
index 000000000000..8b240314dd01
--- /dev/null
+++ b/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
@@ -0,0 +1,54 @@
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2018-06-13 00:10:19.000000000 +0200
++++ gpu/ipc/common/gpu_memory_buffer_support.cc	2018-07-19 13:54:11.502121000 +0200
+@@ -12,7 +12,7 @@
+ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
+ #endif
+ 
+-#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"
+@@ -36,13 +36,13 @@
+ GpuMemoryBufferSupport::GpuMemoryBufferSupport() {
+ #if defined(USE_OZONE)
+   client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   client_native_pixmap_factory_.reset(
+       gfx::CreateClientNativePixmapFactoryDmabuf());
+ #endif
+ }
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD)
+ GpuMemoryBufferSupport::GpuMemoryBufferSupport(
+     std::unique_ptr<gfx::ClientNativePixmapFactory>
+         client_native_pixmap_factory)
+@@ -57,7 +57,7 @@
+   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)
+   return gfx::NATIVE_PIXMAP;
+ #elif defined(OS_WIN)
+   return gfx::DXGI_SHARED_HANDLE;
+@@ -112,7 +112,7 @@
+   return false;
+ #elif defined(USE_OZONE)
+   return client_native_pixmap_factory_->IsConfigurationSupported(format, usage);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   return false;  // TODO(julian.isorce): Add linux support.
+ #elif defined(OS_WIN)
+   switch (usage) {
+@@ -168,7 +168,7 @@
+       return GpuMemoryBufferImplIOSurface::CreateFromHandle(
+           handle, size, format, usage, callback);
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case gfx::NATIVE_PIXMAP:
+       return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
+           client_native_pixmap_factory(), handle, size, format, usage,
diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h b/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h
new file mode 100644
index 000000000000..aa670d3a2fee
--- /dev/null
+++ b/www/iridium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h
@@ -0,0 +1,38 @@
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig	2018-07-19 13:55:08.335420000 +0200
++++ gpu/ipc/common/gpu_memory_buffer_support.h	2018-07-19 13:56:28.243213000 +0200
+@@ -17,7 +17,7 @@
+ #include "ui/gfx/geometry/size.h"
+ #include "ui/gfx/gpu_memory_buffer.h"
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ namespace gfx {
+ class ClientNativePixmapFactory;
+ }
+@@ -29,7 +29,7 @@
+ class GPU_EXPORT GpuMemoryBufferSupport {
+  public:
+   GpuMemoryBufferSupport();
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+   GpuMemoryBufferSupport(std::unique_ptr<gfx::ClientNativePixmapFactory>
+                              client_native_pixmap_factory);
+ #endif
+@@ -43,7 +43,7 @@
+   bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
+                                                      gfx::BufferUsage usage);
+ 
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+   gfx::ClientNativePixmapFactory* client_native_pixmap_factory() {
+     return client_native_pixmap_factory_.get();
+   }
+@@ -66,7 +66,7 @@
+       const GpuMemoryBufferImpl::DestructionCallback& callback);
+ 
+  private:
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+   std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
+ #endif
+ 
diff --git a/www/iridium/files/patch-gpu_ipc_service_BUILD.gn b/www/iridium/files/patch-gpu_ipc_service_BUILD.gn
deleted file mode 100644
index bc824277d143..000000000000
--- a/www/iridium/files/patch-gpu_ipc_service_BUILD.gn
+++ /dev/null
@@ -1,16 +0,0 @@
---- gpu/ipc/service/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/ipc/service/BUILD.gn
-@@ -110,11 +110,12 @@ target(link_target_type, "ipc_service_so
-     ]
-     libs += [ "android" ]
-   }
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [ "image_transport_surface_linux.cc" ]
-   }
-   if (use_x11) {
-     sources += [ "x_util.h" ]
-+    configs += [ "//build/config/linux:x11" ]
-   }
-   if (use_ozone) {
-     sources += [
diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
index ef61b49902e3..a3ded293c128 100644
--- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,38 +1,29 @@
---- gpu/ipc/service/gpu_init.cc.orig	2017-04-19 19:06:34 UTC
-+++ gpu/ipc/service/gpu_init.cc
-@@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
-   }
+--- gpu/ipc/service/gpu_init.cc.orig	2018-06-13 00:10:19.000000000 +0200
++++ gpu/ipc/service/gpu_init.cc	2018-07-19 14:45:14.322631000 +0200
+@@ -70,7 +70,7 @@
  }
+ #endif  // defined(OS_MACOSX)
  
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
-   TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
- 
-@@ -95,7 +95,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g
-       break;
-   }
- }
--#endif  // defined(OS_MACOSX)
-+#endif  // defined(OS_MACOSX) && defined(OS_BSD)
- 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+-#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() {
-@@ -194,7 +194,7 @@ bool GpuInit::InitializeAndStartSandbox(
-   // By skipping the following code on Mac, we don't really lose anything,
-   // because the basic GPU information is passed down from the host process.
-   base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now();
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   CollectGraphicsInfo(gpu_info_);
-   if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure)
-     return false;
-@@ -211,7 +211,7 @@ bool GpuInit::InitializeAndStartSandbox(
-     gpu::ApplyGpuDriverBugWorkarounds(
-         gpu_info_, const_cast<base::CommandLine*>(&command_line));
-   }
--#endif  // !defined(OS_MACOSX)
-+#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
+   bool res = true;
+   base::AssertBlockingAllowed();
+@@ -106,7 +106,7 @@
+   // crash during feature collection.
+   gpu::SetKeysForCrashLogging(gpu_info_);
  
-   gpu_feature_info_ = gpu::GetGpuFeatureInfo(gpu_info_, command_line);
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+   if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
+       gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
+     return false;
+@@ -172,7 +172,7 @@
+   sandbox_helper_->PreSandboxStartup();
  
+   bool attempted_startsandbox = false;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+   // 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.
diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc
new file mode 100644
index 000000000000..c722afc91d64
--- /dev/null
+++ b/www/iridium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc
@@ -0,0 +1,20 @@
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig	2018-02-24 16:25:15.000000000 +0100
++++ gpu/ipc/service/gpu_memory_buffer_factory.cc	2018-03-04 02:47:09.144034000 +0100
+@@ -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)
+ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
+ #endif
+ 
+@@ -33,7 +33,7 @@
+   return base::WrapUnique(new 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);
+ #elif defined(OS_WIN)
+   return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);
diff --git a/www/iridium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn b/www/iridium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
deleted file mode 100644
index 6a609390b36a..000000000000
--- a/www/iridium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/tools/compositor_model_bench/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/tools/compositor_model_bench/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/ui.gni")
- 
--if (is_linux && !is_chromeos && current_cpu != "arm" && use_x11) {
-+if ((is_linux || is_bsd) && !is_chromeos && current_cpu != "arm" && use_x11) {
-   executable("compositor_model_bench") {
-     sources = [
-       "compositor_model_bench.cc",
diff --git a/www/iridium/files/patch-gpu_vulkan_BUILD.gn b/www/iridium/files/patch-gpu_vulkan_BUILD.gn
deleted file mode 100644
index 2dd0aa4e6971..000000000000
--- a/www/iridium/files/patch-gpu_vulkan_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/vulkan/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/vulkan/BUILD.gn
-@@ -14,7 +14,7 @@ if (enable_vulkan) {
-   component("vulkan") {
-     output_name = "vulkan_wrapper"
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       assert(use_x11, "Vulkan only support x11 at this point.")
-       sources = [
-         "vulkan_command_buffer.cc",
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
index 90db873d4d94..825887403a65 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc
+++ b/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	2017-05-09 19:02:47 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2017-06-05 19:03:08 UTC
 +++ headless/lib/browser/headless_content_browser_client.cc
-@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu
+@@ -172,7 +172,7 @@ void HeadlessContentBrowserClient::GetQuotaSettings(
        callback);
  }
  
@@ -9,7 +9,7 @@
  void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd
+@@ -183,7 +183,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
      mappings->Share(kCrashDumpSignal, crash_signal_fd);
  #endif  // defined(HEADLESS_USE_BREAKPAD)
  }
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
index de0fc6899969..39afba760057 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
+++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h
@@ -1,9 +1,9 @@
---- headless/lib/browser/headless_content_browser_client.h.orig	2017-05-09 19:02:47 UTC
-+++ headless/lib/browser/headless_content_browser_client.h
-@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub
+--- headless/lib/browser/headless_content_browser_client.h.orig	2017-09-05 21:05:20.000000000 +0200
++++ headless/lib/browser/headless_content_browser_client.h	2017-09-06 20:33:27.212197000 +0200
+@@ -30,7 +30,7 @@
        content::BrowserContext* context,
        content::StoragePartition* partition,
-       const storage::OptionalQuotaSettingsCallback& callback) override;
+       storage::OptionalQuotaSettingsCallback callback) override;
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
deleted file mode 100644
index 5466bfb36785..000000000000
--- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2017-05-09 19:02:47 UTC
-+++ headless/lib/headless_content_main_delegate.cc
-@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr
-   g_headless_crash_client.Pointer()->set_crash_dumps_dir(
-       browser_->options()->crash_dumps_dir);
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   if (!browser_->options()->enable_crash_reporter) {
-     DCHECK(!breakpad::IsCrashReporterEnabled());
-     return;
-@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr
-   if (process_type != switches::kZygoteProcess)
-     breakpad::InitCrashReporter(process_type);
- #endif  // defined(HEADLESS_USE_BREAKPAD)
--#endif  // !defined(OS_MACOSX)
-+#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
- }
- 
- void HeadlessContentMainDelegate::PreSandboxStartup() {
-@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan
-   if (command_line.HasSwitch(switches::kEnableLogging))
-     InitLogging(command_line);
- #endif
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   InitCrashReporter(command_line);
- #endif
-   InitializeResourceBundle();
-@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc
-   return 0;
- }
- 
--#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void HeadlessContentMainDelegate::ZygoteForked() {
-   const base::CommandLine& command_line(
-       *base::CommandLine::ForCurrentProcess());
diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
deleted file mode 100644
index 26af4d138e10..000000000000
--- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- headless/lib/headless_content_main_delegate.h.orig	2017-05-09 19:02:47 UTC
-+++ headless/lib/headless_content_main_delegate.h
-@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ
- 
-   HeadlessBrowserImpl* browser() const { return browser_.get(); }
- 
--#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   void ZygoteForked() override;
- #endif
- 
diff --git a/www/iridium/files/patch-headless_lib_headless__macros.h b/www/iridium/files/patch-headless_lib_headless__macros.h
index 6692a04accdc..952fc745b5fa 100644
--- a/www/iridium/files/patch-headless_lib_headless__macros.h
+++ b/www/iridium/files/patch-headless_lib_headless__macros.h
@@ -1,13 +1,13 @@
---- headless/lib/headless_macros.h.orig	2017-05-09 19:02:47 UTC
-+++ headless/lib/headless_macros.h
-@@ -5,8 +5,8 @@
- #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_
- #define HEADLESS_LIB_HEADLESS_MACROS_H_
+--- headless/lib/headless_macros.h.orig	2017-12-15 02:04:19.000000000 +0100
++++ headless/lib/headless_macros.h	2017-12-24 16:44:30.147915000 +0100
+@@ -7,8 +7,8 @@
  
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "build/build_config.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
  #define HEADLESS_USE_BREAKPAD
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
  
  #endif  // HEADLESS_LIB_HEADLESS_MACROS_H_
diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h
index ffe5b22273a5..4df0d7db85cb 100644
--- a/www/iridium/files/patch-ipc_ipc__channel.h
+++ b/www/iridium/files/patch-ipc_ipc__channel.h
@@ -1,6 +1,6 @@
---- ipc/ipc_channel.h.orig	2017-04-19 19:06:35 UTC
+--- ipc/ipc_channel.h.orig	2017-06-05 19:03:08 UTC
 +++ ipc/ipc_channel.h
-@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender
+@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
  #endif
  
diff --git a/www/iridium/files/patch-ipc_ipc__channel_common.cc b/www/iridium/files/patch-ipc_ipc__channel_common.cc
new file mode 100644
index 000000000000..a22ae20323e2
--- /dev/null
+++ b/www/iridium/files/patch-ipc_ipc__channel_common.cc
@@ -0,0 +1,11 @@
+--- ipc/ipc_channel_common.cc.orig	2017-08-10 04:18:14.155067000 +0200
++++ ipc/ipc_channel_common.cc	2017-08-10 04:18:32.944727000 +0200
+@@ -9,7 +9,7 @@
+ 
+ namespace IPC {
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ 
+ namespace {
+ int g_global_pid = 0;
diff --git a/www/iridium/files/patch-ipc_ipc__channel_mojo.cc b/www/iridium/files/patch-ipc_ipc__channel_mojo.cc
new file mode 100644
index 000000000000..0e4fe69eb383
--- /dev/null
+++ b/www/iridium/files/patch-ipc_ipc__channel_mojo.cc
@@ -0,0 +1,11 @@
+--- ipc/ipc_channel_mojo.cc.orig	2017-08-10 04:18:45.930792000 +0200
++++ ipc/ipc_channel_mojo.cc	2017-08-10 04:19:05.792138000 +0200
+@@ -228,7 +228,7 @@
+ }
+ 
+ base::ProcessId GetSelfPID() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (int global_pid = Channel::GetGlobalPid())
+     return global_pid;
+ #endif  // OS_LINUX
diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc
index ccffba65690b..640dfe236f82 100644
--- a/www/iridium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/iridium/files/patch-ipc_ipc__message__utils.cc
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.cc.orig	2017-04-19 19:06:35 UTC
-+++ ipc/ipc_message_utils.cc
-@@ -421,7 +421,7 @@ void ParamTraits<unsigned int>::Log(cons
-   l->append(base::UintToString(p));
+--- ipc/ipc_message_utils.cc.orig	2017-09-05 21:05:21.000000000 +0200
++++ ipc/ipc_message_utils.cc	2017-09-06 20:38:34.375119000 +0200
+@@ -424,7 +424,7 @@
  }
  
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ #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))
  void ParamTraits<long>::Log(const param_type& p, std::string* l) {
    l->append(base::Int64ToString(static_cast<int64_t>(p)));
+ }
diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.h b/www/iridium/files/patch-ipc_ipc__message__utils.h
index 4d0604a409f0..43f1e79e3af4 100644
--- a/www/iridium/files/patch-ipc_ipc__message__utils.h
+++ b/www/iridium/files/patch-ipc_ipc__message__utils.h
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.h.orig	2017-04-19 19:06:35 UTC
-+++ ipc/ipc_message_utils.h
-@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> {
- //   3) Android 64 bit also has int64_t typedef'd to long.
+--- ipc/ipc_message_utils.h.orig	2017-09-05 21:05:21.000000000 +0200
++++ ipc/ipc_message_utils.h	2017-09-06 20:44:35.248663000 +0200
+@@ -212,7 +212,7 @@
  // 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) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ #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))
  template <>
  struct ParamTraits<long> {
+   typedef long param_type;
diff --git a/www/iridium/files/patch-iridium_trknotify.cpp b/www/iridium/files/patch-iridium_trknotify.cpp
deleted file mode 100644
index ddf562a6fca9..000000000000
--- a/www/iridium/files/patch-iridium_trknotify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- iridium/trknotify.cpp.orig	2017-04-24 14:40:27 UTC
-+++ iridium/trknotify.cpp
-@@ -5,7 +5,7 @@
-  * found in the LICENSE file.
-  */
- #include <cstdio>
--#ifdef __linux__
-+#ifdef __FreeBSD__
- #	include <unistd.h>
- #endif
- #include "chrome/browser/infobars/infobar_service.h"
-@@ -21,7 +21,7 @@ namespace iridium {
- 
- void log_url_request(const std::string &caller, const GURL &url)
- {
--#ifdef __linux__
-+#ifdef __FreeBSD__
- 	bool tty = isatty(fileno(stderr));
- #else
- 	bool tty = false;
diff --git a/www/iridium/files/patch-mash_package_mash__packaged__service.cc b/www/iridium/files/patch-mash_package_mash__packaged__service.cc
deleted file mode 100644
index 5cc467ad6b05..000000000000
--- a/www/iridium/files/patch-mash_package_mash__packaged__service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- mash/package/mash_packaged_service.cc.orig	2017-04-19 19:06:35 UTC
-+++ mash/package/mash_packaged_service.cc
-@@ -30,7 +30,7 @@
- #include "ash/touch_hud/mus/touch_hud_application.h"  // nogncheck
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "components/font_service/font_service_app.h"
- #endif
- 
-@@ -104,7 +104,7 @@ std::unique_ptr<service_manager::Service
-     return base::WrapUnique(new mash::task_viewer::TaskViewer);
-   if (name == "test_ime_driver")
-     return base::WrapUnique(new ui::test::TestIMEApplication);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   if (name == "font_service")
-     return base::WrapUnique(new font_service::FontServiceApp);
- #endif
diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn
index 93a30a4e7abd..4e0db7c6409d 100644
--- a/www/iridium/files/patch-media_audio_BUILD.gn
+++ b/www/iridium/files/patch-media_audio_BUILD.gn
@@ -1,11 +1,11 @@
---- media/audio/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ media/audio/BUILD.gn
-@@ -212,9 +212,19 @@ source_set("audio") {
+--- media/audio/BUILD.gn.orig	2018-01-04 21:05:54.000000000 +0100
++++ media/audio/BUILD.gn	2018-01-27 12:34:55.048961000 +0100
+@@ -237,9 +237,19 @@
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
 -  if (is_linux) {
-+  if (is_linux || (is_bsd && !use_sndio)) {
++  if (is_linux && !use_sndio) {
      sources += [ "linux/audio_manager_linux.cc" ]
    }
 +  if (use_sndio) {
@@ -21,17 +21,11 @@
  
    if (use_alsa) {
      libs += [ "asound" ]
-@@ -261,10 +261,12 @@ source_set("audio") {
+@@ -285,7 +295,6 @@
+     if (link_pulseaudio) {
        configs += [ ":libpulse" ]
      } else {
-       # TODO(ajwong): Technically, this dl should go in the action.
 -      libs += [ "dl" ]
        deps += [ ":pulse_generate_stubs" ]
        sources += get_target_outputs(":pulse_generate_stubs")
      }
-+    if (is_linux) {
-+      libs += [ "dl" ]
-+    }
-   }
- 
-   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
diff --git a/www/iridium/files/patch-media__audio__alsa__audio_manager_alsa.cc b/www/iridium/files/patch-media_audio_alsa_audio_manager_alsa.cc
index 09239026a2d9..6bf61c877d95 100644
--- a/www/iridium/files/patch-media__audio__alsa__audio_manager_alsa.cc
+++ b/www/iridium/files/patch-media_audio_alsa_audio_manager_alsa.cc
@@ -1,6 +1,6 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2017-04-19 19:06:35 UTC
-+++ media/audio/alsa/audio_manager_alsa.cc
-@@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2017-12-15 02:04:21.000000000 +0100
++++ media/audio/alsa/audio_manager_alsa.cc	2017-12-24 16:52:36.819099000 +0100
+@@ -93,7 +93,9 @@
    int card = -1;
  
    // Loop through the sound cards to get ALSA device hints.
@@ -10,7 +10,7 @@
      void** hints = NULL;
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
-@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+@@ -105,7 +107,9 @@
        DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
@@ -20,19 +20,19 @@
  }
  
  void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
-@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
-     // goes through software conversion if needed (e.g. incompatible
-     // sample rate).
-     // TODO(joi): Should we prefer "hw" instead?
+@@ -188,7 +192,11 @@
+   // goes through software conversion if needed (e.g. incompatible
+   // sample rate).
+   // TODO(joi): Should we prefer "hw" instead?
 +#ifdef OS_LINUX
-     static const char kDeviceTypeDesired[] = "plughw";
+   static const char kDeviceTypeDesired[] = "plughw";
 +#else
-+    static const char kDeviceTypeDesired[] = "plug";
++  static const char kDeviceTypeDesired[] = "plug";
 +#endif
-     return strncmp(kDeviceTypeDesired,
-                    device_name,
-                    arraysize(kDeviceTypeDesired) - 1) == 0;
-@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+   return strncmp(kDeviceTypeDesired, device_name,
+                  arraysize(kDeviceTypeDesired) - 1) == 0;
+ }
+@@ -210,7 +218,9 @@
    // Loop through the sound cards.
    // Don't use snd_device_name_hint(-1,..) since there is a access violation
    // inside this ALSA API with libasound.so.2.0.0.
@@ -42,7 +42,7 @@
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
        for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+@@ -234,7 +244,9 @@
        DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
diff --git a/www/iridium/files/patch-media_audio_audio__manager.cc b/www/iridium/files/patch-media_audio_audio__manager.cc
index 73fb1704a152..a80ccb2948e0 100644
--- a/www/iridium/files/patch-media_audio_audio__manager.cc
+++ b/www/iridium/files/patch-media_audio_audio__manager.cc
@@ -1,29 +1,29 @@
---- media/audio/audio_manager.cc.orig	2017-04-19 19:06:35 UTC
-+++ media/audio/audio_manager.cc
-@@ -93,7 +93,7 @@ class AudioManagerHelper : public base::
+--- media/audio/audio_manager.cc.orig	2017-12-15 02:04:21.000000000 +0100
++++ media/audio/audio_manager.cc	2017-12-24 17:10:24.736979000 +0100
+@@ -94,7 +94,7 @@
    }
  #endif
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
    void set_app_name(const std::string& app_name) { app_name_ = app_name; }
    const std::string& app_name() const { return app_name_; }
  #endif
-@@ -227,7 +227,7 @@ class AudioManagerHelper : public base::
+@@ -229,7 +229,7 @@
    std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
  #endif
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
    std::string app_name_;
  #endif
  
-@@ -342,7 +342,7 @@ void AudioManager::StartHangMonitorIfNee
+@@ -313,7 +313,7 @@
    GetHelper()->StartHangTimer(std::move(task_runner));
  }
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
  // static
  void AudioManager::SetGlobalAppName(const std::string& app_name) {
    GetHelper()->set_app_name(app_name);
diff --git a/www/iridium/files/patch-media_audio_audio__manager.h b/www/iridium/files/patch-media_audio_audio__manager.h
index 8431068e1eb8..3350653361db 100644
--- a/www/iridium/files/patch-media_audio_audio__manager.h
+++ b/www/iridium/files/patch-media_audio_audio__manager.h
@@ -1,11 +1,11 @@
---- media/audio/audio_manager.h.orig	2017-04-19 19:06:35 UTC
-+++ media/audio/audio_manager.h
-@@ -81,7 +81,7 @@ class MEDIA_EXPORT AudioManager {
+--- media/audio/audio_manager.h.orig	2017-12-15 02:04:21.000000000 +0100
++++ media/audio/audio_manager.h	2017-12-24 17:11:05.999543000 +0100
+@@ -68,7 +68,7 @@
    static void StartHangMonitorIfNeeded(
        scoped_refptr<base::SingleThreadTaskRunner> task_runner);
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
    // Sets the name of the audio source as seen by external apps. Only actually
    // used with PulseAudio as of this writing.
    static void SetGlobalAppName(const std::string& app_name);
diff --git a/www/iridium/files/patch-media_base_BUILD.gn b/www/iridium/files/patch-media_base_BUILD.gn
deleted file mode 100644
index 2c8aea8fbb06..000000000000
--- a/www/iridium/files/patch-media_base_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/base/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ media/base/BUILD.gn
-@@ -305,7 +305,7 @@ target(link_target_type, "base") {
-     allow_circular_includes_from += [ "//media/base/android" ]
-   }
- 
--  if (is_linux && use_x11) {
-+  if ((is_linux || is_bsd) && use_x11) {
-     configs += [
-       "//build/config/linux:x11",
-       "//build/config/linux:xext",
-@@ -331,7 +331,7 @@ target(link_target_type, "base") {
-     defines += [ "DISABLE_USER_INPUT_MONITOR" ]
-   }
- 
--  if (is_linux || is_win) {
-+  if (is_linux || is_bsd || is_win) {
-     sources += [
-       "keyboard_event_counter.cc",
-       "keyboard_event_counter.h",
diff --git a/www/iridium/files/patch-media_base_audio__latency.cc b/www/iridium/files/patch-media_base_audio__latency.cc
index 08780cd5dd99..15e0292a9068 100644
--- a/www/iridium/files/patch-media_base_audio__latency.cc
+++ b/www/iridium/files/patch-media_base_audio__latency.cc
@@ -1,11 +1,11 @@
---- media/base/audio_latency.cc.orig	2017-04-19 19:06:35 UTC
-+++ media/base/audio_latency.cc
-@@ -83,7 +83,7 @@ int AudioLatency::GetRtcBufferSize(int s
+--- media/base/audio_latency.cc.orig	2017-12-15 02:04:21.000000000 +0100
++++ media/base/audio_latency.cc	2017-12-24 17:08:13.779303000 +0100
+@@ -106,7 +106,7 @@
      return frames_per_buffer;
    }
  
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-   // On Linux and MacOS, the low level IO implementations on the browser side
-   // supports all buffer size the clients want. We use the native peer
-   // connection buffer size (10ms) to achieve best possible performance.
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+   // On Linux, MacOS and Fuchsia, the low level IO implementations on the
+   // browser side supports all buffer size the clients want. We use the native
+   // peer connection buffer size (10ms) to achieve best possible performance.
diff --git a/www/iridium/files/patch-media_base_decoder__buffer.h b/www/iridium/files/patch-media_base_decoder__buffer.h
deleted file mode 100644
index 017e45a44a15..000000000000
--- a/www/iridium/files/patch-media_base_decoder__buffer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/base/decoder_buffer.h.orig	2018-04-28 17:47:57.057477000 +0200
-+++ media/base/decoder_buffer.h	2018-04-28 17:48:11.847624000 +0200
-@@ -37,7 +37,7 @@
-     : public base::RefCountedThreadSafe<DecoderBuffer> {
-  public:
-   enum {
--    kPaddingSize = 32,
-+    kPaddingSize = 64,
- #if defined(ARCH_CPU_ARM_FAMILY)
-     kAlignmentSize = 16
- #else
diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc
index 29406d927dca..a94e47a3e1bc 100644
--- a/www/iridium/files/patch-media_base_video__frame.cc
+++ b/www/iridium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2017-04-19 19:06:35 UTC
+--- media/base/video_frame.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/base/video_frame.cc
 @@ -53,7 +53,7 @@ static std::string StorageTypeToString(
        return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
+@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
    return frame;
  }
  
@@ -27,7 +27,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      VideoPixelFormat format,
-@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
+@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
      wrapping_frame->data_[i] = frame->data(i);
    }
  
@@ -36,12 +36,12 @@
    // If there are any |dmabuf_fds_| plugged in, we should duplicate them.
    if (frame->storage_type() == STORAGE_DMABUFS) {
      std::vector<int> original_fds;
-@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset(
+@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset() const {
    return shared_memory_offset_;
  }
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
- int VideoFrame::dmabuf_fd(size_t plane) const {
+ int VideoFrame::DmabufFd(size_t plane) const {
    DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
    DCHECK(IsValidPlane(plane, format_));
diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h
index 3f650d9953ce..2bd9d6142dcf 100644
--- a/www/iridium/files/patch-media_base_video__frame.h
+++ b/www/iridium/files/patch-media_base_video__frame.h
@@ -1,15 +1,15 @@
---- media/base/video_frame.h.orig	2017-04-19 19:06:35 UTC
+--- media/base/video_frame.h.orig	2017-06-05 19:03:08 UTC
 +++ media/base/video_frame.h
-@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public b
+@@ -62,7 +62,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.
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-     // TODO(mcasas): Consider turning this type into STORAGE_NATIVE or another
-     // meaningful name and handle it appropriately in all cases.
-     STORAGE_DMABUFS = 5,  // Each plane is stored into a DmaBuf.
-@@ -186,7 +186,7 @@ class MEDIA_EXPORT VideoFrame : public b
+     // 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
+@@ -188,7 +188,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
        uint8_t* a_data,
        base::TimeDelta timestamp);
  
@@ -18,7 +18,7 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/Documentation/dma-buf-sharing.txt) with a
    // VideoFrame. The dmabuf fds are dup()ed on creation, so that the VideoFrame
-@@ -336,7 +336,7 @@ class MEDIA_EXPORT VideoFrame : public b
+@@ -338,7 +338,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;
  
@@ -26,8 +26,8 @@
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // Returns backing DmaBuf file descriptor for given |plane|, if present, or
    // -1 if not.
-   // TODO(mcasas): Rename to DmabufFd() to comply with Style Guide.
-@@ -528,7 +528,7 @@ class MEDIA_EXPORT VideoFrame : public b
+   int DmabufFd(size_t plane) const;
+@@ -531,7 +531,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    base::SharedMemoryHandle shared_memory_handle_;
    size_t shared_memory_offset_;
  
diff --git a/www/iridium/files/patch-media_capture_BUILD.gn b/www/iridium/files/patch-media_capture_BUILD.gn
deleted file mode 100644
index c48066bb3458..000000000000
--- a/www/iridium/files/patch-media_capture_BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
---- media/capture/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ media/capture/BUILD.gn
-@@ -153,6 +153,16 @@ component("capture_lib") {
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "video/linux/video_capture_device_linux.cc",
-+      "video/linux/video_capture_device_linux.h",
-+      "video/linux/video_capture_device_factory_linux.cc",
-+      "video/linux/video_capture_device_factory_linux.h",
-+      "video/linux/v4l2_capture_delegate.cc",
-+    ]
-+  }
-+
-   if (is_win) {
-     deps += [ "//media/base/win" ]
-     libs = [
diff --git a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
index 182a4ca69954..3b9a42b60f3e 100644
--- a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/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	2017-04-19 19:06:35 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetD
+@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
    for (const auto& entry : devices_config_) {
      device_descriptors->emplace_back(
          base::StringPrintf("fake_device_%d", entry_index), entry.device_id,
diff --git a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
index 48e064a8930b..bdb3be4105e6 100644
--- a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc
+++ b/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	2017-04-19 19:06:35 UTC
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/capture/video/file_video_capture_device_factory.cc
-@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD
+@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
  #elif defined(OS_MACOSX)
        command_line_file_path.value(), kFileVideoCaptureDeviceName,
        VideoCaptureApi::MACOSX_AVFOUNDATION
diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index 575db560fa12..a7ded1ee5067 100644
--- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2017-04-19 19:06:35 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
 @@ -4,8 +4,10 @@
  
@@ -11,9 +11,9 @@
  #include <poll.h>
  #include <sys/fcntl.h>
  #include <sys/ioctl.h>
-@@ -21,10 +23,10 @@
- #include "media/capture/video/blob_utils.h"
- #include "media/capture/video/linux/video_capture_device_linux.h"
+@@ -23,10 +25,10 @@
+ 
+ using media::mojom::MeteringMode;
  
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
 +// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
index 695e2db1e623..29627ff02d06 100644
--- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
+++ b/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	2017-04-19 19:06:35 UTC
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/capture/video/linux/video_capture_device_linux.cc
 @@ -21,6 +21,7 @@
  
@@ -8,7 +8,7 @@
  // Translates Video4Linux pixel formats to Chromium pixel formats.
  // static
  VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
-@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
+@@ -34,6 +35,7 @@ std::list<uint32_t> VideoCaptureDeviceLinux::GetListOf
      bool favour_mjpeg) {
    return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
  }
@@ -16,7 +16,7 @@
  
  VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
      const VideoCaptureDeviceDescriptor& device_descriptor)
-@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
+@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() {
    v4l2_thread_.Stop();
  }
  
@@ -24,7 +24,7 @@
  void VideoCaptureDeviceLinux::AllocateAndStart(
      const VideoCaptureParams& params,
      std::unique_ptr<VideoCaptureDevice::Client> client) {
-@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
      v4l2_thread_.task_runner()->PostTask(FROM_HERE, request);
    photo_requests_queue_.clear();
  }
@@ -38,7 +38,7 @@
  void VideoCaptureDeviceLinux::StopAndDeAllocate() {
    if (!v4l2_thread_.IsRunning())
      return;  // Wrong state.
-@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
+@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
    }
    v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor));
  }
@@ -50,7 +50,7 @@
  void VideoCaptureDeviceLinux::SetRotation(int rotation) {
    if (v4l2_thread_.IsRunning()) {
      v4l2_thread_.task_runner()->PostTask(
-@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation
          base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
    }
  }
diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
index 0bd1db34f676..68743d128b59 100644
--- a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig	2017-04-19 19:06:35 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2017-06-05 19:03:08 UTC
 +++ media/capture/video/video_capture_device_client.cc
-@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomin
+@@ -242,7 +242,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
  // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
  // Windows RGB24 defines blue at lowest byte,
  // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__factory.cc
index 3e51687048e4..ec4a0d78e064 100644
--- a/www/iridium/files/patch-media_capture_video_video__capture__device__factory.cc
+++ b/www/iridium/files/patch-media_capture_video_video__capture__device__factory.cc
@@ -1,30 +1,30 @@
---- media/capture/video/video_capture_device_factory.cc.orig	2017-04-19 19:06:35 UTC
-+++ media/capture/video/video_capture_device_factory.cc
-@@ -18,6 +18,10 @@ namespace media {
- std::unique_ptr<VideoCaptureDeviceFactory>
- VideoCaptureDeviceFactory::CreateFactory(
-     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
+--- media/capture/video/video_capture_device_factory.cc.orig	2018-06-13 00:10:20.000000000 +0200
++++ media/capture/video/video_capture_device_factory.cc	2018-07-20 21:26:51.824846000 +0200
+@@ -21,6 +21,10 @@
+     gpu::GpuMemoryBufferManager* gpu_buffer_manager,
+     MojoJpegDecodeAcceleratorFactoryCB jda_factory,
+     MojoJpegEncodeAcceleratorFactoryCB jea_factory) {
 +#if defined(OS_BSD)
-+  return std::unique_ptr<VideoCaptureDeviceFactory>(
-+          new media::FakeVideoCaptureDeviceFactory());
++   return std::unique_ptr<VideoCaptureDeviceFactory>(
++           new media::FakeVideoCaptureDeviceFactory());
 +#else
    const base::CommandLine* command_line =
        base::CommandLine::ForCurrentProcess();
    // Use a Fake or File Video Device Factory if the command line flags are
-@@ -42,6 +46,7 @@ VideoCaptureDeviceFactory::CreateFactory
-     return std::unique_ptr<VideoCaptureDeviceFactory>(
-         CreateVideoCaptureDeviceFactory(ui_task_runner));
+@@ -47,6 +51,7 @@
+                                         std::move(jda_factory),
+                                         std::move(jea_factory)));
    }
 +#endif
  }
  
  VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
-@@ -61,7 +66,7 @@ void VideoCaptureDeviceFactory::Enumerat
-   callback.Run(std::move(device_descriptors));
- }
+@@ -56,7 +61,7 @@
+ VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() = default;
  
--#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \
-+#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \
-     !defined(OS_WIN)
+ #if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \
+-    !defined(OS_WIN)
++    !defined(OS_WIN) && !defined(OS_BSD)
  // static
  VideoCaptureDeviceFactory*
+ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
diff --git a/www/iridium/files/patch-media_cast_BUILD.gn b/www/iridium/files/patch-media_cast_BUILD.gn
deleted file mode 100644
index 32881404d145..000000000000
--- a/www/iridium/files/patch-media_cast_BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
---- media/cast/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ media/cast/BUILD.gn
-@@ -358,7 +358,7 @@ test("cast_unittests") {
-   }
- }
- 
--if (is_win || is_mac || (is_linux && !is_chromeos)) {
-+if (is_win || is_mac || (is_linux && !is_chromeos) || is_bsd) {
-   # This is a target for the collection of cast development tools.  They are
-   # not built/linked into the Chromium browser.
-   group("testing_tools") {
-@@ -412,7 +412,7 @@ if (is_win || is_mac || (is_linux && !is
-       "//ui/gfx/geometry",
-     ]
- 
--    if (is_linux && !is_chromeos && use_x11) {
-+    if ((is_linux || is_bsd) && !is_chromeos && use_x11) {
-       sources += [
-         "test/linux_output_window.cc",
-         "test/linux_output_window.h",
-@@ -515,7 +515,7 @@ if (is_win || is_mac || (is_linux && !is
-   }
- }
- 
--if (is_linux && !is_chromeos) {
-+if ((is_linux || is_bsd) && !is_chromeos) {
-   test("tap_proxy") {
-     sources = [
-       "test/utility/tap_proxy.cc",
diff --git a/www/iridium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni b/www/iridium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni
deleted file mode 100644
index f99a58f5a90b..000000000000
--- a/www/iridium/files/patch-media_cdm_ppapi_ppapi__cdm__adapter.gni
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/cdm/ppapi/ppapi_cdm_adapter.gni.orig	2017-04-19 19:06:35 UTC
-+++ media/cdm/ppapi/ppapi_cdm_adapter.gni
-@@ -5,7 +5,7 @@
- # This template defines a CDM adapter target. Just use this as you would a
- # normal target and everything should work correctly.
- template("ppapi_cdm_adapter") {
--  if (is_mac || is_linux) {
-+  if (is_mac || is_linux || is_bsd) {
-     _target_type = "loadable_module"
-   } else {
-     _target_type = "shared_library"
-@@ -57,7 +57,7 @@ template("ppapi_cdm_adapter") {
-       libs += [ "rt" ]
-     }
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       # CDM adapter depends on a CDM in component and non-component builds.
-       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-     }
diff --git a/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc b/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc
deleted file mode 100644
index 230586387ebd..000000000000
--- a/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- media/ffmpeg/ffmpeg_common.cc.orig	2018-04-28 17:44:34.207381000 +0200
-+++ media/ffmpeg/ffmpeg_common.cc	2018-04-28 17:46:24.946243000 +0200
-@@ -33,7 +33,7 @@
- // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
- // padded. Check here to ensure FFmpeg only receives data padded to its
- // specifications.
--static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE,
-+static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE,
-               "DecoderBuffer padding size does not fit ffmpeg requirement");
- 
- // Alignment requirement by FFmpeg for input and output buffers. This need to
-@@ -429,11 +429,11 @@
-   } else {
-     codec_context->extradata_size = config.extra_data().size();
-     codec_context->extradata = reinterpret_cast<uint8_t*>(
--        av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
-+        av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
-     memcpy(codec_context->extradata, &config.extra_data()[0],
-            config.extra_data().size());
-     memset(codec_context->extradata + config.extra_data().size(), '\0',
--           FF_INPUT_BUFFER_PADDING_SIZE);
-+           AV_INPUT_BUFFER_PADDING_SIZE);
-   }
- }
- 
-@@ -561,11 +561,11 @@
-   } else {
-     codec_context->extradata_size = config.extra_data().size();
-     codec_context->extradata = reinterpret_cast<uint8_t*>(
--        av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
-+        av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
-     memcpy(codec_context->extradata, &config.extra_data()[0],
-            config.extra_data().size());
-     memset(codec_context->extradata + config.extra_data().size(), '\0',
--           FF_INPUT_BUFFER_PADDING_SIZE);
-+           AV_INPUT_BUFFER_PADDING_SIZE);
-   }
- }
- 
diff --git a/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.h b/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.h
deleted file mode 100644
index b1f46bea9b95..000000000000
--- a/www/iridium/files/patch-media_ffmpeg_ffmpeg__common.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- media/ffmpeg/ffmpeg_common.h.orig	2017-04-19 19:06:35 UTC
-+++ media/ffmpeg/ffmpeg_common.h
-@@ -25,7 +25,7 @@ extern "C" {
- // Disable deprecated features which result in spammy compile warnings.  This
- // list of defines must mirror those in the 'defines' section of FFmpeg's
- // BUILD.gn file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
-+//#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -39,7 +39,6 @@ extern "C" {
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
--#include <libavformat/internal.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
- #include <libavutil/imgutils.h>
diff --git a/www/iridium/files/patch-media_ffmpeg_ffmpeg_common.h b/www/iridium/files/patch-media_ffmpeg_ffmpeg_common.h
new file mode 100644
index 000000000000..30ae3432ce7d
--- /dev/null
+++ b/www/iridium/files/patch-media_ffmpeg_ffmpeg_common.h
@@ -0,0 +1,21 @@
+--- media/ffmpeg/ffmpeg_common.h.orig	2018-08-16 15:46:21.689849000 +0200
++++ media/ffmpeg/ffmpeg_common.h	2018-08-16 15:47:37.792462000 +0200
+@@ -28,9 +28,6 @@
+ MSVC_PUSH_DISABLE_WARNING(4244);
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+-#if !BUILDFLAG(USE_SYSTEM_FFMPEG)
+-#include <libavformat/internal.h>
+-#endif  // !BUILDFLAG(USE_SYSTEM_FFMPEG)
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
+ #include <libavutil/imgutils.h>
+@@ -41,6 +38,8 @@
+ }  // extern "C"
+ 
+ namespace media {
++
++constexpr int64_t kNoFFmpegTimestamp = static_cast<int64_t>(AV_NOPTS_VALUE);
+ 
+ class AudioDecoderConfig;
+ class EncryptionScheme;
diff --git a/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc b/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc
deleted file mode 100644
index 4e5eabb2d47d..000000000000
--- a/www/iridium/files/patch-media_filters_ffmpeg__audio__decodec.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/filters/ffmpeg_audio_decoder.cc.orig	2018-04-28 14:12:22.084504000 +0200
-+++ media/filters/ffmpeg_audio_decoder.cc	2018-04-28 14:14:19.735316000 +0200
-@@ -53,7 +53,7 @@
- // AVCodecContext.opaque to get the object reference in order to call
- // GetAudioBuffer() to do the actual allocation.
- static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {
--  DCHECK(s->codec->capabilities & CODEC_CAP_DR1);
-+  DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1);
-   DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO);
- 
-   // Since this routine is called by FFmpeg when a buffer is required for audio
diff --git a/www/iridium/files/patch-media_filters_ffmpeg__demuxer.cc b/www/iridium/files/patch-media_filters_ffmpeg__demuxer.cc
deleted file mode 100644
index 0080af16013a..000000000000
--- a/www/iridium/files/patch-media_filters_ffmpeg__demuxer.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- media/filters/ffmpeg_demuxer.cc.orig	2017-04-19 19:06:35 UTC
-+++ media/filters/ffmpeg_demuxer.cc
-@@ -1221,24 +1221,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
-   // If no estimate is found, the stream entry will be kInfiniteDuration.
-   std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
-                                                     kInfiniteDuration);
--  const AVFormatInternal* internal = format_context->internal;
--  if (internal && internal->packet_buffer &&
--      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--    struct AVPacketList* packet_buffer = internal->packet_buffer;
--    while (packet_buffer != internal->packet_buffer_end) {
--      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
--                start_time_estimates.size());
--      const AVStream* stream =
--          format_context->streams[packet_buffer->pkt.stream_index];
--      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
--        const base::TimeDelta packet_pts =
--            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
--        if (packet_pts < start_time_estimates[stream->index])
--          start_time_estimates[stream->index] = packet_pts;
--      }
--      packet_buffer = packet_buffer->next;
--    }
--  }
- 
-   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
- 
diff --git a/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc b/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc
deleted file mode 100644
index cdcad24d9d3e..000000000000
--- a/www/iridium/files/patch-media_filters_ffmpeg__video__decodec.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- media/filters/ffmpeg_video_decoder.cc.orig	2018-04-28 14:12:48.579561000 +0200
-+++ media/filters/ffmpeg_video_decoder.cc	2018-04-28 14:16:02.028730000 +0200
-@@ -417,12 +417,11 @@
-   codec_context_->thread_type =
-       FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
-   codec_context_->opaque = this;
--  codec_context_->flags |= CODEC_FLAG_EMU_EDGE;
-   codec_context_->get_buffer2 = GetVideoBufferImpl;
-   codec_context_->refcounted_frames = 1;
- 
-   if (decode_nalus_)
--    codec_context_->flags2 |= CODEC_FLAG2_CHUNKS;
-+    codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
- 
-   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
diff --git a/www/iridium/files/patch-media_filters_ffmpeg_demuxer.cc b/www/iridium/files/patch-media_filters_ffmpeg_demuxer.cc
new file mode 100644
index 000000000000..6779de58b2b9
--- /dev/null
+++ b/www/iridium/files/patch-media_filters_ffmpeg_demuxer.cc
@@ -0,0 +1,139 @@
+--- media/filters/ffmpeg_demuxer.cc.orig	2018-05-09 21:05:52.000000000 +0200
++++ media/filters/ffmpeg_demuxer.cc	2018-08-16 15:57:49.477486000 +0200
+@@ -85,29 +85,26 @@
+       frames * base::Time::kMicrosecondsPerSecond / sample_rate);
+ }
+ 
+-static base::TimeDelta ExtractStartTime(AVStream* stream,
+-                                        base::TimeDelta start_time_estimate) {
+-  DCHECK(start_time_estimate != kNoTimestamp);
+-  if (stream->start_time == static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    return start_time_estimate == kInfiniteDuration ? base::TimeDelta()
+-                                                    : start_time_estimate;
+-  }
++static base::TimeDelta ExtractStartTime(AVStream* stream) {
++  // The default start time is zero.
++  base::TimeDelta start_time;
+ 
+-  // First try the lower of the estimate and the |start_time| value.
+-  base::TimeDelta start_time =
+-      std::min(ConvertFromTimeBase(stream->time_base, stream->start_time),
+-               start_time_estimate);
++  // First try to use the |start_time| value as is.
++  if (stream->start_time != kNoFFmpegTimestamp)
++    start_time = ConvertFromTimeBase(stream->time_base, stream->start_time);
+ 
+-  // Next see if the first buffered pts value is usable.
+-  if (stream->pts_buffer[0] != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    const base::TimeDelta buffered_pts =
+-        ConvertFromTimeBase(stream->time_base, stream->pts_buffer[0]);
+-    if (buffered_pts < start_time)
+-      start_time = buffered_pts;
++  // Next try to use the first DTS value, for codecs where we know PTS == DTS
++  // (exclude all H26x codecs). The start time must be returned in PTS.
++  if (stream->first_dts != kNoFFmpegTimestamp &&
++      stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
++      stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
++      stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
++    const base::TimeDelta first_pts =
++        ConvertFromTimeBase(stream->time_base, stream->first_dts);
++    if (first_pts < start_time)
++      start_time = first_pts;
+   }
+ 
+-  // NOTE: Do not use AVStream->first_dts since |start_time| should be a
+-  // presentation timestamp.
+   return start_time;
+ }
+ 
+@@ -514,7 +511,7 @@
+     buffer->set_duration(kNoTimestamp);
+   }
+ 
+-  // Note: If pts is AV_NOPTS_VALUE, stream_timestamp will be kNoTimestamp.
++  // Note: If pts is kNoFFmpegTimestamp, stream_timestamp will be kNoTimestamp.
+   const base::TimeDelta stream_timestamp =
+       ConvertStreamTimestamp(stream_->time_base, packet->pts);
+ 
+@@ -557,8 +554,8 @@
+   // code paths below; otherwise they should be treated as a parse error.
+   if ((!fixup_chained_ogg_ || last_packet_timestamp_ == kNoTimestamp) &&
+       buffer->timestamp() < base::TimeDelta()) {
+-    MEDIA_LOG(DEBUG, media_log_)
+-        << "FFmpegDemuxer: unfixable negative timestamp";
++    MEDIA_LOG(ERROR, media_log_)
++        << "FFmpegDemuxer: unfixable negative timestamp.";
+     demuxer_->NotifyDemuxerError(DEMUXER_ERROR_COULD_NOT_PARSE);
+     return;
+   }
+@@ -871,7 +868,7 @@
+ base::TimeDelta FFmpegDemuxerStream::ConvertStreamTimestamp(
+     const AVRational& time_base,
+     int64_t timestamp) {
+-  if (timestamp == static_cast<int64_t>(AV_NOPTS_VALUE))
++  if (timestamp == kNoFFmpegTimestamp)
+     return kNoTimestamp;
+ 
+   return ConvertFromTimeBase(time_base, timestamp);
+@@ -1271,42 +1268,6 @@
+   AVFormatContext* format_context = glue_->format_context();
+   streams_.resize(format_context->nb_streams);
+ 
+-  // Estimate the start time for each stream by looking through the packets
+-  // buffered during avformat_find_stream_info().  These values will be
+-  // considered later when determining the actual stream start time.
+-  //
+-  // These packets haven't been completely processed yet, so only look through
+-  // these values if the AVFormatContext has a valid start time.
+-  //
+-  // If no estimate is found, the stream entry will be kInfiniteDuration.
+-  std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
+-                                                    kInfiniteDuration);
+-#if !BUILDFLAG(USE_SYSTEM_FFMPEG)
+-  const AVFormatInternal* internal = format_context->internal;
+-  if (internal && internal->packet_buffer &&
+-      format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-    struct AVPacketList* packet_buffer = internal->packet_buffer;
+-    while (packet_buffer != internal->packet_buffer_end) {
+-      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
+-                start_time_estimates.size());
+-      const AVStream* stream =
+-          format_context->streams[packet_buffer->pkt.stream_index];
+-      if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
+-        const base::TimeDelta packet_pts =
+-            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
+-        // We ignore kNoTimestamp here since -int64_t::min() is possible; see
+-        // https://crbug.com/700501. Technically this is a valid value, but in
+-        // practice shouldn't occur, so just ignore it when estimating.
+-        if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
+-            packet_pts < start_time_estimates[stream->index]) {
+-          start_time_estimates[stream->index] = packet_pts;
+-        }
+-      }
+-      packet_buffer = packet_buffer->next;
+-    }
+-  }
+-#endif  // !BUILDFLAG(USE_SYSTEM_FFMPEG)
+-
+   std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
+ 
+   DCHECK(track_id_to_demux_stream_map_.empty());
+@@ -1455,8 +1416,7 @@
+ 
+     max_duration = std::max(max_duration, streams_[i]->duration());
+ 
+-    base::TimeDelta start_time =
+-        ExtractStartTime(stream, start_time_estimates[i]);
++    base::TimeDelta start_time = ExtractStartTime(stream);
+ 
+     // Note: This value is used for seeking, so we must take the true value and
+     // not the one possibly clamped to zero below.
+@@ -1494,7 +1454,7 @@
+   if (text_enabled_)
+     AddTextStreams();
+ 
+-  if (format_context->duration != static_cast<int64_t>(AV_NOPTS_VALUE)) {
++  if (format_context->duration != kNoFFmpegTimestamp) {
+     // If there is a duration value in the container use that to find the
+     // maximum between it and the duration from A/V streams.
+     const AVRational av_time_base = {1, AV_TIME_BASE};
diff --git a/www/iridium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc b/www/iridium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc
new file mode 100644
index 000000000000..f3c33e33d23f
--- /dev/null
+++ b/www/iridium/files/patch-media_filters_ffmpeg_demuxer_unittest.cc
@@ -0,0 +1,56 @@
+--- media/filters/ffmpeg_demuxer_unittest.cc.orig	2018-05-09 21:05:52.000000000 +0200
++++ media/filters/ffmpeg_demuxer_unittest.cc	2018-08-16 15:57:49.480177000 +0200
+@@ -724,12 +724,9 @@
+   ReadUntilEndOfStream(GetStream(DemuxerStream::AUDIO));
+ }
+ 
+-// TODO(dalecurtis): Test is disabled since FFmpeg does not currently guarantee
+-// the order of demuxed packets in OGG containers.  Re-enable and fix key frame
+-// expectations once we decide to either workaround it or attempt a fix
+-// upstream.  See http://crbug.com/387996.
+-TEST_F(FFmpegDemuxerTest,
+-       DISABLED_Read_AudioNegativeStartTimeAndOggDiscard_Bear) {
++// Android has no Theora support, so these tests doesn't work.
++#if !defined(OS_ANDROID)
++TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOggDiscard_Bear) {
+   // Many ogg files have negative starting timestamps, so ensure demuxing and
+   // seeking work correctly with a negative start time.
+   CreateDemuxer("bear.ogv");
+@@ -739,8 +736,12 @@
+   DemuxerStream* video = GetStream(DemuxerStream::VIDEO);
+   DemuxerStream* audio = GetStream(DemuxerStream::AUDIO);
+ 
+-  // Run the test twice with a seek in between.
+-  for (int i = 0; i < 2; ++i) {
++  // Run the test once (should be twice..., see note) with a seek in between.
++  //
++  // TODO(dalecurtis): We only run the test once since FFmpeg does not currently
++  // guarantee the order of demuxed packets in OGG containers. See
++  // http://crbug.com/387996
++  for (int i = 0; i < 1; ++i) {
+     audio->Read(
+         NewReadCBWithCheckedDiscard(FROM_HERE, 40, 0, kInfiniteDuration, true));
+     base::RunLoop().Run();
+@@ -759,10 +760,10 @@
+     video->Read(NewReadCB(FROM_HERE, 5751, 0, true));
+     base::RunLoop().Run();
+ 
+-    video->Read(NewReadCB(FROM_HERE, 846, 33367, true));
++    video->Read(NewReadCB(FROM_HERE, 846, 33367, false));
+     base::RunLoop().Run();
+ 
+-    video->Read(NewReadCB(FROM_HERE, 1255, 66733, true));
++    video->Read(NewReadCB(FROM_HERE, 1255, 66733, false));
+     base::RunLoop().Run();
+ 
+     // Seek back to the beginning and repeat the test.
+@@ -775,9 +776,6 @@
+ // Same test above, but using sync2.ogv which has video stream muxed before the
+ // audio stream, so seeking based only on start time will fail since ffmpeg is
+ // essentially just seeking based on file position.
+-//
+-// Android has no Theora support, so this test doesn't work.
+-#if !defined(OS_ANDROID)
+ TEST_F(FFmpegDemuxerTest, Read_AudioNegativeStartTimeAndOggDiscard_Sync) {
+   // Many ogg files have negative starting timestamps, so ensure demuxing and
+   // seeking work correctly with a negative start time.
diff --git a/www/iridium/files/patch-media_formats_common_offset__byte__queue.cc b/www/iridium/files/patch-media_formats_common_offset__byte__queue.cc
index 2e1dd669c948..6e26e25a24fe 100644
--- a/www/iridium/files/patch-media_formats_common_offset__byte__queue.cc
+++ b/www/iridium/files/patch-media_formats_common_offset__byte__queue.cc
@@ -1,6 +1,6 @@
---- media/formats/common/offset_byte_queue.cc.orig	2017-04-19 19:06:35 UTC
+--- media/formats/common/offset_byte_queue.cc.orig	2017-06-05 19:03:09 UTC
 +++ media/formats/common/offset_byte_queue.cc
-@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off
+@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin
    *size = tail() - offset;
  }
  
diff --git a/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
index 965a64bf93ae..49c230e40500 100644
--- a/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
+++ b/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc
@@ -1,6 +1,6 @@
---- media/formats/mp2t/es_parser_adts.cc.orig	2017-04-19 19:06:35 UTC
+--- media/formats/mp2t/es_parser_adts.cc.orig	2017-06-05 19:03:09 UTC
 +++ media/formats/mp2t/es_parser_adts.cc
-@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+@@ -60,11 +60,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;
-@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
      return true;
    }
  
diff --git a/www/iridium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/iridium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
index 8353d94cf59e..1dfb3b156c74 100644
--- a/www/iridium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
+++ b/www/iridium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
@@ -1,6 +1,6 @@
---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2017-04-19 19:06:35 UTC
+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2017-06-05 19:03:09 UTC
 +++ media/formats/mp2t/es_parser_mpeg1audio.cc
-@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
+@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
    const uint8_t* es;
    es_queue_->Peek(&es, &es_size);
  
@@ -15,7 +15,7 @@
      const uint8_t* cur_buf = &es[offset];
      if (cur_buf[0] != 0xff)
        continue;
-@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
+@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
      return true;
    }
  
diff --git a/www/iridium/files/patch-mojo_BUILD.gn b/www/iridium/files/patch-mojo_BUILD.gn
deleted file mode 100644
index c89989fa0357..000000000000
--- a/www/iridium/files/patch-mojo_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- mojo/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ mojo/BUILD.gn
-@@ -12,7 +12,7 @@ group("mojo") {
-     "//mojo/common",
-   ]
- 
--  if (!(is_linux && current_cpu == "x86")) {
-+  if (!((is_linux || is_bsd) && current_cpu == "x86")) {
-     deps += [ "//mojo/public" ]
-   }
- 
diff --git a/www/iridium/files/patch-mojo_edk_test_BUILD.gn b/www/iridium/files/patch-mojo_edk_test_BUILD.gn
deleted file mode 100644
index 19e36a588772..000000000000
--- a/www/iridium/files/patch-mojo_edk_test_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- mojo/edk/test/BUILD.gn.orig	2017-04-19 19:06:35 UTC
-+++ mojo/edk/test/BUILD.gn
-@@ -46,7 +46,7 @@ source_set("run_all_unittests") {
-     "//testing/gtest",
-   ]
- 
--  if (is_linux && !is_component_build) {
-+  if ((is_linux || is_bsd) && !is_component_build) {
-     public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-   }
- }
-@@ -66,7 +66,7 @@ source_set("run_all_perftests") {
-     "run_all_perftests.cc",
-   ]
- 
--  if (is_linux && !is_component_build) {
-+  if ((is_linux || is_bsd) && !is_component_build) {
-     public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-   }
- }
diff --git a/www/iridium/files/patch-native__client__sdk_src_BUILD.gn b/www/iridium/files/patch-native__client__sdk_src_BUILD.gn
deleted file mode 100644
index 6983b7f9dfae..000000000000
--- a/www/iridium/files/patch-native__client__sdk_src_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- native_client_sdk/src/BUILD.gn.orig	2017-04-19 19:06:36 UTC
-+++ native_client_sdk/src/BUILD.gn
-@@ -7,7 +7,7 @@ import("//build/config/features.gni")
- declare_args() {
-   # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86)
-   # binaries is supported.
--  enable_cross_trusted = is_linux
-+  enable_cross_trusted = is_linux || is_bsd
- 
-   # Build the nacl SDK untrusted components.  This is disabled by default since
-   # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc)
-@@ -28,7 +28,7 @@ if (enable_nacl) {
-         "//native_client/src/trusted/service_runtime:sel_ldr",
-         "//native_client/src/trusted/validator/driver:ncval_new",
-       ]
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         deps += [ "//native_client/src/nonsfi/loader:nonsfi_loader" ]
-       }
-     }
diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn
index de9b980c5d87..7a66e7c0b09f 100644
--- a/www/iridium/files/patch-net_BUILD.gn
+++ b/www/iridium/files/patch-net_BUILD.gn
@@ -1,6 +1,6 @@
---- net/BUILD.gn.orig	2017-04-19 21:06:36.000000000 +0200
-+++ net/BUILD.gn	2017-07-05 02:17:00.063914000 +0200
-@@ -79,7 +79,7 @@
+--- net/BUILD.gn.orig	2017-12-15 02:04:22.000000000 +0100
++++ net/BUILD.gn	2017-12-30 02:46:23.419099000 +0100
+@@ -99,7 +99,7 @@
    net_configs += [ "//build/config/linux/gconf" ]
  }
  
@@ -9,10 +9,12 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1824,6 +1824,17 @@
-       sources -= [ "disk_cache/blockfile/file_posix.cc" ]
-     }
+@@ -1954,6 +1954,17 @@
+       ]
  
+       sources -= [ "disk_cache/blockfile/file_posix.cc" ]
++    }
++
 +    if (is_bsd) {
 +      sources -= [
 +         "base/address_tracker_linux.cc",
@@ -22,64 +24,6 @@
 +         "base/network_interfaces_linux.cc",
 +      ]
 +      sources += [ "base/network_interfaces_freebsd.cc" ]
-+    }
-+
-     if (is_ios || is_mac) {
-       sources += [
-         "base/mac/url_conversions.h",
-@@ -2773,7 +2784,7 @@
-   }
- }
- 
--if (is_linux || is_mac) {
-+if (is_linux || is_bsd || is_mac) {
-   executable("cachetool") {
-     testonly = true
-     sources = [
-@@ -2802,7 +2813,7 @@
-   }
- }
- 
--if (is_linux) {
-+if (is_linux || is_bsd) {
-   static_library("epoll_server") {
-     sources = [
-       "tools/epoll_server/epoll_server.cc",
-@@ -2906,7 +2917,7 @@
-   }
- }
- 
--if (is_android || is_linux) {
-+if (is_android || is_linux || is_bsd) {
-   executable("disk_cache_memory_test") {
-     testonly = true
-     sources = [
-@@ -4767,7 +4778,7 @@
-     "third_party/nist-pkits/",
-   ]
- 
--  if (is_linux || is_mac || is_win) {
-+  if (is_linux || is_bsd || is_mac || is_win) {
-     deps += [
-       "//third_party/pyftpdlib/",
-       "//third_party/pywebsocket/",
-@@ -4790,7 +4801,7 @@
-   if (is_desktop_linux) {
-     deps += [ ":epoll_quic_tools" ]
-   }
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "tools/quic/chlo_extractor_test.cc",
-       "tools/quic/end_to_end_test.cc",
-@@ -4850,6 +4861,10 @@
- 
-   if (is_chromeos) {
-     sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
-+  }
-+
-+  if (is_bsd) {
-+    sources -= [ "base/address_tracker_linux_unittest.cc" ]
-   }
+     }
  
-   if (!is_proto_quic && v8_use_external_startup_data) {
+     if (is_ios || is_mac) {
diff --git a/www/iridium/files/patch-net_base_address__tracker__linux.cc b/www/iridium/files/patch-net_base_address__tracker__linux.cc
new file mode 100644
index 000000000000..ab312bfeaeba
--- /dev/null
+++ b/www/iridium/files/patch-net_base_address__tracker__linux.cc
@@ -0,0 +1,363 @@
+--- net/base/address_tracker_linux.cc.orig	2018-05-09 21:05:53.000000000 +0200
++++ net/base/address_tracker_linux.cc	2018-08-16 11:14:57.163315000 +0200
+@@ -19,96 +19,10 @@
+ namespace net {
+ namespace internal {
+ 
+-namespace {
+-
+-// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep
+-// may send spurious messages over rtnetlink. RTM_NEWLINK messages where
+-// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored.
+-bool IgnoreWirelessChange(const struct nlmsghdr* header,
+-                          const struct ifinfomsg* msg) {
+-  size_t length = IFLA_PAYLOAD(header);
+-  for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length);
+-       attr = RTA_NEXT(attr, length)) {
+-    if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0)
+-      return true;
+-  }
+-  return false;
+-}
+-
+-// Retrieves address from NETLINK address message.
+-// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0.
+-bool GetAddress(const struct nlmsghdr* header,
+-                IPAddress* out,
+-                bool* really_deprecated) {
+-  if (really_deprecated)
+-    *really_deprecated = false;
+-  const struct ifaddrmsg* msg =
+-      reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
+-  size_t address_length = 0;
+-  switch (msg->ifa_family) {
+-    case AF_INET:
+-      address_length = IPAddress::kIPv4AddressSize;
+-      break;
+-    case AF_INET6:
+-      address_length = IPAddress::kIPv6AddressSize;
+-      break;
+-    default:
+-      // Unknown family.
+-      return false;
+-  }
+-  // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on
+-  // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of
+-  // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6
+-  // have the IFA_LOCAL attribute.
+-  uint8_t* address = NULL;
+-  uint8_t* local = NULL;
+-  size_t length = IFA_PAYLOAD(header);
+-  for (const struct rtattr* attr =
+-           reinterpret_cast<const struct rtattr*>(IFA_RTA(msg));
+-       RTA_OK(attr, length);
+-       attr = RTA_NEXT(attr, length)) {
+-    switch (attr->rta_type) {
+-      case IFA_ADDRESS:
+-        DCHECK_GE(RTA_PAYLOAD(attr), address_length);
+-        address = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
+-        break;
+-      case IFA_LOCAL:
+-        DCHECK_GE(RTA_PAYLOAD(attr), address_length);
+-        local = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
+-        break;
+-      case IFA_CACHEINFO: {
+-        const struct ifa_cacheinfo *cache_info =
+-            reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr));
+-        if (really_deprecated)
+-          *really_deprecated = (cache_info->ifa_prefered == 0);
+-      } break;
+-      default:
+-        break;
+-    }
+-  }
+-  if (local)
+-    address = local;
+-  if (!address)
+-    return false;
+-  *out = IPAddress(address, address_length);
+-  return true;
+-}
+-
+-}  // namespace
+-
+ // static
+ char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) {
+-  memset(buf, 0, IFNAMSIZ);
+-  base::ScopedFD ioctl_socket = GetSocketForIoctl();
+-  if (!ioctl_socket.is_valid())
+-    return buf;
+-
+-  struct ifreq ifr = {};
+-  ifr.ifr_ifindex = interface_index;
+-
+-  if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0)
+-    strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1);
+-  return buf;
++  NOTIMPLEMENTED();
++  return NULL;
+ }
+ 
+ AddressTrackerLinux::AddressTrackerLinux()
+@@ -151,93 +65,8 @@
+ }
+ 
+ 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::MessageLoopForIO::current()->WatchFileDescriptor(
+-        netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this);
+-    if (rv < 0) {
+-      PLOG(ERROR) << "Could not watch NETLINK socket";
+-      AbortAndForceOnline();
+-      return;
+-    }
+-  }
++  NOTIMPLEMENTED();
++  AbortAndForceOnline();
+ }
+ 
+ void AddressTrackerLinux::AbortAndForceOnline() {
+@@ -248,25 +77,6 @@
+   connection_type_initialized_cv_.Broadcast();
+ }
+ 
+-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
+@@ -317,102 +127,7 @@
+                                         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.
+-          AddressMap::iterator 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;
+-    }
+-  }
++  NOTIMPLEMENTED();
+ }
+ 
+ void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
+@@ -449,34 +164,7 @@
+ }
+ 
+ void AddressTrackerLinux::UpdateCurrentConnectionType() {
+-  AddressTrackerLinux::AddressMap address_map = GetAddressMap();
+-  std::unordered_set<int> online_links = GetOnlineLinks();
+-
+-  // Strip out tunnel interfaces from online_links
+-  for (std::unordered_set<int>::const_iterator it = online_links.begin();
+-       it != online_links.end();) {
+-    if (IsTunnelInterface(*it)) {
+-      std::unordered_set<int>::const_iterator tunnel_it = it;
+-      ++it;
+-      online_links.erase(*tunnel_it);
+-    } else {
+-      ++it;
+-    }
+-  }
+-
+-  NetworkInterfaceList networks;
+-  NetworkChangeNotifier::ConnectionType type =
+-      NetworkChangeNotifier::CONNECTION_NONE;
+-  if (GetNetworkListImpl(&networks, 0, online_links, address_map,
+-                         get_interface_name_)) {
+-    type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks);
+-  } else {
+-    type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE
+-                                : NetworkChangeNotifier::CONNECTION_UNKNOWN;
+-  }
+-
+-  AddressTrackerAutoLock lock(*this, connection_type_lock_);
+-  current_connection_type_ = type;
++  NOTIMPLEMENTED();
+ }
+ 
+ int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting()
diff --git a/www/iridium/files/patch-net_base_address__tracker__linux.h b/www/iridium/files/patch-net_base_address__tracker__linux.h
index 71a5be50858f..982272f67744 100644
--- a/www/iridium/files/patch-net_base_address__tracker__linux.h
+++ b/www/iridium/files/patch-net_base_address__tracker__linux.h
@@ -1,28 +1,12 @@
---- net/base/address_tracker_linux.h.orig	2017-04-19 19:06:36 UTC
-+++ net/base/address_tracker_linux.h
-@@ -6,10 +6,12 @@
- #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
+--- net/base/address_tracker_linux.h.orig	2018-01-04 21:05:55.000000000 +0100
++++ net/base/address_tracker_linux.h	2018-01-21 13:43:10.477307000 +0100
+@@ -7,9 +7,6 @@
  
  #include <sys/socket.h>  // Needed to include netlink.
-+#if !defined(__FreeBSD__)
  // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
- #define net net_kernel
- #include <linux/rtnetlink.h>
- #undef net
-+#endif
+-#define net net_kernel
+-#include <linux/rtnetlink.h>
+-#undef net
  #include <stddef.h>
  
  #include <map>
-@@ -34,8 +36,11 @@ namespace internal {
- class NET_EXPORT_PRIVATE AddressTrackerLinux :
-     public base::MessageLoopForIO::Watcher {
-  public:
-+#if !defined(__FreeBSD__)
-   typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
--
-+#else
-+  typedef void* AddressMap;
-+#endif
-   // Non-tracking version constructor: it takes a snapshot of the
-   // current system configuration. Once Init() returns, the
-   // configuration is available through GetOnlineLinks() and
diff --git a/www/iridium/files/patch-net_base_mime__util__unittest.cc b/www/iridium/files/patch-net_base_mime__util__unittest.cc
deleted file mode 100644
index 83c743babaca..000000000000
--- a/www/iridium/files/patch-net_base_mime__util__unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/base/mime_util_unittest.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/base/mime_util_unittest.cc
-@@ -250,7 +250,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM
-     {"message/", 0, NULL, true},
-     {"image/bmp", 1, "bmp"},
-     {"video/*", 6, "mp4"},
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
-+#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS)
-     {"video/*", 6, "mpg"},
- #else
-     {"video/*", 6, "mpeg"},
diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc
index 9f6c055c9ac8..aec8a8f0c524 100644
--- a/www/iridium/files/patch-net_base_network__change__notifier.cc
+++ b/www/iridium/files/patch-net_base_network__change__notifier.cc
@@ -1,6 +1,6 @@
---- net/base/network_change_notifier.cc.orig	2017-04-19 19:06:36 UTC
+--- net/base/network_change_notifier.cc.orig	2017-06-05 19:03:09 UTC
 +++ net/base/network_change_notifier.cc
-@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti
+@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
  #elif defined(OS_MACOSX)
    return new NetworkChangeNotifierMac();
  #else
diff --git a/www/iridium/files/patch-net_base_network__interfaces__freebsd.cc b/www/iridium/files/patch-net_base_network__interfaces__freebsd.cc
index dc01f0f0ffd6..aa0e5720506b 100644
--- a/www/iridium/files/patch-net_base_network__interfaces__freebsd.cc
+++ b/www/iridium/files/patch-net_base_network__interfaces__freebsd.cc
@@ -217,7 +217,7 @@
 +    return false;
 +
 +  // getifaddrs() may require IO operations.
-+  base::ThreadRestrictions::AssertIOAllowed();
++  base::AssertBlockingAllowed();
 +
 +  ifaddrs* interfaces;
 +  if (getifaddrs(&interfaces) < 0) {
diff --git a/www/iridium/files/patch-net_dns_address__sorter__posix.cc b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
index 6e408eb2d677..e979cd2e1a89 100644
--- a/www/iridium/files/patch-net_dns_address__sorter__posix.cc
+++ b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
@@ -1,10 +1,12 @@
---- net/dns/address_sorter_posix.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/dns/address_sorter_posix.cc
-@@ -13,6 +13,7 @@
+--- net/dns/address_sorter_posix.cc.orig	2017-07-25 21:04:58.000000000 +0200
++++ net/dns/address_sorter_posix.cc	2017-08-02 21:07:01.353407000 +0200
+@@ -13,7 +13,9 @@
  #include <sys/socket.h>  // Must be included before ifaddrs.h.
  #include <ifaddrs.h>
  #include <net/if.h>
 +#include <net/if_var.h>
  #include <netinet/in_var.h>
++#include <netinet6/in6_var.h>
  #include <string.h>
  #include <sys/ioctl.h>
+ #endif
diff --git a/www/iridium/files/patch-net_dns_dns__util.cc b/www/iridium/files/patch-net_dns_dns__util.cc
index cc263cb10c21..ada516cf2d7a 100644
--- a/www/iridium/files/patch-net_dns_dns__util.cc
+++ b/www/iridium/files/patch-net_dns_dns__util.cc
@@ -1,8 +1,8 @@
---- net/dns/dns_util.cc.orig	2017-04-19 19:06:36 UTC
+--- net/dns/dns_util.cc.orig	2017-06-05 19:03:10 UTC
 +++ net/dns/dns_util.cc
-@@ -15,6 +15,8 @@
- #include "build/build_config.h"
- #include "net/base/address_list.h"
+@@ -26,6 +26,8 @@ const int kMaxLabelLength = 63;
+ 
+ }  // namespace
  
 +#include <sys/socket.h>
 +
diff --git a/www/iridium/files/patch-net_dns_host__resolver__proc.cc b/www/iridium/files/patch-net_dns_host__resolver__proc.cc
index 25a38246ed64..9f4df90bd0ca 100644
--- a/www/iridium/files/patch-net_dns_host__resolver__proc.cc
+++ b/www/iridium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,11 +1,11 @@
---- net/dns/host_resolver_proc.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/dns/host_resolver_proc.cc
-@@ -194,7 +194,7 @@ int SystemHostResolverCall(const std::st
+--- net/dns/host_resolver_proc.cc.orig	2017-09-05 21:05:22.000000000 +0200
++++ net/dns/host_resolver_proc.cc	2017-09-06 20:49:21.939725000 +0200
+@@ -190,7 +190,7 @@
+   // Restrict result set to only this socket type to avoid duplicates.
    hints.ai_socktype = SOCK_STREAM;
  
- #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
--    !defined(OS_ANDROID)
-+    !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
+     !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
    DnsReloaderMaybeReload();
  #endif
-   int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
diff --git a/www/iridium/files/patch-net_features.gni b/www/iridium/files/patch-net_features.gni
new file mode 100644
index 000000000000..3c963c1c28eb
--- /dev/null
+++ b/www/iridium/files/patch-net_features.gni
@@ -0,0 +1,11 @@
+--- net/features.gni.orig	2017-09-08 22:18:41.065160000 +0200
++++ net/features.gni	2017-09-08 22:18:51.191168000 +0200
+@@ -27,7 +27,7 @@
+   disable_brotli_filter = false
+ 
+   # Multicast DNS.
+-  enable_mdns = is_win || is_linux
++  enable_mdns = is_win || is_linux || is_bsd
+ 
+   # Reporting not used on iOS.
+   enable_reporting = !is_ios
diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
index 09bb69fb155d..f919b5a72b18 100644
--- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,12 +1,13 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/http/http_auth_gssapi_posix.cc
-@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:
+--- net/http/http_auth_gssapi_posix.cc.orig	2018-01-04 21:05:56.000000000 +0100
++++ net/http/http_auth_gssapi_posix.cc	2018-01-16 20:07:40.196726000 +0100
+@@ -431,8 +431,9 @@
      static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
        "/System/Library/Frameworks/GSS.framework/GSS"
 -#elif defined(OS_OPENBSD)
 -      "libgssapi.so"          // Heimdal - OpenBSD
 +#elif defined(OS_BSD)
++      "libgssapi_krb5.so.2",  // MIT Kerberos - FreeBSD
 +      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
  #else
        "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
diff --git a/www/iridium/files/patch-net_http_http__network__session.cc b/www/iridium/files/patch-net_http_http__network__session.cc
index c915a54ccfc1..215c47d5c3d3 100644
--- a/www/iridium/files/patch-net_http_http__network__session.cc
+++ b/www/iridium/files/patch-net_http_http__network__session.cc
@@ -1,9 +1,9 @@
---- net/http/http_network_session.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/http/http_network_session.cc
-@@ -23,7 +23,9 @@
+--- net/http/http_network_session.cc.orig	2018-06-13 00:10:22.000000000 +0200
++++ net/http/http_network_session.cc	2018-07-19 15:24:13.890886000 +0200
+@@ -20,7 +20,9 @@
+ #include "base/trace_event/memory_dump_request_args.h"
  #include "base/trace_event/process_memory_dump.h"
  #include "base/values.h"
- #include "net/base/network_throttle_manager_impl.h"
 +#if defined(USE_KERBEROS)
  #include "net/http/http_auth_handler_factory.h"
 +#endif
diff --git a/www/iridium/files/patch-net_proxy_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy_proxy__config__service__linux.cc
deleted file mode 100644
index 1e7563581150..000000000000
--- a/www/iridium/files/patch-net_proxy_proxy__config__service__linux.cc
+++ /dev/null
@@ -1,145 +0,0 @@
---- net/proxy/proxy_config_service_linux.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/proxy/proxy_config_service_linux.cc
-@@ -11,7 +11,14 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#if defined(OS_FREEBSD)
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#else
- #include <sys/inotify.h>
-+#endif
- #include <unistd.h>
- 
- #include <map>
-@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox
-  public:
-   explicit SettingGetterImplKDE(base::Environment* env_var_getter)
-       : inotify_fd_(-1),
-+        config_fd_(-1),
-         inotify_watcher_(FROM_HERE),
-         notify_delegate_(nullptr),
-         debounce_timer_(new base::OneShotTimer()),
-@@ -938,9 +946,10 @@ class SettingGetterImplKDE : public Prox
-     // and pending tasks may then be deleted without being run.
-     // Here in the KDE version, we can safely close the file descriptor
-     // anyway. (Not that it really matters; the process is exiting.)
--    if (inotify_fd_ >= 0)
-+    if (inotify_fd_ >= 0 || config_fd_ >= 0)
-       ShutDown();
-     DCHECK_LT(inotify_fd_, 0);
-+    DCHECK_LT(config_fd_, 0);
-   }
- 
-   bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
-@@ -949,9 +958,17 @@ class SettingGetterImplKDE : public Prox
-     // This has to be called on the UI thread (http://crbug.com/69057).
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     DCHECK_LT(inotify_fd_, 0);
-+#if defined(OS_BSD)
-+    inotify_fd_ = kqueue();
-+#else
-     inotify_fd_ = inotify_init();
-+#endif
-     if (inotify_fd_ < 0) {
-+#if defined(OS_BSD)
-+      PLOG(ERROR) << "kqueue failed";
-+#else
-       PLOG(ERROR) << "inotify_init failed";
-+#endif
-       return false;
-     }
-     if (!base::SetNonBlocking(inotify_fd_)) {
-@@ -975,22 +992,40 @@ class SettingGetterImplKDE : public Prox
-       close(inotify_fd_);
-       inotify_fd_ = -1;
-     }
-+    if (config_fd_ >= 0) {
-+      close(config_fd_);
-+      config_fd_ = -1;
-+    }
-     debounce_timer_.reset();
-   }
- 
-   bool SetUpNotifications(
-       ProxyConfigServiceLinux::Delegate* delegate) override {
-     DCHECK_GE(inotify_fd_, 0);
-+    DCHECK_GE(config_fd_, 0);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
-     // We can't just watch the kioslaverc file directly, since KDE will write
-     // a new copy of it and then rename it whenever settings are changed and
-     // inotify watches inodes (so we'll be watching the old deleted file after
-     // the first change, and it will never change again). So, we watch the
-     // directory instead. We then act only on changes to the kioslaverc entry.
-+#if defined(OS_BSD)
-+    config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY));
-+
-+    if (config_fd_ == -1)
-+      return false;
-+
-+    struct kevent ev;
-+    EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE,
-+            0, NULL);
-+    if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1)
-+      return false;
-+#else
-     if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
-                           IN_MODIFY | IN_MOVED_TO) < 0) {
-       return false;
-     }
-+#endif
-     notify_delegate_ = delegate;
-     if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
-             inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
-@@ -1011,7 +1046,19 @@ class SettingGetterImplKDE : public Prox
-   void OnFileCanReadWithoutBlocking(int fd) override {
-     DCHECK_EQ(fd, inotify_fd_);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
-+#if defined(OS_BSD)
-+    struct kevent ev;
-+    int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL);
-+
-+    if (rv != -1 && (ev.flags & EV_ERROR) == 0) {
-+      OnChangeNotification();
-+    } else {
-+      LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!";
-+      ShutDown();
-+    }
-+#else
-     OnChangeNotification();
-+#endif
-   }
-   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
- 
-@@ -1284,8 +1331,11 @@ class SettingGetterImplKDE : public Prox
-   void OnChangeNotification() {
-     DCHECK_GE(inotify_fd_,  0);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
--    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-     bool kioslaverc_touched = false;
-+#if defined(OS_BSD)
-+    kioslaverc_touched = true;
-+#else
-+    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-     ssize_t r;
-     while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
-       // inotify returns variable-length structures, which is why we have
-@@ -1322,6 +1372,7 @@ class SettingGetterImplKDE : public Prox
-         inotify_fd_ = -1;
-       }
-     }
-+#endif
-     if (kioslaverc_touched) {
-       // We don't use Reset() because the timer may not yet be running.
-       // (In that case Stop() is a no-op.)
-@@ -1337,6 +1388,7 @@ class SettingGetterImplKDE : public Prox
-                    std::vector<std::string> > strings_map_type;
- 
-   int inotify_fd_;
-+  int config_fd_;
-   base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
-   ProxyConfigServiceLinux::Delegate* notify_delegate_;
-   std::unique_ptr<base::OneShotTimer> debounce_timer_;
diff --git a/www/iridium/files/patch-net_proxy_proxy__service.cc b/www/iridium/files/patch-net_proxy_proxy__service.cc
deleted file mode 100644
index 759c79eb9d03..000000000000
--- a/www/iridium/files/patch-net_proxy_proxy__service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- net/proxy/proxy_service.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/proxy/proxy_service.cc
-@@ -49,7 +49,7 @@
- #elif defined(OS_MACOSX)
- #include "net/proxy/proxy_config_service_mac.h"
- #include "net/proxy/proxy_resolver_mac.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- #include "net/proxy/proxy_config_service_linux.h"
- #elif defined(OS_ANDROID)
- #include "net/proxy/proxy_config_service_android.h"
-@@ -1520,7 +1520,7 @@ ProxyService::CreateSystemProxyConfigSer
-              << "profile_io_data.cc::CreateProxyConfigService and this should "
-              << "be used only for examples.";
-   return base::WrapUnique(new UnsetProxyConfigService);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
-       new ProxyConfigServiceLinux());
- 
diff --git a/www/iridium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc b/www/iridium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc
new file mode 100644
index 000000000000..edfbb560c6a8
--- /dev/null
+++ b/www/iridium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc
@@ -0,0 +1,39 @@
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2018-07-19 15:35:02.171066000 +0200
++++ net/proxy_resolution/proxy_config_service_linux.cc	2018-07-19 15:37:12.958237000 +0200
+@@ -6,7 +6,9 @@
+ 
+ #include <errno.h>
+ #include <limits.h>
++#if !defined(OS_BSD)
+ #include <sys/inotify.h>
++#endif
+ #include <unistd.h>
+ 
+ #include <map>
+@@ -495,6 +497,7 @@
+   return default_value;
+ }
+ 
++#if !defined(OS_BSD)
+ // This is the KDE version that reads kioslaverc and simulates gsettings.
+ // Doing this allows the main Delegate code, as well as the unit tests
+ // for it, to stay the same - and the settings map fairly well besides.
+@@ -984,6 +987,7 @@
+ 
+   DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
+ };
++#endif
+ 
+ }  // namespace
+ 
+@@ -1199,8 +1203,10 @@
+     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+     case base::nix::DESKTOP_ENVIRONMENT_KDE4:
+     case base::nix::DESKTOP_ENVIRONMENT_KDE5:
++#if !defined(OS_BSD)
+       setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
+       break;
++#endif
+     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
+     case base::nix::DESKTOP_ENVIRONMENT_OTHER:
+       break;
diff --git a/www/iridium/files/patch-net_proxy_resolution_proxy_resolution_service.cc b/www/iridium/files/patch-net_proxy_resolution_proxy_resolution_service.cc
new file mode 100644
index 000000000000..39bbcca43e2e
--- /dev/null
+++ b/www/iridium/files/patch-net_proxy_resolution_proxy_resolution_service.cc
@@ -0,0 +1,29 @@
+--- net/proxy_resolution/proxy_resolution_service.cc.orig	2018-07-19 15:31:33.121813000 +0200
++++ net/proxy_resolution/proxy_resolution_service.cc	2018-07-19 15:32:46.994020000 +0200
+@@ -47,7 +47,7 @@
+ #elif defined(OS_MACOSX)
+ #include "net/proxy_resolution/proxy_config_service_mac.h"
+ #include "net/proxy_resolution/proxy_resolver_mac.h"
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "net/proxy_resolution/proxy_config_service_linux.h"
+ #elif defined(OS_ANDROID)
+ #include "net/proxy_resolution/proxy_config_service_android.h"
+@@ -61,7 +61,7 @@
+ namespace {
+ 
+ #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \
+-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++    ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
+     net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
+       semantics {
+@@ -1507,7 +1507,7 @@
+              << "profile_io_data.cc::CreateProxyConfigService and this should "
+              << "be used only for examples.";
+   return std::make_unique<UnsetProxyConfigService>();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
+       new ProxyConfigServiceLinux());
+ 
diff --git a/www/iridium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc b/www/iridium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
deleted file mode 100644
index 9b12538e39e4..000000000000
--- a/www/iridium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/quic/platform/impl/quic_ip_address_impl.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/quic/platform/impl/quic_ip_address_impl.cc
-@@ -12,6 +12,7 @@
- #include <ws2bth.h>
- #elif defined(OS_POSIX)
- #include <netinet/in.h>
-+#include <sys/socket.h>
- #endif
- 
- using std::string;
diff --git a/www/iridium/files/patch-net_quic_platform_impl_quic_ip_address_impl.cc b/www/iridium/files/patch-net_quic_platform_impl_quic_ip_address_impl.cc
new file mode 100644
index 000000000000..92aa0fcdddad
--- /dev/null
+++ b/www/iridium/files/patch-net_quic_platform_impl_quic_ip_address_impl.cc
@@ -0,0 +1,10 @@
+--- net/quic/platform/impl/quic_ip_address_impl.cc.orig	2018-08-16 11:22:27.420793000 +0200
++++ net/quic/platform/impl/quic_ip_address_impl.cc	2018-08-16 11:23:09.202594000 +0200
+@@ -12,6 +12,7 @@
+ #include <ws2bth.h>
+ #elif defined(OS_POSIX)
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #endif
+ 
+ using std::string;
diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc
index 2303db9bd7d0..fb35e85c930a 100644
--- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,29 +1,74 @@
---- net/socket/udp_socket_posix.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/socket/udp_socket_posix.cc
-@@ -59,7 +59,7 @@ const int kBindRetries = 10;
- const int kPortStart = 1024;
- const int kPortEnd = 65535;
+--- net/socket/udp_socket_posix.cc.orig	2018-06-13 00:10:23.000000000 +0200
++++ net/socket/udp_socket_posix.cc	2018-07-20 14:49:13.507247000 +0200
+@@ -72,7 +72,7 @@
+ const base::TimeDelta kActivityMonitorMsThreshold =
+     base::TimeDelta::FromMilliseconds(100);
  
+-#if defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ 
+ // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS and Fuchsia
+ // require passing IPv4 address instead of interface index. This function
+@@ -656,7 +656,7 @@
+ }
+ 
+ void UDPSocketPosix::SetMsgConfirm(bool confirm) {
+-#if !defined(OS_MACOSX) && !defined(OS_IOS)
++#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD)
+   if (confirm) {
+     sendto_flags_ |= MSG_CONFIRM;
+   } else {
+@@ -677,13 +677,16 @@
+   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+   int value = broadcast ? 1 : 0;
+   int rv;
 -#if defined(OS_MACOSX)
 +#if defined(OS_MACOSX) || defined(OS_BSD)
- 
- // Returns IPv4 address in network order.
- int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) {
-@@ -765,7 +765,7 @@ int UDPSocketPosix::SetMulticastOptions(
+   // SO_REUSEPORT on OSX permits multiple processes to each receive
+   // UDP multicast or broadcast datagrams destined for the bound
+   // port.
+   // This is only being set on OSX because its behavior is platform dependent
+   // and we are playing it safe by only setting it on platforms where things
+   // break.
++  rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value));
++  if (rv != 0)
++    return MapSystemError(errno);
+   rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value));
+   if (rv != 0)
+     return MapSystemError(errno);
+@@ -925,19 +928,24 @@
    if (multicast_interface_ != 0) {
      switch (addr_family_) {
        case AF_INET: {
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
+-#if defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+         ip_mreq mreq;
+         int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
+                                             &mreq.imr_interface.s_addr);
+         if (error != OK)
+           return error;
+-#else   //  defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#else   //  defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
          ip_mreqn mreq;
          mreq.imr_ifindex = multicast_interface_;
          mreq.imr_address.s_addr = htonl(INADDR_ANY);
-@@ -840,7 +840,7 @@ int UDPSocketPosix::JoinGroup(const IPAd
+ #endif  //  !defined(OS_MACOSX) && !defined(OS_FUCHSIA)
+         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));
++#else
+                             reinterpret_cast<const char*>(&mreq), sizeof(mreq));
++#endif
+         if (rv)
+           return MapSystemError(errno);
+         break;
+@@ -999,7 +1007,7 @@
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
  
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-       ip_mreqn mreq;
-       mreq.imr_ifindex = multicast_interface_;
-       mreq.imr_address.s_addr = htonl(INADDR_ANY);
+-#if defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+       ip_mreq mreq;
+       int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
+                                           &mreq.imr_interface.s_addr);
diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
deleted file mode 100644
index b2238dc7df8e..000000000000
--- a/www/iridium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/tools/cert_verify_tool/verify_using_path_builder.cc
-@@ -34,7 +34,7 @@
- #include "net/cert/internal/trust_store_nss.h"
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "net/proxy/proxy_config.h"
- #include "net/proxy/proxy_config_service_fixed.h"
- #endif
-@@ -185,7 +185,7 @@ void SetUpOnNetworkThread(std::unique_pt
-   // (similar to VERIFY_CERT_IO_ENABLED flag for CertVerifyProc).
-   net::URLRequestContextBuilder url_request_context_builder;
-   url_request_context_builder.set_user_agent(GetUserAgent());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // On Linux, use a fixed ProxyConfigService, since the default one
-   // depends on glib.
-   //
diff --git a/www/iridium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc b/www/iridium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc
new file mode 100644
index 000000000000..ac4efdd9bdc3
--- /dev/null
+++ b/www/iridium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc
@@ -0,0 +1,20 @@
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2018-07-19 22:18:26.747684000 +0200
++++ net/tools/cert_verify_tool/cert_verify_tool.cc	2018-07-19 22:18:48.374229000 +0200
+@@ -26,7 +26,7 @@
+ #include "net/url_request/url_request_context_builder.h"
+ #include "net/url_request/url_request_context_getter.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "net/proxy_resolution/proxy_config.h"
+ #include "net/proxy_resolution/proxy_config_service_fixed.h"
+ #endif
+@@ -45,7 +45,7 @@
+                           base::WaitableEvent* initialization_complete_event) {
+   net::URLRequestContextBuilder url_request_context_builder;
+   url_request_context_builder.set_user_agent(GetUserAgent());
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // On Linux, use a fixed ProxyConfigService, since the default one
+   // depends on glib.
+   //
diff --git a/www/iridium/files/patch-net_tools_get__server__time_get__server__time.cc b/www/iridium/files/patch-net_tools_get__server__time_get__server__time.cc
deleted file mode 100644
index 05475764b7d2..000000000000
--- a/www/iridium/files/patch-net_tools_get__server__time_get__server__time.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- net/tools/get_server_time/get_server_time.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/tools/get_server_time/get_server_time.cc
-@@ -46,7 +46,7 @@
- 
- #if defined(OS_MACOSX)
- #include "base/mac/scoped_nsautorelease_pool.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "net/proxy/proxy_config.h"
- #include "net/proxy/proxy_config_service_fixed.h"
- #endif
-@@ -142,7 +142,7 @@ class PrintingLogObserver : public net::
- std::unique_ptr<net::URLRequestContext> BuildURLRequestContext(
-     net::NetLog* net_log) {
-   net::URLRequestContextBuilder builder;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // On Linux, use a fixed ProxyConfigService, since the default one
-   // depends on glib.
-   //
diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
index b4bdf079d4db..1420fae0e561 100644
--- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,11 +1,11 @@
---- net/url_request/url_request_context_builder.cc.orig	2017-04-19 19:06:36 UTC
-+++ net/url_request/url_request_context_builder.cc
-@@ -327,7 +327,7 @@ std::unique_ptr<URLRequestContext> URLRe
-   if (!proxy_service_) {
-     // TODO(willchan): Switch to using this code when
-     // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
+--- net/url_request/url_request_context_builder.cc.orig	2018-06-13 00:10:23.000000000 +0200
++++ net/url_request/url_request_context_builder.cc	2018-07-19 16:09:43.508974000 +0200
+@@ -506,7 +506,7 @@
+   }
+ 
+   if (!proxy_resolution_service_) {
 -#if !defined(OS_LINUX) && !defined(OS_ANDROID)
 +#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-     if (!proxy_config_service_) {
-       proxy_config_service_ = ProxyService::CreateSystemProxyConfigService(
-           base::ThreadTaskRunnerHandle::Get().get(),
+     // TODO(willchan): Switch to using this code when
+     // ProxyResolutionService::CreateSystemProxyConfigService()'s signature
+     // doesn't suck.
diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
index e2376dbb721c..832fa36bbab4 100644
--- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2017-04-19 19:06:36 UTC
-+++ pdf/pdfium/pdfium_engine.cc
-@@ -129,7 +129,7 @@ std::vector<uint32_t> GetPageNumbersFrom
+--- pdf/pdfium/pdfium_engine.cc.orig	2018-05-09 21:05:54.000000000 +0200
++++ pdf/pdfium/pdfium_engine.cc	2018-08-16 11:32:37.234026000 +0200
+@@ -165,7 +165,7 @@
    return page_numbers;
  }
  
@@ -9,7 +9,7 @@
  
  PP_Instance g_last_instance_id;
  
-@@ -642,7 +642,7 @@ bool InitializeSDK() {
+@@ -717,7 +717,7 @@
    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
    FPDF_InitLibraryWithConfig(&config);
  
@@ -18,7 +18,7 @@
    // Font loading doesn't work in the renderer sandbox in Linux.
    FPDF_SetSystemFontInfo(&g_font_info);
  #else
-@@ -667,7 +667,7 @@ bool InitializeSDK() {
+@@ -742,7 +742,7 @@
  
  void ShutdownSDK() {
    FPDF_DestroyLibrary();
@@ -27,7 +27,7 @@
    delete g_font_info;
  #endif
    TearDownV8();
-@@ -772,7 +772,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
+@@ -844,7 +844,7 @@
    IFSDK_PAUSE::user = nullptr;
    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
  
@@ -36,7 +36,7 @@
    // PreviewModeClient does not know its pp::Instance.
    pp::Instance* instance = client_->GetPluginInstance();
    if (instance)
-@@ -1513,7 +1513,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
+@@ -1660,7 +1660,7 @@
      FPDF_ClosePage(pdf_page);
    }
  
@@ -45,7 +45,7 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -2950,7 +2950,7 @@ bool PDFiumEngine::ContinuePaint(int pro
+@@ -3409,7 +3409,7 @@
    DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
    DCHECK(image_data);
  
@@ -54,12 +54,12 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -3408,7 +3408,7 @@ void PDFiumEngine::SetCurrentPage(int in
+@@ -3872,7 +3872,7 @@
      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();
+   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
    if (most_visible_page_ != -1 && called_do_document_action_) {
diff --git a/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc b/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc
index 3ef9398d2555..7c9d6129908f 100644
--- a/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc
+++ b/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc
@@ -1,6 +1,6 @@
---- ppapi/proxy/file_io_resource.cc.orig	2017-04-19 19:06:36 UTC
+--- ppapi/proxy/file_io_resource.cc.orig	2017-06-05 19:03:10 UTC
 +++ ppapi/proxy/file_io_resource.cc
-@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
+@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset,
  
    if (check_quota_) {
      int64_t increase = 0;
@@ -24,7 +24,7 @@
      }
  
      if (increase > 0) {
-@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of
+@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t offset,
        if (append)
          append_mode_write_amount_ += bytes_to_write;
        else
@@ -33,7 +33,7 @@
      }
    }
    return WriteValidated(offset, buffer, bytes_to_write, callback);
-@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota
+@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuotaComplete(
    } else {
      DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
  
diff --git a/www/iridium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc b/www/iridium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
deleted file mode 100644
index ba76213e36b1..000000000000
--- a/www/iridium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2017-04-19 19:06:36 UTC
-+++ ppapi/shared_impl/private/net_address_private_impl.cc
-@@ -26,9 +26,12 @@
- #include <arpa/inet.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#if defined(OS_BSD)
-+#include <netinet/in.h>
-+#endif
- #endif
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // This is a bit evil, but it's standard operating procedure for |s6_addr|....
- #define s6_addr16 __u6_addr.__u6_addr16
- #endif
diff --git a/www/iridium/files/patch-ppapi_tests_extensions_BUILD.gn b/www/iridium/files/patch-ppapi_tests_extensions_BUILD.gn
deleted file mode 100644
index 78bd36de1632..000000000000
--- a/www/iridium/files/patch-ppapi_tests_extensions_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppapi/tests/extensions/BUILD.gn.orig	2017-04-19 19:06:36 UTC
-+++ ppapi/tests/extensions/BUILD.gn
-@@ -20,7 +20,7 @@ group("extensions") {
-     ":ppapi_tests_extensions_popup($newlib)",
-     ":ppapi_tests_extensions_socket_permissions($newlib)",
-   ]
--  if ((target_cpu == "x86" || target_cpu == "x64") && is_linux &&
-+  if ((target_cpu == "x86" || target_cpu == "x64") && (is_linux || is_bsd) &&
-       enable_nacl_nonsfi) {
-     nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
-     data_deps += [ ":ppapi_tests_extensions_packaged_app($nonsfi)" ]
diff --git a/www/iridium/files/patch-printing_BUILD.gn b/www/iridium/files/patch-printing_BUILD.gn
deleted file mode 100644
index a9c4ad77952c..000000000000
--- a/www/iridium/files/patch-printing_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- printing/BUILD.gn.orig	2017-04-19 19:06:36 UTC
-+++ printing/BUILD.gn
-@@ -138,7 +138,7 @@ component("printing") {
-   if (use_cups) {
-     configs += [ ":cups" ]
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       # rebase_path does not accept an empty string
-       if (use_sysroot) {
-         cups_sysroot = rebase_path(sysroot)
-@@ -215,7 +215,7 @@ component("printing") {
-       "printing_context_no_system_dialog.cc",
-       "printing_context_no_system_dialog.h",
-     ]
--  } else if (is_linux) {  # Non-ChromeOS Linux.
-+  } else if (is_linux || is_bsd) {  # Non-ChromeOS Linux/BSD.
-     sources += [
-       "printed_document_linux.cc",
-       "printing_context_linux.cc",
diff --git a/www/iridium/files/patch-printing_backend_print_backend_cups.h b/www/iridium/files/patch-printing_backend_print_backend_cups.h
new file mode 100644
index 000000000000..7867a572fb93
--- /dev/null
+++ b/www/iridium/files/patch-printing_backend_print_backend_cups.h
@@ -0,0 +1,11 @@
+--- printing/backend/print_backend_cups.h.orig	2017-09-07 12:48:26.701906000 +0200
++++ printing/backend/print_backend_cups.h	2017-09-07 12:48:48.628278000 +0200
+@@ -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"
diff --git a/www/iridium/files/patch-remoting_base_chromoting_event.cc b/www/iridium/files/patch-remoting_base_chromoting_event.cc
new file mode 100644
index 000000000000..f3ef11e5abf9
--- /dev/null
+++ b/www/iridium/files/patch-remoting_base_chromoting_event.cc
@@ -0,0 +1,11 @@
+--- remoting/base/chromoting_event.cc.orig	2017-08-10 16:16:33.217694000 +0200
++++ remoting/base/chromoting_event.cc	2017-08-10 16:16:51.082041000 +0200
+@@ -103,7 +103,7 @@
+   SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
+   SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
+   SetString(kWebAppVersionKey, STRINGIZE(VERSION));
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   Os os = Os::CHROMOTING_LINUX;
+ #elif defined(OS_CHROMEOS)
+   Os os = Os::CHROMOTING_CHROMEOS;
diff --git a/www/iridium/files/patch-remoting_client_display_sys_opengl.h b/www/iridium/files/patch-remoting_client_display_sys_opengl.h
new file mode 100644
index 000000000000..dc87e78e808a
--- /dev/null
+++ b/www/iridium/files/patch-remoting_client_display_sys_opengl.h
@@ -0,0 +1,11 @@
+--- remoting/client/display/sys_opengl.h.orig	2017-08-10 16:17:57.036915000 +0200
++++ remoting/client/display/sys_opengl.h	2017-08-10 16:18:06.520753000 +0200
+@@ -9,7 +9,7 @@
+ 
+ #if defined(OS_IOS)
+ #include <OpenGLES/ES3/gl.h>
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define GL_GLEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glext.h>
diff --git a/www/iridium/files/patch-remoting_host_BUILD.gn b/www/iridium/files/patch-remoting_host_BUILD.gn
deleted file mode 100644
index 04652d6d4561..000000000000
--- a/www/iridium/files/patch-remoting_host_BUILD.gn
+++ /dev/null
@@ -1,47 +0,0 @@
---- remoting/host/BUILD.gn.orig	2017-04-19 19:06:36 UTC
-+++ remoting/host/BUILD.gn
-@@ -326,7 +326,7 @@ static_library("host") {
-     deps += [ "//components/policy:generated" ]
-   }
- 
--  if (is_linux && !is_chromeos) {
-+  if ((is_linux || is_bsd) && !is_chromeos) {
-     libs += [ "pam" ]
-   }
- 
-@@ -345,7 +345,7 @@ static_library("host") {
-       "input_injector_x11.cc",
-       "local_input_monitor_x11.cc",
-     ]
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       # These will already be filtered out on non-Linux.
-       sources -= [
-         "linux/unicode_to_keysym.cc",
-@@ -531,7 +531,7 @@ source_set("unit_tests") {
-     "touch_injector_win_unittest.cc",
-   ]
- 
--  if (!use_x11 && is_linux) {
-+  if (!use_x11 && (is_linux || is_bsd)) {
-     sources -= [ "linux/unicode_to_keysym_unittest.cc" ]
-   }
-   if (use_ozone || is_chromeos) {
-@@ -747,7 +747,7 @@ if (enable_me2me_host) {
-     if (is_desktop_linux) {
-       deps += [ "//build/config/linux/gtk" ]
-     }
--    if ((is_linux && !is_chromeos) || is_mac) {
-+    if ((is_linux && !is_chromeos) || is_mac || is_bsd) {
-       libs = [ "pam" ]
-     }
- 
-@@ -817,7 +817,7 @@ if (enable_me2me_host) {
-       }
-     }
-   }
--  if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) {
-+  if (is_chrome_branded && enable_me2me_host && is_linux && is_bsd && !is_chromeos) {
-     group("remoting_me2me_host_archive") {
-       deps = [
-         "//remoting/host/installer/linux:remoting_me2me_host_archive",
diff --git a/www/iridium/files/patch-remoting_host_host__details.cc b/www/iridium/files/patch-remoting_host_host__details.cc
index 1088d08495bf..0adecc3b6e8c 100644
--- a/www/iridium/files/patch-remoting_host_host__details.cc
+++ b/www/iridium/files/patch-remoting_host_host__details.cc
@@ -1,11 +1,11 @@
---- remoting/host/host_details.cc.orig	2017-05-09 19:02:49 UTC
-+++ remoting/host/host_details.cc
-@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName()
+--- remoting/host/host_details.cc.orig	2017-08-03 00:05:16.000000000 +0200
++++ remoting/host/host_details.cc	2017-08-10 16:20:00.950699000 +0200
+@@ -22,7 +22,7 @@
+   return "Mac";
+ #elif defined(OS_CHROMEOS)
+   return "ChromeOS";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
    return "Linux";
  #elif defined(OS_ANDROID)
    return "Android";
-+#elif defined(OS_BSD)
-+  return "BSD";
- #else
- #error "Unsupported host OS"
- #endif
diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc
new file mode 100644
index 000000000000..43c73ab06080
--- /dev/null
+++ b/www/iridium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc
@@ -0,0 +1,20 @@
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig	2017-08-10 16:26:53.553976000 +0200
++++ remoting/host/it2me/it2me_native_messaging_host_main.cc	2017-08-10 16:27:23.735020000 +0200
+@@ -25,7 +25,7 @@
+ #include "remoting/host/resources.h"
+ #include "remoting/host/usage_stats_consent.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <gtk/gtk.h>
+ #include <X11/Xlib.h>
+ 
+@@ -83,7 +83,7 @@
+ 
+   remoting::LoadResources("");
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Required in order for us to run multiple X11 threads.
+   XInitThreads();
+ 
diff --git a/www/iridium/files/patch-remoting_host_me2me_desktop_environment.cc b/www/iridium/files/patch-remoting_host_me2me_desktop_environment.cc
new file mode 100644
index 000000000000..e23254e82c0c
--- /dev/null
+++ b/www/iridium/files/patch-remoting_host_me2me_desktop_environment.cc
@@ -0,0 +1,11 @@
+--- remoting/host/me2me_desktop_environment.cc.orig	2017-08-10 16:28:52.379518000 +0200
++++ remoting/host/me2me_desktop_environment.cc	2017-08-10 16:29:10.165289000 +0200
+@@ -99,7 +99,7 @@
+ 
+   // Otherwise, if the session is shared with the local user start monitoring
+   // the local input and create the in-session UI.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   bool want_user_interface = false;
+ #elif defined(OS_MACOSX)
+   // Don't try to display any UI on top of the system's login screen as this
diff --git a/www/iridium/files/patch-remoting_host_remoting_me2me_host.cc b/www/iridium/files/patch-remoting_host_remoting_me2me_host.cc
new file mode 100644
index 000000000000..3a8f8d1df4d0
--- /dev/null
+++ b/www/iridium/files/patch-remoting_host_remoting_me2me_host.cc
@@ -0,0 +1,108 @@
+--- remoting/host/remoting_me2me_host.cc.orig	2018-03-20 23:05:29.000000000 +0100
++++ remoting/host/remoting_me2me_host.cc	2018-03-24 18:19:49.996963000 +0100
+@@ -115,13 +115,13 @@
+ #include "base/mac/scoped_cftyperef.h"
+ #endif  // defined(OS_MACOSX)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <gtk/gtk.h>
+ #include "base/linux_util.h"
+ #include "remoting/host/audio_capturer_linux.h"
+ #include "remoting/host/linux/certificate_watcher.h"
+ #include "ui/gfx/x/x11.h"
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_WIN)
+ #include <commctrl.h>
+@@ -156,11 +156,11 @@
+ const char kStdinConfigPath[] = "-";
+ #endif  // !defined(REMOTING_MULTI_PROCESS)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // The command line switch used to pass name of the pipe to capture audio on
+ // linux.
+ const char kAudioPipeSwitchName[] = "audio-pipe-name";
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_POSIX)
+ // The command line switch used to pass name of the unix domain socket used to
+@@ -351,7 +351,7 @@
+ 
+   std::unique_ptr<ChromotingHostContext> context_;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Watch for certificate changes and kill the host when changes occur
+   std::unique_ptr<CertificateWatcher> cert_watcher_;
+ #endif
+@@ -565,10 +565,10 @@
+   enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
+   if (enable_window_capture_) {
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+     LOG(WARNING) << "Window capturing is not fully supported on Linux or "
+                     "Windows.";
+-#endif  // defined(OS_LINUX) || defined(OS_WIN)
++#endif  // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+     // uint32_t is large enough to hold window IDs on all platforms.
+     uint32_t window_id;
+@@ -761,7 +761,7 @@
+     DCHECK(third_party_auth_config_.token_url.is_valid());
+     DCHECK(third_party_auth_config_.token_validation_url.is_valid());
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     if (!cert_watcher_) {
+       cert_watcher_.reset(new CertificateWatcher(
+           base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode),
+@@ -847,7 +847,7 @@
+       base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
+       base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // 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()->
+@@ -856,7 +856,7 @@
+     remoting::AudioCapturerLinux::InitializePipeReader(
+         context_->audio_task_runner(), audio_pipe_name);
+   }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_POSIX)
+   base::FilePath security_key_socket_name =
+@@ -914,7 +914,7 @@
+   // It is now safe for the HostProcess to be deleted.
+   self_ = nullptr;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // 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.
+@@ -1546,7 +1546,7 @@
+   host_->AddExtension(std::make_unique<TestEchoExtension>());
+ 
+   // TODO(simonmorris): Get the maximum session duration from a policy.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
+ #endif
+ 
+@@ -1705,7 +1705,7 @@
+ int HostProcessMain() {
+   HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+           kReportOfflineReasonSwitchName)) {
+     // Required in order for us to run multiple X11 threads.
diff --git a/www/iridium/files/patch-remoting_webapp_base_js_platform.js b/www/iridium/files/patch-remoting_webapp_base_js_platform.js
new file mode 100644
index 000000000000..3b0cb7b697c5
--- /dev/null
+++ b/www/iridium/files/patch-remoting_webapp_base_js_platform.js
@@ -0,0 +1,17 @@
+--- remoting/webapp/base/js/platform.js.orig	2017-08-10 16:21:23.900363000 +0200
++++ remoting/webapp/base/js/platform.js	2017-08-10 16:24:46.113671000 +0200
+@@ -107,6 +107,14 @@
+     return result;
+   }
+ 
++  match = new RegExp('FreeBSD ([a-zA-Z0-9_]*)').exec(userAgent);
++  if (match && (match.length >= 2)) {
++    result.osName = remoting.Os.LINUX;
++    result.osVersion = '';
++    result.cpu = match[1];
++    return result;
++  }
++
+   match = new RegExp('([a-zA-Z]*) Mac OS X ([0-9_]*)').exec(userAgent);
+   if (match && (match.length >= 3)) {
+     result.osName = remoting.Os.MAC;
diff --git a/www/iridium/files/patch-sandbox_BUILD.gn b/www/iridium/files/patch-sandbox_BUILD.gn
new file mode 100644
index 000000000000..70f637ed927f
--- /dev/null
+++ b/www/iridium/files/patch-sandbox_BUILD.gn
@@ -0,0 +1,11 @@
+--- sandbox/BUILD.gn.orig	2017-08-02 15:41:12.498502000 +0200
++++ sandbox/BUILD.gn	2017-08-02 15:42:43.975385000 +0200
+@@ -24,7 +24,7 @@
+       "//sandbox/mac:sandbox",
+       "//sandbox/mac:seatbelt",
+     ]
+-  } else if (is_linux || is_android) {
++  } else if ((is_linux && !is_bsd) || is_android) {
+     public_deps = [
+       "//sandbox/linux:sandbox",
+     ]
diff --git a/www/iridium/files/patch-sandbox_features.gni b/www/iridium/files/patch-sandbox_features.gni
index 37cebdfaf372..f3ca941032df 100644
--- a/www/iridium/files/patch-sandbox_features.gni
+++ b/www/iridium/files/patch-sandbox_features.gni
@@ -1,10 +1,10 @@
---- sandbox/features.gni.orig	2017-04-19 19:06:37 UTC
-+++ sandbox/features.gni
-@@ -11,6 +11,6 @@ import("//build/config/nacl/config.gni")
- use_seccomp_bpf =
+--- sandbox/features.gni.orig	2017-12-15 02:04:24.000000000 +0100
++++ sandbox/features.gni	2017-12-24 17:50:45.309732000 +0100
+@@ -12,6 +12,6 @@
      (is_linux || is_android) &&
      (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
--     current_cpu == "arm64" || current_cpu == "mipsel")
-+     current_cpu == "arm64" || current_cpu == "mipsel") && !is_bsd
+      current_cpu == "arm64" || current_cpu == "mipsel" ||
+-     current_cpu == "mips64el")
++     current_cpu == "mips64el") && !is_bsd
  
  use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn
index 4073d740e794..01133217e052 100644
--- a/www/iridium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn
@@ -1,11 +1,47 @@
---- sandbox/linux/BUILD.gn.orig	2017-04-24 14:40:29 UTC
-+++ sandbox/linux/BUILD.gn
-@@ -284,7 +284,7 @@ if (is_linux) {
-       # TODO fix this and re-enable this warning.
-       "-Wno-sign-compare",
-     ]
--    ldflags = [ "-pie", "-Wl,--no-keep-memory" ]
-+    ldflags = [ "-pie" ]
+--- sandbox/linux/BUILD.gn.orig	2018-05-17 22:11:48.947218775 +0200
++++ sandbox/linux/BUILD.gn	2018-08-16 11:54:16.112049000 +0200
+@@ -12,12 +12,12 @@
+ }
+ 
+ declare_args() {
+-  compile_suid_client = is_linux
++  compile_suid_client = is_linux && !is_bsd
+ 
+-  compile_credentials = is_linux
++  compile_credentials = is_linux && !is_bsd
+ 
+   # On Android, use plain GTest.
+-  use_base_test_suite = is_linux
++  use_base_test_suite = is_linux && !is_bsd
+ }
  
-     import("//build/config/compiler/compiler.gni")
-     import("//build/config/sanitizers/sanitizers.gni")
+ if (is_nacl_nonsfi) {
+@@ -397,7 +397,7 @@
+     public_deps += [ ":sandbox_services_headers" ]
+   }
+ 
+-  if (is_nacl_nonsfi) {
++  if (is_nacl_nonsfi || is_bsd) {
+     cflags = [ "-fgnu-inline-asm" ]
+ 
+     sources -= [
+@@ -405,6 +405,8 @@
+       "services/init_process_reaper.h",
+       "services/scoped_process.cc",
+       "services/scoped_process.h",
++      "services/syscall_wrappers.cc",
++      "services/syscall_wrappers.h",
+       "services/yama.cc",
+       "services/yama.h",
+       "syscall_broker/broker_channel.cc",
+@@ -421,6 +423,10 @@
+       "syscall_broker/broker_permission_list.h",
+       "syscall_broker/broker_process.cc",
+       "syscall_broker/broker_process.h",
++    ]
++    sources += [
++      "services/libc_interceptor.cc",
++      "services/libc_interceptor.h",
+     ]
+   } else if (!is_android) {
+     sources += [
diff --git a/www/iridium/files/patch-sandbox_linux_services_init_process_reaper.cc b/www/iridium/files/patch-sandbox_linux_services_init_process_reaper.cc
new file mode 100644
index 000000000000..1766c2eb71f8
--- /dev/null
+++ b/www/iridium/files/patch-sandbox_linux_services_init_process_reaper.cc
@@ -0,0 +1,15 @@
+--- sandbox/linux/services/init_process_reaper.cc.orig	2018-08-04 19:26:41.605247000 +0200
++++ sandbox/linux/services/init_process_reaper.cc	2018-08-04 19:27:02.769442000 +0200
+@@ -1,6 +1,7 @@
+ // Copyright 2013 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.
++#if 0
+ 
+ #include "sandbox/linux/services/init_process_reaper.h"
+ 
+@@ -100,3 +101,4 @@
+ }
+ 
+ }  // namespace sandbox.
++#endif
diff --git a/www/iridium/files/patch-sandbox_linux_services_libc_interceptor.cc b/www/iridium/files/patch-sandbox_linux_services_libc_interceptor.cc
new file mode 100644
index 000000000000..e35affcfb2a3
--- /dev/null
+++ b/www/iridium/files/patch-sandbox_linux_services_libc_interceptor.cc
@@ -0,0 +1,21 @@
+--- sandbox/linux/services/libc_interceptor.cc.orig	2018-07-19 22:19:52.264027000 +0200
++++ sandbox/linux/services/libc_interceptor.cc	2018-07-19 22:20:31.348730000 +0200
+@@ -11,7 +11,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <time.h>
+@@ -94,7 +96,7 @@
+   } else {
+     base::AutoLock lock(g_timezones_lock.Get());
+     auto ret_pair = g_timezones.Get().insert(timezone);
+-    output->tm_zone = ret_pair.first->c_str();
++    output->tm_zone = (char *)ret_pair.first->c_str();
+   }
+ 
+   return true;
diff --git a/www/iridium/files/patch-sdch_BUILD.gn b/www/iridium/files/patch-sdch_BUILD.gn
deleted file mode 100644
index 330821b5431f..000000000000
--- a/www/iridium/files/patch-sdch_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- sdch/BUILD.gn.orig	2017-04-19 19:06:37 UTC
-+++ sdch/BUILD.gn
-@@ -11,7 +11,7 @@ config("sdch_config") {
- # from a config and can't be on the target directly.
- config("sdch_warnings") {
-   cflags = []
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11:
-     cflags += [ "-Wno-deprecated-declarations" ]
-   }
-@@ -59,7 +59,7 @@ static_library("sdch") {
-     "//third_party/zlib",
-   ]
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     include_dirs = [ "linux" ]
-   } else if (is_ios) {
-     include_dirs = [ "ios" ]
diff --git a/www/iridium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc b/www/iridium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc
index 3603b479140f..e16314b405b1 100644
--- a/www/iridium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc
+++ b/www/iridium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc
@@ -1,19 +1,19 @@
---- services/catalog/public/cpp/manifest_parsing_util.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/catalog/public/cpp/manifest_parsing_util.cc
-@@ -15,7 +15,8 @@ bool IsValidPlatformName(const std::stri
-   return name == Store::kRequiredFilesKey_PlatformValue_Windows ||
+--- services/catalog/public/cpp/manifest_parsing_util.cc.orig	2017-09-05 21:05:23.000000000 +0200
++++ services/catalog/public/cpp/manifest_parsing_util.cc	2017-09-06 21:09:16.599702000 +0200
+@@ -17,7 +17,8 @@
           name == Store::kRequiredFilesKey_PlatformValue_Linux ||
           name == Store::kRequiredFilesKey_PlatformValue_MacOSX ||
--         name == Store::kRequiredFilesKey_PlatformValue_Android;
-+         name == Store::kRequiredFilesKey_PlatformValue_Android ||
+          name == Store::kRequiredFilesKey_PlatformValue_Android ||
+-         name == Store::kRequiredFilesKey_PlatformValue_Fuchsia;
++         name == Store::kRequiredFilesKey_PlatformValue_Fuchsia ||
 +         name == Store::kRequiredFilesKey_PlatformValue_FreeBSD;
  }
  
  bool IsCurrentPlatform(const std::string& name) {
-@@ -27,6 +28,8 @@ bool IsCurrentPlatform(const std::string
-   return name == Store::kRequiredFilesKey_PlatformValue_MacOSX;
- #elif defined(OS_ANDROID)
+@@ -31,6 +32,8 @@
    return name == Store::kRequiredFilesKey_PlatformValue_Android;
+ #elif defined(OS_FUCHSIA)
+   return name == Store::kRequiredFilesKey_PlatformValue_Fuchsia;
 +#elif defined(OS_BSD)
 +  return name == Store::kRequiredFilesKey_PlatformValue_FreeBSD;
  #else
diff --git a/www/iridium/files/patch-services_catalog_store.cc b/www/iridium/files/patch-services_catalog_store.cc
index 04f61b3ae404..7fe825d4f478 100644
--- a/www/iridium/files/patch-services_catalog_store.cc
+++ b/www/iridium/files/patch-services_catalog_store.cc
@@ -1,9 +1,10 @@
---- services/catalog/store.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/catalog/store.cc
-@@ -32,4 +32,6 @@ const char Store::kRequiredFilesKey_Plat
- const char Store::kRequiredFilesKey_PlatformValue_MacOSX[] = "macosx";
- // static
+--- services/catalog/store.cc.orig	2017-09-05 21:05:23.000000000 +0200
++++ services/catalog/store.cc	2017-09-06 21:21:50.819060000 +0200
+@@ -34,5 +34,7 @@
  const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android";
+ // static
+ const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia";
 +// static
 +const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd";
+ 
  }  // namespace catalog
diff --git a/www/iridium/files/patch-services_catalog_store.h b/www/iridium/files/patch-services_catalog_store.h
index 4743990c18ef..5e5d7fe733ae 100644
--- a/www/iridium/files/patch-services_catalog_store.h
+++ b/www/iridium/files/patch-services_catalog_store.h
@@ -1,9 +1,9 @@
---- services/catalog/store.h.orig	2017-04-19 19:06:37 UTC
-+++ services/catalog/store.h
-@@ -33,6 +33,7 @@ class Store {
-   static const char kRequiredFilesKey_PlatformValue_Linux[];
+--- services/catalog/store.h.orig	2017-09-05 21:05:23.000000000 +0200
++++ services/catalog/store.h	2017-09-06 21:16:22.831744000 +0200
+@@ -34,6 +34,7 @@
    static const char kRequiredFilesKey_PlatformValue_MacOSX[];
    static const char kRequiredFilesKey_PlatformValue_Android[];
+   static const char kRequiredFilesKey_PlatformValue_Fuchsia[];
 +  static const char kRequiredFilesKey_PlatformValue_FreeBSD[];
  };
  
diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn
new file mode 100644
index 000000000000..4e866f40a947
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_BUILD.gn
@@ -0,0 +1,22 @@
+--- services/device/hid/BUILD.gn.orig	2018-03-04 02:07:03.748216000 +0100
++++ services/device/hid/BUILD.gn	2018-03-04 02:10:30.278997000 +0100
+@@ -52,6 +52,19 @@
+     deps += [ "//device/udev_linux" ]
+   }
+ 
++  if (is_bsd) {
++    sources -= [
++      "hid_connection_linux.cc",
++      "hid_connection_linux.h",
++    ]
++    sources += [
++      "hid_connection_freebsd.cc",
++      "hid_connection_freebsd.h",
++      "hid_service_freebsd.cc",
++      "hid_service_freebsd.h",
++    ]
++  }
++
+   if (is_chromeos) {
+     deps += [ "//chromeos" ]
+   }
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
new file mode 100644
index 000000000000..a8979b0c82cf
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -0,0 +1,280 @@
+--- services/device/hid/hid_connection_freebsd.cc.orig	2018-07-20 13:47:11.556393000 +0200
++++ services/device/hid/hid_connection_freebsd.cc	2018-07-20 15:22:57.210103000 +0200
+@@ -0,0 +1,277 @@
++// Copyright (c) 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.
++
++#include "services/device/hid/hid_connection_freebsd.h"
++
++#include <dev/usb/usbhid.h>
++#include <dev/usb/usb_ioctl.h>
++
++#include "base/bind.h"
++#include "base/files/file_descriptor_watcher_posix.h"
++#include "base/location.h"
++#include "base/numerics/safe_math.h"
++#include "base/posix/eintr_wrapper.h"
++#include "base/single_thread_task_runner.h"
++#include "base/strings/stringprintf.h"
++#include "base/task_scheduler/post_task.h"
++#include "base/threading/thread_restrictions.h"
++#include "base/threading/thread_task_runner_handle.h"
++#include "components/device_event_log/device_event_log.h"
++#include "services/device/hid/hid_service.h"
++
++namespace device {
++
++class HidConnectionFreeBSD::BlockingTaskHelper {
++ public:
++  BlockingTaskHelper(base::ScopedFD fd,
++                     scoped_refptr<HidDeviceInfo> device_info,
++                     base::WeakPtr<HidConnectionFreeBSD> connection)
++      : fd_(std::move(fd)),
++        connection_(connection),
++        origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
++    DETACH_FROM_SEQUENCE(sequence_checker_);
++    // Report buffers must always have room for the report ID.
++    report_buffer_size_ = device_info->max_input_report_size() + 1;
++    has_report_id_ = device_info->has_report_id();
++  }
++
++  ~BlockingTaskHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
++
++  // Starts the FileDescriptorWatcher that reads input events from the device.
++  // Must be called on a thread that has a base::MessageLoopForIO.
++  void Start() {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++    base::AssertBlockingAllowed();
++
++    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
++        fd_.get(), base::Bind(&BlockingTaskHelper::OnFileCanReadWithoutBlocking,
++                              base::Unretained(this)));
++  }
++
++  void Write(scoped_refptr<base::RefCountedBytes> buffer,
++             WriteCallback callback) {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++    auto data = buffer->front();
++    size_t size = buffer->size();
++    // if report id is 0, it shouldn't be included
++    if (data[0] == 0) {
++      data++;
++      size--;
++    }
++
++    ssize_t result = HANDLE_EINTR(write(fd_.get(), data, size));
++    if (result < 0) {
++      HID_PLOG(EVENT) << "Write failed";
++      origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), false));
++    } else {
++      if (static_cast<size_t>(result) != size)
++        HID_LOG(EVENT) << "Incomplete HID write: " << result << " != " << size;
++      origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), true));
++    }
++  }
++
++  void GetFeatureReport(uint8_t report_id,
++                        scoped_refptr<base::RefCountedBytes> buffer,
++                        ReadCallback callback) {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++    struct usb_gen_descriptor ugd;
++    ugd.ugd_report_type = UHID_FEATURE_REPORT;
++    ugd.ugd_data = buffer->front();
++    ugd.ugd_maxlen = buffer->size();
++    int result = HANDLE_EINTR(
++        ioctl(fd_.get(), USB_GET_REPORT, &ugd));
++    if (result < 0) {
++      HID_PLOG(EVENT) << "Failed to get feature report";
++      origin_task_runner_->PostTask(FROM_HERE,
++                                    base::BindOnce(std::move(callback), false, nullptr, 0));
++    } else if (result == 0) {
++      HID_LOG(EVENT) << "Get feature result too short.";
++      origin_task_runner_->PostTask(FROM_HERE,
++                                    base::BindOnce(std::move(callback), false, nullptr, 0));
++    } else {
++      origin_task_runner_->PostTask(FROM_HERE,
++                                    base::BindOnce(std::move(callback), true, buffer, result));
++    }
++  }
++
++  void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
++                         WriteCallback callback) {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++    struct usb_gen_descriptor ugd;
++    ugd.ugd_report_type = UHID_FEATURE_REPORT;
++    ugd.ugd_data = buffer->front();
++    ugd.ugd_maxlen = buffer->size();
++    // FreeBSD does not require report id if it's not used
++    if (buffer->front()[0] == 0) {
++      ugd.ugd_data = buffer->front() + 1;
++      ugd.ugd_maxlen = buffer->size() - 1;
++    } else {
++      ugd.ugd_data = buffer->front();
++      ugd.ugd_maxlen = buffer->size();
++    }
++    int result = HANDLE_EINTR(
++        ioctl(fd_.get(), USB_SET_REPORT, &ugd));
++    if (result < 0) {
++      HID_PLOG(EVENT) << "Failed to send feature report";
++      origin_task_runner_->PostTask(FROM_HERE,
++                                    base::BindOnce(std::move(callback), false));
++    } else {
++      origin_task_runner_->PostTask(FROM_HERE,
++                                    base::BindOnce(std::move(callback), true));
++    }
++  }
++
++ private:
++  void OnFileCanReadWithoutBlocking() {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++
++    scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_));
++    unsigned char* data = buffer->front();
++    size_t length = report_buffer_size_;
++    if (!has_report_id_) {
++      // FreeBSD will not prefix the buffer with a report ID if report IDs are not
++      // used by the device. Prefix the buffer with 0.
++      *data++ = 0;
++      length--;
++    }
++
++    ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length));
++    if (bytes_read < 0) {
++      if (errno != EAGAIN) {
++        HID_PLOG(EVENT) << "Read failed";
++        // This assumes that the error is unrecoverable and disables reading
++        // from the device until it has been re-opened.
++        // TODO(reillyg): Investigate starting and stopping the file descriptor
++        // watcher in response to pending read requests so that per-request
++        // errors can be returned to the client.
++        file_watcher_.reset();
++      }
++      return;
++    }
++    if (!has_report_id_) {
++      // Behave as if the byte prefixed above as the the report ID was read.
++      bytes_read++;
++    }
++
++    origin_task_runner_->PostTask(
++        FROM_HERE, base::BindOnce(&HidConnectionFreeBSD::ProcessInputReport,
++                              connection_, buffer, bytes_read));
++  }
++
++  SEQUENCE_CHECKER(sequence_checker_);
++  base::ScopedFD fd_;
++  size_t report_buffer_size_;
++  bool has_report_id_;
++  base::WeakPtr<HidConnectionFreeBSD> connection_;
++  const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_;
++  std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_;
++
++  DISALLOW_COPY_AND_ASSIGN(BlockingTaskHelper);
++};
++
++HidConnectionFreeBSD::HidConnectionFreeBSD(
++    scoped_refptr<HidDeviceInfo> device_info,
++    base::ScopedFD fd,
++    scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
++    : HidConnection(device_info),
++      blocking_task_runner_(std::move(blocking_task_runner)),
++      weak_factory_(this) {
++  helper_ = std::make_unique<BlockingTaskHelper>(std::move(fd), device_info,
++                                                 weak_factory_.GetWeakPtr());
++  blocking_task_runner_->PostTask(
++      FROM_HERE, base::BindOnce(&BlockingTaskHelper::Start,
++                                base::Unretained(helper_.get())));
++}
++
++HidConnectionFreeBSD::~HidConnectionFreeBSD() {}
++
++void HidConnectionFreeBSD::PlatformClose() {
++  // By closing the device on the blocking task runner 1) the requirement that
++  // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied
++  // and 2) any tasks posted to this task runner that refer to this file will
++  // complete before it is closed.
++  blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release());
++
++  while (!pending_reads_.empty()) {
++    std::move(pending_reads_.front().callback).Run(false, NULL, 0);
++    pending_reads_.pop();
++  }
++}
++
++void HidConnectionFreeBSD::PlatformRead(ReadCallback callback) {
++  PendingHidRead pending_read;
++  pending_read.callback = std::move(callback);
++  pending_reads_.push(std::move(pending_read));
++  ProcessReadQueue();
++}
++
++void HidConnectionFreeBSD::PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer,
++                                     WriteCallback callback) {
++
++  blocking_task_runner_->PostTask(
++      FROM_HERE,
++      base::BindOnce(&BlockingTaskHelper::Write, base::Unretained(helper_.get()),
++                 buffer, std::move(callback)));
++}
++
++void HidConnectionFreeBSD::PlatformGetFeatureReport(uint8_t report_id,
++                                                ReadCallback callback) {
++  // The first byte of the destination buffer is the report ID being requested
++  // and is overwritten by the feature report.
++  DCHECK_GT(device_info()->max_feature_report_size(), 0u);
++  scoped_refptr<base::RefCountedBytes> buffer(
++      new base::RefCountedBytes(device_info()->max_feature_report_size() + 1));
++  if (report_id != 0)
++    buffer->data()[0] = report_id;
++
++  blocking_task_runner_->PostTask(
++      FROM_HERE,
++      base::BindOnce(&BlockingTaskHelper::GetFeatureReport,
++                 base::Unretained(helper_.get()), report_id,
++                 buffer, std::move(callback)));
++}
++
++void HidConnectionFreeBSD::PlatformSendFeatureReport(
++    scoped_refptr<base::RefCountedBytes> buffer,
++    WriteCallback callback) {
++  blocking_task_runner_->PostTask(
++      FROM_HERE,
++      base::BindOnce(&BlockingTaskHelper::SendFeatureReport,
++                 base::Unretained(helper_.get()), buffer, std::move(callback)));
++}
++
++void HidConnectionFreeBSD::ProcessInputReport(
++    scoped_refptr<base::RefCountedBytes> buffer,
++    size_t size) {
++  DCHECK(thread_checker().CalledOnValidThread());
++  DCHECK_GE(size, 1u);
++
++  uint8_t report_id = buffer->data()[0];
++  if (IsReportIdProtected(report_id))
++    return;
++
++  PendingHidReport report;
++  report.buffer = buffer;
++  report.size = size;
++  pending_reports_.push(report);
++  ProcessReadQueue();
++}
++
++void HidConnectionFreeBSD::ProcessReadQueue() {
++  DCHECK(thread_checker().CalledOnValidThread());
++
++  // Hold a reference to |this| to prevent a callback from freeing this object
++  // during the loop.
++  scoped_refptr<HidConnectionFreeBSD> self(this);
++  while (pending_reads_.size() && pending_reports_.size()) {
++    PendingHidRead read = std::move(pending_reads_.front());
++    PendingHidReport report = std::move(pending_reports_.front());
++
++    pending_reads_.pop();
++    pending_reports_.pop();
++    std::move(read.callback).Run(true, std::move(report.buffer), report.size);
++  }
++}
++
++}  // namespace device
diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
new file mode 100644
index 000000000000..2392d9d50aa7
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h
@@ -0,0 +1,80 @@
+--- services/device/hid/hid_connection_freebsd.h.orig	2018-03-26 19:51:55.337385000 -0700
++++ services/device/hid/hid_connection_freebsd.h	2018-03-26 22:46:52.914490000 -0700
+@@ -0,0 +1,77 @@
++// Copyright (c) 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.
++
++#ifndef DEVICE_HID_HID_CONNECTION_FREEBSD_H_
++#define DEVICE_HID_HID_CONNECTION_FREEBSD_H_
++
++#include <stddef.h>
++#include <stdint.h>
++
++#include <queue>
++
++#include "base/files/scoped_file.h"
++#include "base/macros.h"
++#include "base/memory/ptr_util.h"
++#include "base/memory/ref_counted_memory.h"
++#include "base/memory/weak_ptr.h"
++#include "base/sequence_checker.h"
++#include "services/device/hid/hid_connection.h"
++
++namespace base {
++class SequencedTaskRunner;
++}
++
++namespace net {
++class IOBuffer;
++}
++
++namespace device {
++
++class HidConnectionFreeBSD : public HidConnection {
++ public:
++  HidConnectionFreeBSD(
++      scoped_refptr<HidDeviceInfo> device_info,
++      base::ScopedFD fd,
++      scoped_refptr<base::SequencedTaskRunner> blocking_task_runner);
++
++ private:
++  friend class base::RefCountedThreadSafe<HidConnectionFreeBSD>;
++  class BlockingTaskHelper;
++
++  ~HidConnectionFreeBSD() override;
++
++  // HidConnection implementation.
++  void PlatformClose() override;
++  void PlatformRead(ReadCallback callback) override;
++  void PlatformWrite(scoped_refptr<base::RefCountedBytes> buffer,
++                     WriteCallback callback) override;
++  void PlatformGetFeatureReport(uint8_t report_id,
++                                ReadCallback callback) override;
++  void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer,
++                                 WriteCallback callback) override;
++  void ProcessInputReport(scoped_refptr<base::RefCountedBytes> buffer,
++                          size_t size);
++  void ProcessReadQueue();
++
++  // |helper_| lives on the sequence to which |blocking_task_runner_| posts
++  // tasks so all calls must be posted there including this object's
++  // destruction.
++  std::unique_ptr<BlockingTaskHelper> helper_;
++
++  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
++
++  std::queue<PendingHidReport> pending_reports_;
++  std::queue<PendingHidRead> pending_reads_;
++  const scoped_refptr<base::SequencedTaskRunner> task_runner_;
++
++  SEQUENCE_CHECKER(sequence_checker_);
++
++  base::WeakPtrFactory<HidConnectionFreeBSD> weak_factory_;
++
++  DISALLOW_COPY_AND_ASSIGN(HidConnectionFreeBSD);
++};
++
++}  // namespace device
++
++#endif  // DEVICE_HID_HID_CONNECTION_FREEBSD_H_
diff --git a/www/iridium/files/patch-services_device_hid_hid__service.cc b/www/iridium/files/patch-services_device_hid_hid__service.cc
new file mode 100644
index 000000000000..dca62afb4296
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_hid__service.cc
@@ -0,0 +1,20 @@
+--- services/device/hid/hid_service.cc.orig	2018-02-24 16:25:18.000000000 +0100
++++ services/device/hid/hid_service.cc	2018-03-04 05:38:54.425730000 +0100
+@@ -16,6 +16,8 @@
+ 
+ #if defined(OS_LINUX) && defined(USE_UDEV)
+ #include "services/device/hid/hid_service_linux.h"
++#elif defined(OS_BSD)
++#include "services/device/hid/hid_service_freebsd.h"
+ #elif defined(OS_MACOSX)
+ #include "services/device/hid/hid_service_mac.h"
+ #elif defined(OS_WIN)
+@@ -36,6 +38,8 @@
+ std::unique_ptr<HidService> HidService::Create() {
+ #if defined(OS_LINUX) && defined(USE_UDEV)
+   return base::WrapUnique(new HidServiceLinux());
++#elif defined(OS_BSD)
++  return base::WrapUnique(new HidServiceFreeBSD());
+ #elif defined(OS_MACOSX)
+   return base::WrapUnique(new HidServiceMac());
+ #elif defined(OS_WIN)
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
new file mode 100644
index 000000000000..f499827a6642
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -0,0 +1,374 @@
+--- services/device/hid/hid_service_freebsd.cc.orig	2018-07-20 13:47:11.569682000 +0200
++++ services/device/hid/hid_service_freebsd.cc	2018-07-20 15:20:19.980971000 +0200
+@@ -0,0 +1,371 @@
++// 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.
++
++#include "services/device/hid/hid_service_freebsd.h"
++
++#include <dev/usb/usb_ioctl.h>
++#include <stdint.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++
++#include <set>
++#include <string>
++#include <vector>
++
++#include "base/bind.h"
++#include "base/files/file_descriptor_watcher_posix.h"
++#include "base/files/file_enumerator.h"
++#include "base/location.h"
++#include "base/logging.h"
++#include "base/posix/eintr_wrapper.h"
++#include "base/single_thread_task_runner.h"
++#include "base/stl_util.h"
++#include "base/strings/pattern.h"
++#include "base/strings/stringprintf.h"
++#include "base/strings/sys_string_conversions.h"
++#include "base/strings/string_util.h"
++#include "base/strings/string_split.h"
++#include "base/task_scheduler/post_task.h"
++#include "base/threading/thread_restrictions.h"
++#include "base/threading/thread_task_runner_handle.h"
++#include "components/device_event_log/device_event_log.h"
++#include "services/device/hid/hid_connection_freebsd.h"
++
++const int kMaxPermissionChecks = 5;
++
++namespace device {
++
++struct HidServiceFreeBSD::ConnectParams {
++  ConnectParams(scoped_refptr<HidDeviceInfo> device_info,
++                const ConnectCallback& callback)
++      : device_info(std::move(device_info)),
++        callback(callback),
++        task_runner(base::ThreadTaskRunnerHandle::Get()),
++        blocking_task_runner(
++            base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)) {}
++  ~ConnectParams() {}
++
++  scoped_refptr<HidDeviceInfo> device_info;
++  ConnectCallback callback;
++  scoped_refptr<base::SequencedTaskRunner> task_runner;
++  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner;
++  base::ScopedFD fd;
++};
++
++class HidServiceFreeBSD::BlockingTaskHelper {
++ public:
++  BlockingTaskHelper(base::WeakPtr<HidServiceFreeBSD> service)
++      : service_(std::move(service)),
++        task_runner_(base::ThreadTaskRunnerHandle::Get()) {
++    DETACH_FROM_SEQUENCE(sequence_checker_);
++
++    timer_.reset(new base::RepeatingTimer());
++    devd_buffer_ = new net::IOBufferWithSize(1024);
++  }
++
++  ~BlockingTaskHelper() {
++  }
++
++  void Start() {
++    base::AssertBlockingAllowed();
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++
++    const base::FilePath kDevRoot("/dev");
++    const std::string kUHIDPattern("/dev/uhid*");
++
++    base::FileEnumerator enumerator(kDevRoot, false, base::FileEnumerator::FILES);
++    do {
++      const base::FilePath next_device_path(enumerator.Next());
++      const std::string next_device = next_device_path.value();
++      if (next_device.empty())
++        break;
++
++      if (base::MatchPattern(next_device, kUHIDPattern))
++        OnDeviceAdded(next_device.substr(5));
++    } while (true);
++
++    SetupDevdMonitor();
++
++    task_runner_->PostTask(
++        FROM_HERE,
++        base::Bind(&HidServiceFreeBSD::FirstEnumerationComplete, service_));
++  }
++
++  bool HaveReadWritePermissions(std::string device_id) {
++    std::string device_node = "/dev/" + device_id;
++    base::AssertBlockingAllowed();
++
++    base::FilePath device_path(device_node);
++    base::File device_file;
++    int flags =
++        base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
++    device_file.Initialize(device_path, flags);
++    if (!device_file.IsValid())
++      return false;
++
++    return true;
++  }
++
++  void OnDeviceAdded(std::string device_id) {
++    std::string device_node = "/dev/" + device_id;
++    uint16_t vendor_id = 0xffff;
++    uint16_t product_id = 0xffff;
++    std::string product_name = "";
++    std::string serial_number = "";
++
++    std::vector<uint8_t> report_descriptor;
++
++    base::AssertBlockingAllowed();
++
++    base::FilePath device_path(device_node);
++    base::File device_file;
++    int flags =
++        base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
++    device_file.Initialize(device_path, flags);
++    if (!device_file.IsValid()) {
++      HID_LOG(ERROR) << "Failed to open '" << device_node
++                     << "': "
++                     << base::File::ErrorToString(device_file.error_details());
++      return;
++    }
++
++    base::ScopedFD fd;
++    fd.reset(device_file.TakePlatformFile());
++
++    struct usb_gen_descriptor ugd;
++    ugd.ugd_data = NULL;
++    ugd.ugd_maxlen = 0xffff;
++    int result = HANDLE_EINTR(
++        ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd));
++
++    if (result < 0) {
++      HID_LOG(ERROR) << "Failed to get report descriptor size";
++      return;
++    }
++
++    report_descriptor.resize(ugd.ugd_actlen);
++
++    ugd.ugd_data = report_descriptor.data();
++    ugd.ugd_maxlen = ugd.ugd_actlen;
++    result = HANDLE_EINTR(
++        ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd));
++
++    if (result < 0) {
++      HID_LOG(ERROR) << "Failed to get report descriptor";
++      return;
++    }
++
++    scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo(
++        device_id, vendor_id, product_id, product_name, serial_number,
++        device::mojom::HidBusType::kHIDBusTypeUSB,
++        report_descriptor, device_node));
++
++    task_runner_->PostTask(FROM_HERE, base::Bind(&HidServiceFreeBSD::AddDevice,
++                                                 service_, device_info));
++  }
++
++  void OnDeviceRemoved(std::string device_id) {
++    task_runner_->PostTask(
++        FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_,
++                              device_id));
++  }
++
++ private:
++
++  void CheckPendingPermissionChange() {
++    base::AssertBlockingAllowed();
++    std::map<std::string, int>::iterator it;
++    for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) {
++      std::string device_name = it->first;
++      bool keep = true;
++      if (HaveReadWritePermissions(device_name)) {
++        OnDeviceAdded(device_name);
++        keep = false;
++      }
++      else if (it->second-- <= 0) {
++        HID_LOG(ERROR) << "Still don't have write permissions to '" << device_name
++                       << "' after " << kMaxPermissionChecks << " attempts";
++        keep = false;
++      }
++
++      if (keep)
++        ++it;
++      else
++        permissions_checks_attempts_.erase(it++);
++    }
++
++    if (permissions_checks_attempts_.empty())
++      timer_->Stop();
++  }
++
++  void SetupDevdMonitor() {
++    base::AssertBlockingAllowed();
++
++    int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
++    if (devd_fd < 0)
++      return;
++
++    struct sockaddr_un sa;
++
++    sa.sun_family = AF_UNIX;
++    strlcpy(sa.sun_path, "/var/run/devd.seqpacket.pipe", sizeof(sa.sun_path));
++    if (connect(devd_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
++      close(devd_fd);
++      return;
++    } 
++
++    devd_fd_.reset(devd_fd);
++    file_watcher_ = base::FileDescriptorWatcher::WatchReadable(
++        devd_fd_.get(), base::Bind(&BlockingTaskHelper::OnDevdMessageCanBeRead,
++                                   base::Unretained(this)));
++  }
++
++  void OnDevdMessageCanBeRead() {
++    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
++    ssize_t bytes_read = HANDLE_EINTR(recv(devd_fd_.get(), devd_buffer_->data(),
++                                      devd_buffer_->size() - 1, MSG_WAITALL));
++    if (bytes_read < 0) {
++      if (errno != EAGAIN) {
++        HID_LOG(ERROR) << "Read failed";
++        file_watcher_.reset();
++      }
++      return;
++    }
++
++    devd_buffer_->data()[bytes_read] = 0;
++    char *data = devd_buffer_->data();
++    // It may take some time for devd to change permissions
++    // on /dev/uhidX node. So do not fail immediately if
++    // open fail. Retry each second for kMaxPermissionChecks
++    // times before giving up entirely
++    if (base::StartsWith(data, "+uhid", base::CompareCase::SENSITIVE)) {
++      std::vector<std::string> parts = base::SplitString(
++        data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
++      if (!parts.empty()) {
++        std::string device_name = parts[0].substr(1); // skip '+'
++        if (HaveReadWritePermissions(device_name))
++          OnDeviceAdded(parts[0].substr(1));
++        else {
++          // Do not re-add to checks
++          if (permissions_checks_attempts_.find(device_name) == permissions_checks_attempts_.end()) {
++            permissions_checks_attempts_.insert(std::pair<std::string, int>(device_name, kMaxPermissionChecks));
++            timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1),
++                          this, &BlockingTaskHelper::CheckPendingPermissionChange);
++          }
++        }
++      }
++    }
++
++    if (base::StartsWith(data, "-uhid", base::CompareCase::SENSITIVE)) {
++      std::vector<std::string> parts = base::SplitString(
++        data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
++      if (!parts.empty()) {
++        std::string device_name = parts[0].substr(1); // skip '-'
++        auto it = permissions_checks_attempts_.find(device_name);
++        if (it != permissions_checks_attempts_.end()) {
++          permissions_checks_attempts_.erase(it);
++          if (permissions_checks_attempts_.empty())
++            timer_->Stop();
++        }
++        OnDeviceRemoved(parts[0].substr(1));
++      }
++    }
++  }
++
++  SEQUENCE_CHECKER(sequence_checker_);
++
++  // This weak pointer is only valid when checked on this task runner.
++  base::WeakPtr<HidServiceFreeBSD> service_;
++  scoped_refptr<base::SequencedTaskRunner> task_runner_;
++  std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_;
++  std::unique_ptr<base::RepeatingTimer> timer_;
++  base::ScopedFD devd_fd_;
++  scoped_refptr<net::IOBufferWithSize> devd_buffer_;
++  std::map<std::string, int> permissions_checks_attempts_;
++
++  DISALLOW_COPY_AND_ASSIGN(BlockingTaskHelper);
++};
++
++HidServiceFreeBSD::HidServiceFreeBSD()
++    : task_runner_(base::ThreadTaskRunnerHandle::Get()),
++      blocking_task_runner_(
++          base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)),
++      weak_factory_(this) {
++  helper_ = std::make_unique<BlockingTaskHelper>(weak_factory_.GetWeakPtr());
++  blocking_task_runner_->PostTask(
++      FROM_HERE,
++      base::Bind(&BlockingTaskHelper::Start, base::Unretained(helper_.get())));
++}
++
++HidServiceFreeBSD::~HidServiceFreeBSD() {
++  blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release());
++}
++
++base::WeakPtr<HidService> HidServiceFreeBSD::GetWeakPtr() {
++  return weak_factory_.GetWeakPtr();
++}
++
++// static
++void HidServiceFreeBSD::OpenOnBlockingThread(
++    std::unique_ptr<ConnectParams> params) {
++  base::AssertBlockingAllowed();
++  scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
++
++  base::FilePath device_path(params->device_info->device_node());
++  base::File device_file;
++  int flags =
++      base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
++  device_file.Initialize(device_path, flags);
++  if (!device_file.IsValid()) {
++    HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node()
++                   << "': "
++                   << base::File::ErrorToString(device_file.error_details());
++    task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr));
++    return;
++  }
++  params->fd.reset(device_file.TakePlatformFile());
++  FinishOpen(std::move(params));
++}
++
++void HidServiceFreeBSD::Connect(const std::string& device_guid,
++                            const ConnectCallback& callback) {
++  DCHECK(thread_checker_.CalledOnValidThread());
++
++  const auto& map_entry = devices().find(device_guid);
++  if (map_entry == devices().end()) {
++    base::ThreadTaskRunnerHandle::Get()->PostTask(
++        FROM_HERE, base::Bind(callback, nullptr));
++    return;
++  }
++
++  scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
++
++  auto params = std::make_unique<ConnectParams>(device_info, callback);
++
++  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner =
++      params->blocking_task_runner;
++  blocking_task_runner->PostTask(
++      FROM_HERE, base::Bind(&HidServiceFreeBSD::OpenOnBlockingThread,
++                            base::Passed(&params)));
++}
++
++// static
++void HidServiceFreeBSD::FinishOpen(std::unique_ptr<ConnectParams> params) {
++  base::AssertBlockingAllowed();
++  scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner;
++
++  task_runner->PostTask(
++      FROM_HERE,
++      base::Bind(&HidServiceFreeBSD::CreateConnection, base::Passed(&params)));
++}
++
++// static
++void HidServiceFreeBSD::CreateConnection(std::unique_ptr<ConnectParams> params) {
++  DCHECK(params->fd.is_valid());
++  params->callback.Run(base::MakeRefCounted<HidConnectionFreeBSD>(
++      std::move(params->device_info), std::move(params->fd),
++      std::move(params->blocking_task_runner)));
++}
++
++}  // namespace device
diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h
new file mode 100644
index 000000000000..cd813a1e7b2e
--- /dev/null
+++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h
@@ -0,0 +1,51 @@
+--- services/device/hid/hid_service_freebsd.h.orig	2018-03-04 05:38:54.468408000 +0100
++++ services/device/hid/hid_service_freebsd.h	2018-03-04 08:35:47.483290000 +0100
+@@ -0,0 +1,48 @@
++// 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.
++
++#ifndef DEVICE_HID_HID_SERVICE_FREEBSD_H_
++#define DEVICE_HID_HID_SERVICE_FREEBSD_H_
++
++#include <string>
++
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/memory/weak_ptr.h"
++#include "base/timer/timer.h"
++#include "services/device/hid/hid_service.h"
++#include "net/base/io_buffer.h"
++
++namespace device {
++
++class HidServiceFreeBSD : public HidService {
++ public:
++  HidServiceFreeBSD();
++  ~HidServiceFreeBSD() override;
++
++  void Connect(const std::string& device_guid,
++               const ConnectCallback& connect) override;
++  base::WeakPtr<HidService> GetWeakPtr() override;
++
++ private:
++  struct ConnectParams;
++  class BlockingTaskHelper;
++
++  static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
++  static void FinishOpen(std::unique_ptr<ConnectParams> params);
++  static void CreateConnection(std::unique_ptr<ConnectParams> params);
++
++  const scoped_refptr<base::SequencedTaskRunner> task_runner_;
++  const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
++  // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds
++  // a weak reference back to the service that owns it.
++  std::unique_ptr<BlockingTaskHelper> helper_;
++  base::WeakPtrFactory<HidServiceFreeBSD> weak_factory_;
++
++  DISALLOW_COPY_AND_ASSIGN(HidServiceFreeBSD);
++};
++
++}  // namespace device
++
++#endif  // DEVICE_HID_HID_SERVICE_FREEBSD_H_
diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
index 916132d19d36..86452c411db5 100644
--- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
+++ b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
@@ -1,9 +1,9 @@
---- services/device/time_zone_monitor/time_zone_monitor.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/device/time_zone_monitor/time_zone_monitor.cc
-@@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() {
-   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
+--- services/device/time_zone_monitor/time_zone_monitor.cc.orig	2017-09-05 21:05:23.000000000 +0200
++++ services/device/time_zone_monitor/time_zone_monitor.cc	2017-09-06 21:23:20.120961000 +0200
+@@ -41,7 +41,7 @@
  #else
-   icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
+   std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
+ #endif
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // We get here multiple times on Linux per a single tz change, but
diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
deleted file mode 100644
index f6e620f8e0a3..000000000000
--- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl
-         main_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-         file_task_runner_(file_task_runner),
-         owner_(owner) {
-+  }
-+
-+  void StartWatching() {
-     DCHECK(main_task_runner_->RunsTasksOnCurrentThread());
-     file_task_runner_->PostTask(
-         FROM_HERE,
-@@ -150,6 +153,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin
-   // changed.
-   if (!getenv("TZ")) {
-     impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner);
-+    if (impl_.get()) {
-+      impl_->StartWatching();
-+    }
-   }
- }
- 
diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn
new file mode 100644
index 000000000000..9b859150c51e
--- /dev/null
+++ b/www/iridium/files/patch-services_network_BUILD.gn
@@ -0,0 +1,10 @@
+--- services/network/BUILD.gn.orig	2018-08-04 19:29:41.578469000 +0200
++++ services/network/BUILD.gn	2018-08-04 19:29:55.745503000 +0200
+@@ -138,7 +138,6 @@
+ 
+   if (is_linux) {
+     deps += [
+-      "//sandbox/linux:sandbox_services",
+       "//services/service_manager/sandbox:sandbox",
+     ]
+   }
diff --git a/www/iridium/files/patch-services_network_network_sandbox_hook_linux.cc b/www/iridium/files/patch-services_network_network_sandbox_hook_linux.cc
new file mode 100644
index 000000000000..4c47c759fa2b
--- /dev/null
+++ b/www/iridium/files/patch-services_network_network_sandbox_hook_linux.cc
@@ -0,0 +1,18 @@
+--- services/network/network_sandbox_hook_linux.cc.orig	2018-07-20 00:26:50.262722000 +0200
++++ services/network/network_sandbox_hook_linux.cc	2018-07-20 00:17:37.945110000 +0200
+@@ -14,6 +14,7 @@
+ namespace network {
+ 
+ bool NetworkPreSandboxHook(service_manager::SandboxLinux::Options options) {
++#if !defined(OS_BSD)
+   auto* instance = service_manager::SandboxLinux::GetInstance();
+ 
+   // TODO(tsepez): remove universal permission under filesytem root.
+@@ -32,6 +33,7 @@
+       service_manager::SandboxLinux::PreSandboxHook(), options);
+ 
+   instance->EngageNamespaceSandbox(false /* from_zygote */);
++#endif
+   return true;
+ }
+ 
diff --git a/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.cc b/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.cc
new file mode 100644
index 000000000000..407c978f7264
--- /dev/null
+++ b/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.cc
@@ -0,0 +1,10 @@
+--- services/network/public/cpp/cors/cors_legacy.cc.orig	2018-05-09 21:05:55.000000000 +0200
++++ services/network/public/cpp/cors/cors_legacy.cc	2018-08-16 11:55:06.696529000 +0200
+@@ -5,7 +5,6 @@
+ #include "services/network/public/cpp/cors/cors_legacy.h"
+ 
+ #include <algorithm>
+-#include <vector>
+ 
+ #include "url/gurl.h"
+ #include "url/origin.h"
diff --git a/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.h b/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.h
new file mode 100644
index 000000000000..a1a560c47f6c
--- /dev/null
+++ b/www/iridium/files/patch-services_network_public_cpp_cors_cors_legacy.h
@@ -0,0 +1,10 @@
+--- services/network/public/cpp/cors/cors_legacy.h.orig	2018-08-15 14:32:05.126217000 +0200
++++ services/network/public/cpp/cors/cors_legacy.h	2018-08-15 14:32:40.328286000 +0200
+@@ -5,6 +5,7 @@
+ #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ 
++#include <string>
+ #include <vector>
+ 
+ #include "base/component_export.h"
diff --git a/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h b/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h
new file mode 100644
index 000000000000..6679543941e0
--- /dev/null
+++ b/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h
@@ -0,0 +1,11 @@
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig	2017-09-07 07:15:01.296724000 +0200
++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h	2017-09-07 07:15:17.711160000 +0200
+@@ -21,7 +21,7 @@
+  private:
+   FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps);
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   static void SetProcSmapsForTesting(FILE*);
+ #endif  // defined(OS_LINUX)
+ };
diff --git a/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc b/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc
new file mode 100644
index 000000000000..7179cb36135e
--- /dev/null
+++ b/www/iridium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc
@@ -0,0 +1,20 @@
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig	2018-05-09 21:05:55.000000000 +0200
++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc	2018-08-16 12:01:06.316665000 +0200
+@@ -178,6 +178,9 @@
+ // static
+ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
+                                  mojom::RawOSMemDump* dump) {
++#if defined(OS_BSD)
++  return false;
++#else
+   base::ScopedFD autoclose = OpenStatm(pid);
+   int statm_fd = autoclose.get();
+ 
+@@ -203,6 +206,7 @@
+   dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024;
+ 
+   return true;
++#endif
+ }
+ 
+ // static
diff --git a/www/iridium/files/patch-content_common_set__process__title__linux.cc b/www/iridium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
index fbda01a227e6..d239629196bf 100644
--- a/www/iridium/files/patch-content_common_set__process__title__linux.cc
+++ b/www/iridium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
@@ -1,5 +1,5 @@
---- content/common/set_process_title_linux.cc.orig	2017-04-19 19:06:34 UTC
-+++ content/common/set_process_title_linux.cc
+--- services/service_manager/embedder/set_process_title_linux.cc.orig	2017-06-05 19:03:11 UTC
++++ services/service_manager/embedder/set_process_title_linux.cc
 @@ -49,6 +49,8 @@
  extern char** environ;
  
@@ -9,7 +9,7 @@
  static char* g_orig_argv0 = NULL;
  
  void setproctitle(const char* fmt, ...) {
-@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) 
+@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) {
    va_end(ap);
    g_main_argv[1] = NULL;
  }
diff --git a/www/iridium/files/patch-content_common_set__process__title__linux.h b/www/iridium/files/patch-services_service__manager_embedder_set__process__title__linux.h
index 8abe8aa10619..3c943ff284ed 100644
--- a/www/iridium/files/patch-content_common_set__process__title__linux.h
+++ b/www/iridium/files/patch-services_service__manager_embedder_set__process__title__linux.h
@@ -1,8 +1,8 @@
---- content/common/set_process_title_linux.h.orig	2017-04-19 19:06:34 UTC
-+++ content/common/set_process_title_linux.h
+--- services/service_manager/embedder/set_process_title_linux.h.orig	2017-06-05 19:03:11 UTC
++++ services/service_manager/embedder/set_process_title_linux.h
 @@ -5,6 +5,9 @@
- #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
- #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_
+ #define SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_
  
 +#include "build/build_config.h"
 +
diff --git a/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn b/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
index fbfb888daaad..d772a1652ebe 100644
--- a/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
+++ b/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
@@ -1,11 +1,11 @@
---- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig	2017-04-19 19:06:37 UTC
-+++ services/service_manager/public/cpp/standalone_service/BUILD.gn
-@@ -23,7 +23,7 @@ source_set("standalone_service") {
+--- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig	2018-02-24 16:25:18.000000000 +0100
++++ services/service_manager/public/cpp/standalone_service/BUILD.gn	2018-03-04 03:48:04.087144000 +0100
+@@ -24,7 +24,7 @@
      "//services/service_manager/public/interfaces",
    ]
  
 -  if (is_linux && !is_android) {
 +  if (is_linux && !is_android && !is_bsd) {
-     sources += [
-       "linux_sandbox.cc",
-       "linux_sandbox.h",
+     deps += [
+       "//sandbox/linux:sandbox",
+       "//sandbox/linux:sandbox_services",
diff --git a/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc b/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
index 19d66e0fc96f..10367534a60b 100644
--- a/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
+++ b/www/iridium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
@@ -1,9 +1,9 @@
---- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/service_manager/public/cpp/standalone_service/standalone_service.cc
-@@ -70,6 +70,8 @@ void RunStandaloneService(const Standalo
-       *base::CommandLine::ForCurrentProcess();
-   if (command_line.HasSwitch(switches::kEnableSandbox))
-     sandbox = InitializeSandbox();
+--- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig	2018-02-24 16:25:18.000000000 +0100
++++ services/service_manager/public/cpp/standalone_service/standalone_service.cc	2018-03-04 03:53:12.449254000 +0100
+@@ -59,6 +59,8 @@
+             command_line.GetSwitchValueASCII(switches::kServiceSandboxType)),
+         SandboxLinux::PreSandboxHook(), sandbox_options);
+   }
 +#elif defined(OS_BSD)
 +  NOTIMPLEMENTED();
  #endif
diff --git a/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn b/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn
new file mode 100644
index 000000000000..a1c3f8334fdb
--- /dev/null
+++ b/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn
@@ -0,0 +1,11 @@
+--- services/service_manager/sandbox/BUILD.gn.orig	2018-03-03 20:51:40.189699000 +0100
++++ services/service_manager/sandbox/BUILD.gn	2018-03-03 20:51:56.739150000 +0100
+@@ -23,7 +23,7 @@
+   deps = [
+     "//base",
+   ]
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     sources += [
+       "linux/bpf_base_policy_linux.cc",
+       "linux/bpf_base_policy_linux.h",
diff --git a/www/iridium/files/patch-services_service__manager_standalone_context.cc b/www/iridium/files/patch-services_service__manager_standalone_context.cc
deleted file mode 100644
index 1c778e3d3f20..000000000000
--- a/www/iridium/files/patch-services_service__manager_standalone_context.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/service_manager/standalone/context.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/service_manager/standalone/context.cc
-@@ -133,7 +133,7 @@ Context::Context(
-       tracing::mojom::StartupPerformanceDataCollectorPtr collector;
-       BindInterface(service_manager(), source_identity, tracing_identity,
-                     &collector);
--#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-       // CurrentProcessInfo::CreationTime is only defined on some platforms.
-       const base::Time creation_time = base::CurrentProcessInfo::CreationTime();
-       collector->SetServiceManagerProcessCreationTime(
diff --git a/www/iridium/files/patch-services_ui_gpu_gpu__main.cc b/www/iridium/files/patch-services_ui_gpu_gpu__main.cc
deleted file mode 100644
index 7a3bda519c92..000000000000
--- a/www/iridium/files/patch-services_ui_gpu_gpu__main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/ui/gpu/gpu_main.cc.orig	2017-04-19 19:06:37 UTC
-+++ services/ui/gpu/gpu_main.cc
-@@ -59,7 +59,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r
-   // runtime.
-   thread_options.message_loop_type =
-       ui::OzonePlatform::EnsureInstance()->GetMessageLoopTypeForGpu();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   thread_options.message_loop_type = base::MessageLoop::TYPE_DEFAULT;
- #elif defined(OS_MACOSX)
-   thread_options.message_pump_factory = base::Bind(&CreateMessagePumpMac);
diff --git a/www/iridium/files/patch-skia_BUILD.gn b/www/iridium/files/patch-skia_BUILD.gn
deleted file mode 100644
index ff9f856b82fb..000000000000
--- a/www/iridium/files/patch-skia_BUILD.gn
+++ /dev/null
@@ -1,38 +0,0 @@
---- skia/BUILD.gn.orig	2017-04-19 19:06:37 UTC
-+++ skia/BUILD.gn
-@@ -127,7 +127,7 @@ config("skia_library_config") {
-   }
- 
-   # Settings for text blitting, chosen to approximate the system browser.
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     defines += [
-       "SK_GAMMA_EXPONENT=1.2",
-       "SK_GAMMA_CONTRAST=0.2",
-@@ -326,7 +326,7 @@ component("skia") {
-     set_sources_assignment_filter(sources_assignment_filter)
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
-       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-@@ -335,7 +335,7 @@ component("skia") {
-     ]
-   }
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     sources += [
-       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -374,7 +374,7 @@ component("skia") {
-     "//base/third_party/dynamic_annotations",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (use_pango) {
-       configs += [ "//build/config/linux/pangocairo" ]
-     }
diff --git a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
index 558b3fc80d47..be071bc3afd3 100644
--- a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,20 +1,20 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2017-04-19 19:06:37 UTC
-+++ skia/ext/SkMemory_new_handler.cpp
-@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si
-     // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
-     // doesn't work as intended everywhere.
-     void* result;
+--- skia/ext/SkMemory_new_handler.cpp.orig	2018-03-20 23:05:30.000000000 +0100
++++ skia/ext/SkMemory_new_handler.cpp	2018-03-24 18:36:03.256042000 +0100
+@@ -69,7 +69,7 @@
+   // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
+   // doesn't work as intended everywhere.
+   void* result;
 -#if  defined(OS_IOS)
-+#if  defined(OS_IOS) || defined(OS_FREEBSD)
++#if  defined(OS_IOS) || defined(OS_BSD)
      result = malloc(size);
  #else
      // It's the responsibility of the caller to check the return value.
-@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) {
-     // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
-     // doesn't work as intended everywhere.
-     void* result;
+@@ -89,7 +89,7 @@
+   // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
+   // doesn't work as intended everywhere.
+   void* result;
 -#if  defined(OS_IOS)
-+#if  defined(OS_IOS) || defined(OS_FREEBSD)
++#if  defined(OS_IOS) || defined(OS_BSD)
      result = calloc(1, size);
  #else
      // It's the responsibility of the caller to check the return value.
diff --git a/www/iridium/files/patch-storage_browser_quota_quota__settings.cc b/www/iridium/files/patch-storage_browser_quota_quota__settings.cc
deleted file mode 100644
index 2a67f216c196..000000000000
--- a/www/iridium/files/patch-storage_browser_quota_quota__settings.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/browser/quota/quota_settings.cc.orig	2017-04-19 19:06:37 UTC
-+++ storage/browser/quota/quota_settings.cc
-@@ -53,7 +53,7 @@ base::Optional<storage::QuotaSettings> C
-       1000 * kMBytes;
- #elif defined(OS_CHROMEOS)
-       1000 * kMBytes;
--#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
-+#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-       10000 * kMBytes;
- #else
- #error "Port: Need to define an OS accomodation value for unknown OS."
diff --git a/www/iridium/files/patch-testing_gtest_src_gtest.cc b/www/iridium/files/patch-testing_gtest_src_gtest.cc
deleted file mode 100644
index e1797a903b52..000000000000
--- a/www/iridium/files/patch-testing_gtest_src_gtest.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- testing/gtest/src/gtest.cc.orig	2017-04-19 19:07:41 UTC
-+++ testing/gtest/src/gtest.cc
-@@ -122,6 +122,10 @@
- 
- #endif  // GTEST_OS_LINUX
- 
-+#if GTEST_OS_FREEBSD
-+# include <sys/socket.h>
-+#endif
-+
- #if GTEST_HAS_EXCEPTIONS
- # include <stdexcept>
- #endif
-@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringE
- 
- #if GTEST_OS_WINDOWS
-   return _wcsicmp(lhs, rhs) == 0;
--#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
-+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD
-   return wcscasecmp(lhs, rhs) == 0;
- #else
-   // Android, Mac OS X and Cygwin don't define wcscasecmp.
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp b/www/iridium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
deleted file mode 100644
index 699c83f1b6f8..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig	2017-04-19 19:06:49 UTC
-+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
-@@ -48,6 +48,8 @@
- 
- #if OS(WIN)
- #include <malloc.h>
-+#elif OS(FREEBSD)
-+#include <stdlib.h>
- #else
- #include <alloca.h>
- #endif
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn b/www/iridium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
deleted file mode 100644
index 0e5be2c42562..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2017-04-19 19:06:49 UTC
-+++ third_party/WebKit/Source/core/layout/BUILD.gn
-@@ -381,7 +381,7 @@ blink_core_sources("layout") {
-     sources += [ "LayoutThemeFontProviderDefault.cpp" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "LayoutThemeLinux.cpp",
-       "LayoutThemeLinux.h",
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
deleted file mode 100644
index df1d1888e1fe..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp
-@@ -63,9 +63,9 @@ using namespace WTF;
- 
- namespace blink {
- 
--#if !OS(WIN) && !OS(LINUX)
-+#if !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD)
- FontCache::FontCache() : m_purgePreventCount(0), m_fontManager(nullptr) {}
--#endif  // !OS(WIN) && !OS(LINUX)
-+#endif  // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD)
- 
- typedef HashMap<unsigned,
-                 std::unique_ptr<FontPlatformData>,
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
deleted file mode 100644
index e047af0b87b1..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/FontCache.h
-@@ -144,7 +144,7 @@ class PLATFORM_EXPORT FontCache {
- #else
-   static const AtomicString& legacySystemFontFamily();
- #endif
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
-   static void setSystemFontFamily(const AtomicString&);
- #endif
- 
-@@ -258,7 +258,7 @@ class PLATFORM_EXPORT FontCache {
-                                    const FontFaceCreationParams&,
-                                    CString& name);
- 
--#if OS(ANDROID) || OS(LINUX)
-+#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)
-   static AtomicString getFamilyNameForCharacter(SkFontMgr*,
-                                                 UChar32,
-                                                 const FontDescription&,
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
deleted file mode 100644
index 0fbcbf639a3a..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
-@@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const
-       m_syntheticBold(source.m_syntheticBold),
-       m_syntheticItalic(source.m_syntheticItalic),
-       m_orientation(source.m_orientation),
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-       m_style(source.m_style),
- #endif
-       m_harfBuzzFace(nullptr),
-@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(const
-       m_syntheticBold(src.m_syntheticBold),
-       m_syntheticItalic(src.m_syntheticItalic),
-       m_orientation(src.m_orientation),
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-       m_style(FontRenderStyle::querySystem(m_family,
-                                            m_textSize,
-                                            m_typeface->fontStyle())),
-@@ -155,7 +155,7 @@ FontPlatformData::FontPlatformData(sk_sp
-       m_syntheticBold(syntheticBold),
-       m_syntheticItalic(syntheticItalic),
-       m_orientation(orientation),
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) | OS(BSD)
-       m_style(FontRenderStyle::querySystem(m_family,
-                                            m_textSize,
-                                            m_typeface->fontStyle())),
-@@ -200,7 +200,7 @@ const FontPlatformData& FontPlatformData
-   m_syntheticItalic = other.m_syntheticItalic;
-   m_harfBuzzFace = nullptr;
-   m_orientation = other.m_orientation;
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) | OS(BSD)
-   m_style = other.m_style;
- #endif
- 
-@@ -226,7 +226,7 @@ bool FontPlatformData::operator==(const 
-          m_isHashTableDeletedValue == a.m_isHashTableDeletedValue &&
-          m_syntheticBold == a.m_syntheticBold &&
-          m_syntheticItalic == a.m_syntheticItalic
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-          && m_style == a.m_style
- #endif
-          && m_orientation == a.m_orientation;
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
deleted file mode 100644
index 150dd3c4b14a..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h
-@@ -47,9 +47,9 @@
- #include "wtf/text/CString.h"
- #include "wtf/text/StringImpl.h"
- 
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
- #include "platform/fonts/linux/FontRenderStyle.h"
--#endif  // OS(LINUX) || OS(ANDROID)
-+#endif  // OS(LINUX) || OS(ANDROID) || OS(BSD)
- 
- #if OS(MACOSX)
- OBJC_CLASS NSFont;
-@@ -151,7 +151,7 @@ class PLATFORM_EXPORT FontPlatformData {
-   PassRefPtr<OpenTypeVerticalData> verticalData() const;
-   PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
- 
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-   // The returned styles are all actual styles without
-   // FontRenderStyle::NoPreference.
-   const FontRenderStyle& getFontRenderStyle() const { return m_style; }
-@@ -179,7 +179,7 @@ class PLATFORM_EXPORT FontPlatformData {
-   FontOrientation m_orientation;
- 
-  private:
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-   FontRenderStyle m_style;
- #endif
- 
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
deleted file mode 100644
index 75a09260b554..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
-@@ -50,7 +50,7 @@ namespace blink {
- const float smallCapsFontSizeMultiplier = 0.7f;
- const float emphasisMarkFontSizeMultiplier = 0.5f;
- 
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
- // This is the largest VDMX table which we'll try to load and parse.
- static const size_t maxVDMXTableSize = 1024 * 1024;  // 1 MB
- #endif
-@@ -109,7 +109,7 @@ void SimpleFontData::platformInit(bool s
-   int vdmxAscent = 0, vdmxDescent = 0;
-   bool isVDMXValid = false;
- 
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-   // 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).
-@@ -157,7 +157,7 @@ void SimpleFontData::platformInit(bool s
-       visual_overflow_inflation_for_ascent_ = 1;
-     if (descent < metrics.fDescent) {
-       visual_overflow_inflation_for_descent_ = 1;
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-       // When subpixel positioning is enabled, if the descent is rounded down,
-       // the descent part of the glyph may be truncated when displayed in a
-       // 'overflow: hidden' container.  To avoid that, borrow 1 unit from the
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
deleted file mode 100644
index 092388b02704..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
-@@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri
-   return AtomicString::fromUTF8(str.c_str(), str.size());
- }
- 
--#if OS(ANDROID) || OS(LINUX)
-+#if OS(ANDROID) || OS(LINUX) || 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:
-@@ -240,7 +240,7 @@ sk_sp<SkTypeface> FontCache::createTypef
-   }
- #endif
- 
--#if OS(LINUX) || OS(WIN)
-+#if OS(LINUX) || OS(WIN) || OS(BSD)
-   // 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
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
deleted file mode 100644
index 716742439bc3..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/heap/GCInfo.cpp
-@@ -7,6 +7,8 @@
- #include "platform/heap/Handle.h"
- #include "platform/heap/Heap.h"
- 
-+#include <stdlib.h>
-+
- namespace blink {
- 
- // GCInfo indices start from 1 for heap objects, with 0 being treated
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
deleted file mode 100644
index cbc8f0617453..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-@@ -7,6 +7,8 @@
- #include "public/platform/Platform.h"
- #include "wtf/StackUtil.h"
- 
-+#include <pthread_np.h>
-+
- #if OS(WIN)
- #include <stddef.h>
- #include <windows.h>
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/iridium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
deleted file mode 100644
index 00de0c3a34a8..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp
-@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex
-         m_isInGroup(false),
-         m_buffer(buffer) {
-     DCHECK(m_buffer);
--#if OS(LINUX)
-+#if OS(LINUX) || OS(BSD)
-     // On other platforms, the <option> background color is the same as the
-     // <select> background color. On Linux, that makes the <option>
-     // background color very dark, so by default, try to use a lighter
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/iridium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
deleted file mode 100644
index f586514c6413..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/Assertions.cpp
-@@ -60,7 +60,7 @@
- #include <windows.h>
- #endif
- 
--#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -142,7 +142,7 @@ class FrameToNameScope {
- };
- 
- FrameToNameScope::FrameToNameScope(void* addr) : m_name(0), m_cxaDemangled(0) {
--#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__))
-   Dl_info info;
-   if (!dladdr(addr, &info) || !info.dli_sname)
-     return;
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/iridium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
deleted file mode 100644
index 0d6be9148ace..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/wtf/Atomics.h.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/Atomics.h
-@@ -176,7 +176,7 @@ ALWAYS_INLINE void atomicSetOneToZero(in
- #if defined(THREAD_SANITIZER)
- // The definitions below assume an LP64 data model. This is fine because
- // TSan is only supported on x86_64 Linux.
--#if CPU(64BIT) && OS(LINUX)
-+#if CPU(64BIT) && (OS(LINUX) || OS(BSD))
- ALWAYS_INLINE void releaseStore(volatile int* ptr, int value) {
-   __tsan_atomic32_store(ptr, value, __tsan_memory_order_release);
- }
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn b/www/iridium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
deleted file mode 100644
index 3f1cf6465e60..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/WebKit/Source/wtf/BUILD.gn.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/BUILD.gn
-@@ -280,6 +280,10 @@ component("wtf") {
-     libs = [ "dl" ]
-   }
- 
-+  if (is_bsd) {
-+    libs = [ "execinfo" ]
-+  }
-+
-   if (is_mac) {
-     libs = [
-       "CoreFoundation.framework",
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h b/www/iridium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
deleted file mode 100644
index 11317a1ac1c6..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/ByteSwap.h
-@@ -60,15 +60,21 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t 
- 
- #else
- 
-+#ifndef bswap64
- ALWAYS_INLINE uint64_t bswap64(uint64_t x) {
-   return __builtin_bswap64(x);
- }
-+#endif
-+#ifndef bswap32
- ALWAYS_INLINE uint32_t bswap32(uint32_t x) {
-   return __builtin_bswap32(x);
- }
-+#endif
-+#ifndef bswap16
- ALWAYS_INLINE uint16_t bswap16(uint16_t x) {
-   return __builtin_bswap16(x);
- }
-+#endif
- 
- #endif
- 
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/iridium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
deleted file mode 100644
index 63eecc98cde7..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/ContainerAnnotations.h
-@@ -10,7 +10,7 @@
- 
- // TODO(ochang): Remove the CPU(X86_64) condition to enable this for X86 once
- // the crashes there have been fixed: http://crbug.com/461406
--#if defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
-+#if defined(ADDRESS_SANITIZER) && (OS(LINUX) || OS(BSD)) && CPU(X86_64)
- #define ANNOTATE_CONTIGUOUS_CONTAINER
- #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)                       \
-   if (buffer) {                                                              \
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp b/www/iridium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp
deleted file mode 100644
index 232a8e9cbbc2..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/WebKit/Source/wtf/StackUtil.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/StackUtil.cpp
-@@ -8,6 +8,10 @@
- #include "wtf/Threading.h"
- #include "wtf/WTFThreadData.h"
- 
-+#if OS(FREEBSD)
-+#include <pthread_np.h>
-+#endif
-+
- #if OS(WIN)
- #include <stddef.h>
- #include <windows.h>
diff --git a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/iridium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
deleted file mode 100644
index f31ce4568783..000000000000
--- a/www/iridium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2017-04-19 19:06:50 UTC
-+++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp
-@@ -49,11 +49,15 @@
- #include <objc/objc-auto.h>
- #endif
- 
--#if OS(LINUX)
-+#if OS(LINUX) || OS(BSD)
- #include <sys/syscall.h>
- #endif
- 
--#if OS(LINUX) || OS(ANDROID)
-+#if OS(BSD)
-+#include <pthread_np.h>
-+#endif
-+
-+#if OS(LINUX) || OS(ANDROID) || OS(BSD)
- #include <unistd.h>
- #endif
- 
-@@ -66,6 +70,8 @@ ThreadIdentifier currentThreadSyscall() 
-   return pthread_mach_thread_np(pthread_self());
- #elif OS(LINUX)
-   return syscall(__NR_gettid);
-+#elif OS(BSD)
-+  return pthread_getthreadid_np();
- #elif OS(ANDROID)
-   return gettid();
- #else
diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn
index 461ff42a959e..2dc3abbec676 100644
--- a/www/iridium/files/patch-third__party_angle_BUILD.gn
+++ b/www/iridium/files/patch-third__party_angle_BUILD.gn
@@ -1,46 +1,21 @@
---- third_party/angle/BUILD.gn.orig	2017-04-19 19:07:43 UTC
-+++ third_party/angle/BUILD.gn
-@@ -16,6 +16,12 @@ if (ozone_platform_gbm) {
+--- third_party/angle/BUILD.gn.orig	2018-05-09 21:07:37.000000000 +0200
++++ third_party/angle/BUILD.gn	2018-08-16 12:36:06.845472000 +0200
+@@ -257,6 +257,7 @@
+         "X11",
+         "Xi",
+         "Xext",
++        "GL",
+       ]
+     }
    }
- }
+@@ -812,10 +813,6 @@
  
-+if (use_x11) {
-+  pkg_config("x11") {
-+    packages = [ "x11", "xi", "xext" ]
-+  }
-+}
-+
- angle_git_is_present = exec_script("src/commit_id.py",
-                                    [
-                                      "check",
-@@ -418,11 +424,7 @@ static_library("libANGLE") {
-     if (use_x11) {
-       sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
-       deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
--      libs += [
--        "X11",
--        "Xi",
--        "Xext",
+     if (is_linux) {
+       sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
+-      libs = [
+-        "rt",
+-        "dl",
 -      ]
-+      configs += [ ":x11" ]
-     }
-     if (is_mac) {
-       sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
-@@ -627,7 +629,7 @@ util_gypi = exec_script("//build/gypi_to
- 
- config("angle_util_config") {
-   include_dirs = [ "util" ]
--  if (is_linux && use_x11) {
-+  if ((is_linux || is_bsd) && use_x11) {
-     libs = [ "X11" ]
-   }
- }
-@@ -654,7 +656,7 @@ foreach(is_shared_library,
-       sources += rebase_path(util_gypi.util_win32_sources, ".", "util")
      }
  
--    if (is_linux) {
-+    if (is_linux && !is_bsd) {
-       sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
-       libs = [
-         "rt",
+     if (is_mac) {
diff --git a/www/iridium/files/patch-third__party_angle_gni_angle.gni b/www/iridium/files/patch-third__party_angle_gni_angle.gni
deleted file mode 100644
index bcb9b5b1e7f8..000000000000
--- a/www/iridium/files/patch-third__party_angle_gni_angle.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/angle/gni/angle.gni.orig	2017-04-19 19:07:43 UTC
-+++ third_party/angle/gni/angle.gni
-@@ -20,6 +20,8 @@ if (is_win) {
-   import("//build/config/win/visual_studio_version.gni")
- } else if (is_linux && use_x11 && !is_chromeos) {
-   angle_enable_gl = true
-+} else if (is_bsd) {
-+  angle_enable_gl = true
- } else if (is_mac || ozone_platform_gbm) {
-   angle_enable_gl = true
- } else if (is_android) {
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h
new file mode 100644
index 000000000000..fe87784174ba
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h
@@ -0,0 +1,11 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2017-09-10 02:31:40.635170000 +0200
++++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h	2017-09-10 02:32:27.153701000 +0200
+@@ -14,6 +14,8 @@
+ namespace angle
+ {
+ 
++bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices);
++
+ // Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
+ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
+ // Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp
new file mode 100644
index 000000000000..159ad6ab6774
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp
@@ -0,0 +1,20 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig	2017-09-10 02:34:01.568975000 +0200
++++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp	2017-09-10 02:35:52.870068000 +0200
+@@ -71,10 +71,17 @@
+ 
+ bool GetSystemInfo(SystemInfo *info)
+ {
++#if defined(__FreeBSD__)
++    if (!CollectMesaCardInfo(&(info->gpus)))
++    {
++        return false;
++    }
++#else
+     if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
+     {
+         return false;
+     }
++#endif
+ 
+     if (info->gpus.size() == 0)
+     {
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp
new file mode 100644
index 000000000000..1bb84ac0aa33
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp
@@ -0,0 +1,52 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig	2017-12-15 02:05:36.000000000 +0100
++++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp	2017-12-30 05:11:53.917801000 +0100
+@@ -8,6 +8,8 @@
+ 
+ #include "gpu_info_util/SystemInfo_internal.h"
+ 
++#include <GL/glx.h>
++#include <GL/glxext.h>
+ #include <X11/Xlib.h>
+ 
+ #include "common/debug.h"
+@@ -18,8 +20,40 @@
+ #error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
+ #endif
+ 
++#define GLX_RENDERER_VENDOR_ID_MESA	0x8183
++#define GLX_RENDERER_DEVICE_ID_MESA	0x8184
++
+ namespace angle
+ {
++
++bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices)
++{
++
++    unsigned int vid[3], did[3];
++
++    Display *display = XOpenDisplay(NULL);
++    if (!display) {
++        return false;
++    }
++
++    PFNGLXQUERYRENDERERINTEGERMESAPROC queryInteger =
++        (PFNGLXQUERYRENDERERINTEGERMESAPROC) glXGetProcAddressARB((const GLubyte *)
++        "glXQueryRendererIntegerMESA");
++
++    bool vendor_ret =
++        queryInteger(display, 0, 0, GLX_RENDERER_VENDOR_ID_MESA, vid);
++    bool device_ret =
++        queryInteger(display, 0, 0, GLX_RENDERER_DEVICE_ID_MESA, did);
++
++    if (vendor_ret && device_ret) {
++        GPUDeviceInfo info;
++        info.vendorId = vid[0];
++        info.deviceId = did[0];
++        devices->push_back(info);
++    }
++
++    return true;
++}
+ 
+ bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
+ {
diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
new file mode 100644
index 000000000000..7904ed1747f1
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -0,0 +1,20 @@
+--- third_party/angle/src/libANGLE/Display.cpp.orig	2017-08-02 15:04:04.122103000 +0200
++++ third_party/angle/src/libANGLE/Display.cpp	2017-08-02 15:04:56.343338000 +0200
+@@ -61,7 +61,7 @@
+ #if defined(ANGLE_ENABLE_VULKAN)
+ #if defined(ANGLE_PLATFORM_WINDOWS)
+ #include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
+-#elif defined(ANGLE_PLATFORM_LINUX)
++#elif defined(ANGLE_PLATFORM_POSIX)
+ #include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
+ #else
+ #error Unsupported Vulkan platform.
+@@ -207,7 +207,7 @@
+ #if defined(ANGLE_ENABLE_VULKAN)
+ #if defined(ANGLE_PLATFORM_WINDOWS)
+             impl = new rx::DisplayVkWin32(state);
+-#elif defined(ANGLE_PLATFORM_LINUX)
++#elif defined(ANGLE_PLATFORM_POSIX)
+             impl = new rx::DisplayVkXcb(state);
+ #else
+ #error Unsupported Vulkan platform.
diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp
new file mode 100644
index 000000000000..e412e21a83ec
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp
@@ -0,0 +1,11 @@
+--- third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp.orig	2017-08-02 15:06:28.319994000 +0200
++++ third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp	2017-08-02 15:06:50.485321000 +0200
+@@ -952,7 +952,7 @@
+     workarounds->doesSRGBClearsOnLinearFramebufferAttachments =
+         functions->standard == STANDARD_GL_DESKTOP && (IsIntel(vendor) || IsAMD(vendor));
+ 
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+     workarounds->emulateMaxVertexAttribStride =
+         functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor);
+     workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsAMD(vendor);
diff --git a/www/iridium/files/patch-third__party_angle_src_tests_BUILD.gn b/www/iridium/files/patch-third__party_angle_src_tests_BUILD.gn
deleted file mode 100644
index 62bde77ad58e..000000000000
--- a/www/iridium/files/patch-third__party_angle_src_tests_BUILD.gn
+++ /dev/null
@@ -1,65 +0,0 @@
---- third_party/angle/src/tests/BUILD.gn.orig	2017-04-19 19:07:43 UTC
-+++ third_party/angle/src/tests/BUILD.gn
-@@ -41,7 +41,7 @@ test("angle_unittests") {
-   ]
- }
- 
--if (is_win || is_linux || is_mac || is_android) {
-+if (is_win || is_linux || is_mac || is_android || is_bsd) {
-   end2end_gypi = exec_script("//build/gypi_to_gn.py",
-                              [
-                                rebase_path("angle_end2end_tests.gypi"),
-@@ -82,7 +82,7 @@ if (is_win || is_linux || is_mac || is_a
-       "//third_party/angle:libANGLE_config",
-     ]
- 
--    if (is_linux && !is_component_build) {
-+    if ((is_linux || is_bsd) && !is_component_build) {
-       # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
-       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-     }
-@@ -230,7 +230,7 @@ if (build_angle_deqp_tests) {
-     # Ask the system headers to expose all the regular function otherwise
-     # dEQP doesn't compile and produces warnings about implicitly defined
-     # functions.
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
-       defines += [ "_GNU_SOURCE" ]
-     }
-@@ -253,7 +253,7 @@ if (build_angle_deqp_tests) {
-     ]
-   }
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_android || is_bsd) {
-     deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
-   }
- 
-@@ -290,7 +290,7 @@ if (build_angle_deqp_tests) {
-     if (is_win) {
-       sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
-     }
--    if (is_linux || is_android) {
-+    if (is_linux || is_android || is_bsd) {
-       sources +=
-           rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
-     }
-@@ -320,7 +320,7 @@ if (build_angle_deqp_tests) {
- 
-     # Taken from gpu/BUILD.gn
-     # TODO(jmadill): this should be in a shared location
--    if (is_linux && !is_chromecast) {
-+    if ((is_linux || is_bsd) && !is_chromecast) {
-       libs = [ "pci" ]
-     }
-   }
-@@ -396,7 +396,7 @@ if (build_angle_deqp_tests) {
-         "../../../deqp/src/data/",
-       ]
- 
--      if (is_linux && !is_component_build) {
-+      if ((is_linux || is_bsd) && !is_component_build) {
-         # Set rpath to find *.so files even in a non-component build.
-         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
-       }
diff --git a/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c b/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c
new file mode 100644
index 000000000000..d5b06a1b7fa2
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c
@@ -0,0 +1,11 @@
+--- third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c.orig	2018-07-19 21:08:23.127507000 +0200
++++ third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c	2018-07-19 21:08:38.418461000 +0200
+@@ -208,7 +208,7 @@
+ }
+ 
+ // Environment variables
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+ 
+ static inline char *loader_getenv(const char *name, const struct loader_instance *inst) {
+     // No allocation of memory necessary for Linux, but we should at least touch
diff --git a/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h b/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h
new file mode 100644
index 000000000000..09e7033c0235
--- /dev/null
+++ b/www/iridium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h
@@ -0,0 +1,11 @@
+--- third_party/angle/third_party/vulkan-validation-layers/src/loader/vk_loader_platform.h.orig	2018-07-19 21:07:44.888863000 +0200
++++ third_party/angle/third_party/vulkan-validation-layers/src/loader/vk_loader_platform.h	2018-07-19 21:08:10.994378000 +0200
+@@ -31,7 +31,7 @@
+ #include "vulkan/vk_platform.h"
+ #include "vulkan/vk_sdk_platform.h"
+ 
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
+ /* Linux-specific common code: */
+ 
+ // Headers:
diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.gn b/www/iridium/files/patch-third__party_boringssl_BUILD.gn
index 549874c3e4a5..555eb5a0998c 100644
--- a/www/iridium/files/patch-third__party_boringssl_BUILD.gn
+++ b/www/iridium/files/patch-third__party_boringssl_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.gn.orig	2017-04-19 19:06:51 UTC
-+++ third_party/boringssl/BUILD.gn
-@@ -83,7 +83,7 @@ if (is_win && !is_msan) {
+--- third_party/boringssl/BUILD.gn.orig	2017-09-05 21:05:42.000000000 +0200
++++ third_party/boringssl/BUILD.gn	2017-09-06 22:45:41.435863000 +0200
+@@ -85,7 +85,7 @@
      } 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" ]
-@@ -91,14 +91,14 @@ if (is_win && !is_msan) {
+@@ -93,13 +93,13 @@
      } else if (current_cpu == "x86") {
        if (is_mac) {
          sources += crypto_sources_mac_x86
@@ -19,11 +19,18 @@
        } else {
          public_configs = [ ":no_asm_config" ]
        }
--    } else if (current_cpu == "arm" && (is_linux || is_android)) {
-+    } else if (current_cpu == "arm" && (is_linux || is_bsd || is_android)) {
-       sources += crypto_sources_linux_arm
--    } else if (current_cpu == "arm64" && (is_linux || is_android)) {
-+    } else if (current_cpu == "arm64" && (is_linux || is_bsd || is_android)) {
-       sources += crypto_sources_linux_aarch64
-     } else {
-       public_configs = [ ":no_asm_config" ]
+     } else if (current_cpu == "arm") {
+-      if (is_linux || is_android) {
++      if (is_linux || is_bsd || is_android) {
+         sources += crypto_sources_linux_arm
+       } else if (is_ios) {
+         sources += crypto_sources_ios_arm
+@@ -107,7 +107,7 @@
+         public_configs = [ ":no_asm_config" ]
+       }
+     } else if (current_cpu == "arm64") {
+-      if (is_linux || is_android) {
++      if (is_linux || is_bsd || is_android) {
+         sources += crypto_sources_linux_aarch64
+       } else if (is_ios) {
+         sources += crypto_sources_ios_aarch64
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
new file mode 100644
index 000000000000..4182692c8710
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
@@ -0,0 +1,40 @@
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig	2017-09-11 03:00:27.842983000 +0200
++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c	2017-09-11 03:02:56.830632000 +0200
+@@ -16,7 +16,9 @@
+ 
+ #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
+ 
++#if defined(OPENSSL_LINUX)
+ #include <sys/auxv.h>
++#endif
+ 
+ #include <openssl/arm_arch.h>
+ 
+@@ -26,6 +28,7 @@
+ extern uint32_t OPENSSL_armcap_P;
+ 
+ void OPENSSL_cpuid_setup(void) {
++#if defined(OPENSSL_LINUX)
+   unsigned long hwcap = getauxval(AT_HWCAP);
+ 
+   /* See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
+@@ -41,9 +44,11 @@
+      * either. */
+     return;
+   }
++#endif
+ 
+   OPENSSL_armcap_P |= ARMV7_NEON;
+ 
++#if defined(OPENSSL_LINUX)
+   if (hwcap & kAES) {
+     OPENSSL_armcap_P |= ARMV8_AES;
+   }
+@@ -56,6 +61,7 @@
+   if (hwcap & kSHA256) {
+     OPENSSL_armcap_P |= ARMV8_SHA256;
+   }
++#endif
+ }
+ 
+ #endif /* OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP */
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_ex__data.c
index 671756035ef6..c1bfe5de1af6 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_ex__data.c
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_ex__data.c
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/ex_data.c.orig	2017-04-19 19:07:42 UTC
+--- third_party/boringssl/src/crypto/ex_data.c.orig	2017-06-05 19:04:14 UTC
 +++ third_party/boringssl/src/crypto/ex_data.c
-@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *a
+@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, 
      }
    }
  
diff --git a/www/iridium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h b/www/iridium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h
new file mode 100644
index 000000000000..f98c620acc5f
--- /dev/null
+++ b/www/iridium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h
@@ -0,0 +1,11 @@
+--- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig	2017-12-23 22:07:26.606040000 +0100
++++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h	2017-12-23 22:08:01.480046000 +0100
+@@ -33,7 +33,7 @@
+ #include <assert.h>
+ #include <string.h>
+ 
+-#include "common/basictypes.h"
++#include "third_party/breakpad/breakpad/src/common/basictypes.h"
+ 
+ namespace google_breakpad {
+ 
diff --git a/www/iridium/files/patch-third__party_expat_BUILD.gn b/www/iridium/files/patch-third__party_expat_BUILD.gn
deleted file mode 100644
index 7dd3c3906595..000000000000
--- a/www/iridium/files/patch-third__party_expat_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/expat/BUILD.gn.orig	2017-04-19 19:06:51 UTC
-+++ third_party/expat/BUILD.gn
-@@ -9,7 +9,7 @@ import("//testing/libfuzzer/fuzzer_test.
- # let's not pull it in twice.
- # Chromecast doesn't ship expat as a system library.
- # Libfuzzer and AFL need to build library from sources.
--if (is_linux && !is_chromecast && !use_libfuzzer && !use_afl) {
-+if ((is_linux || is_bsd) && !is_chromecast && !use_libfuzzer && !use_afl) {
-   config("expat_config") {
-     libs = [ "expat" ]
-   }
diff --git a/www/iridium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/iridium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
deleted file mode 100644
index 18de5c725e59..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
+++ /dev/null
@@ -1,285 +0,0 @@
---- third_party/ffmpeg/ffmpeg_generated.gni.orig	2017-04-19 19:07:44 UTC
-+++ third_party/ffmpeg/ffmpeg_generated.gni
-@@ -12,7 +12,7 @@ ffmpeg_c_sources = []
- ffmpeg_gas_sources = []
- ffmpeg_yasm_sources = []
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm") || ((is_linux || is_bsd) && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) {
-   ffmpeg_c_sources += [
-     "libavcodec/allcodecs.c",
-     "libavcodec/autorename_libavcodec_flacdec.c",
-@@ -161,7 +161,7 @@ if ((is_android && current_cpu == "arm" 
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm") || (is_linux && current_cpu == "arm64") || (is_linux && current_cpu == "mipsel") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm") || ((is_linux || is_bsd) && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) {
-   ffmpeg_c_sources += [
-     "libavcodec/autorename_libavcodec_hpeldsp.c",
-     "libavcodec/autorename_libavcodec_videodsp.c",
-@@ -176,7 +176,7 @@ if ((is_linux && current_cpu == "arm" &&
-   ]
- }
- 
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux | is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aac_ac3_parser.c",
-     "libavcodec/aac_parser.c",
-@@ -213,7 +213,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
-   ]
- }
- 
--if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
-+if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-     "libavcodec/x86/constants.c",
-@@ -226,7 +226,7 @@ if ((is_android && current_cpu == "x64")
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/cabac.c",
-     "libavcodec/h2645_parse.c",
-@@ -258,7 +258,7 @@ if ((is_android && current_cpu == "arm" 
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/fft_fixed_init_arm.c",
-     "libavcodec/arm/fft_init_arm.c",
-@@ -277,7 +277,7 @@ if ((is_android && current_cpu == "arm" 
-   ]
- }
- 
--if ((is_android && current_cpu == "x64") || (is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
-+if ((is_android && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) {
-   ffmpeg_yasm_sources += [
-     "libavcodec/x86/fft.asm",
-     "libavcodec/x86/flacdsp.asm",
-@@ -289,7 +289,7 @@ if ((is_android && current_cpu == "x64")
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64") || (is_linux && current_cpu == "x86") || (is_mac) || (is_win)) {
-+if (((is_linux || is_bsd) && current_cpu == "x64") || ((is_linux || is_bsd) && current_cpu == "x86") || (is_mac) || (is_win)) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
-     "libavcodec/x86/h264_intrapred_init.c",
-@@ -309,7 +309,7 @@ if ((is_linux && current_cpu == "x64") |
-   ]
- }
- 
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/aacpsdsp_init.c",
-     "libavcodec/x86/dct_init.c",
-@@ -318,7 +318,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
-   ]
- }
- 
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_win && ffmpeg_branding == "Chrome")) {
-   ffmpeg_yasm_sources += [
-     "libavcodec/x86/aacpsdsp.asm",
-     "libavcodec/x86/dct32.asm",
-@@ -327,7 +327,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/h264pred_init_arm.c",
-     "libavcodec/arm/hpeldsp_init_arm.c",
-@@ -347,13 +347,13 @@ if ((is_linux && current_cpu == "arm" &&
-   ]
- }
- 
--if ((is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_linux && current_cpu == "mipsel")) {
-+if ((is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || ((is_linux || is_bsd) && current_cpu == "mipsel")) {
-   ffmpeg_c_sources += [
-     "libavutil/mips/float_dsp_mips.c",
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/acelp_filters.c",
-     "libavcodec/acelp_pitch_delay.c",
-@@ -408,7 +408,7 @@ if ((is_linux && current_cpu == "arm" &&
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64") || (is_linux && current_cpu == "arm64")) {
-+if ((is_android && current_cpu == "arm64") || ((is_linux || is_bsd) && current_cpu == "arm64")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/fft_init_aarch64.c",
-     "libavcodec/aarch64/vorbisdsp_init.c",
-@@ -423,7 +423,7 @@ if ((is_android && current_cpu == "arm64
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/aacpsdsp_init_arm.c",
-     "libavcodec/arm/mpegaudiodsp_init_arm.c",
-@@ -434,7 +434,7 @@ if ((is_android && current_cpu == "arm" 
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_linux && current_cpu == "arm" && arm_use_neon)) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon) || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon)) {
-   ffmpeg_c_sources += [
-     "libavutil/arm/float_dsp_init_neon.c",
-   ]
-@@ -449,7 +449,7 @@ if ((is_android && current_cpu == "arm" 
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/h264chroma_init_arm.c",
-     "libavcodec/arm/h264dsp_init_arm.c",
-@@ -460,7 +460,7 @@ if ((is_linux && current_cpu == "arm" &&
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) {
-+if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/h264_qpel.c",
-     "libavcodec/x86/h264chroma_init.c",
-@@ -481,7 +481,7 @@ if ((is_linux && current_cpu == "x64" &&
-   ]
- }
- 
--if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/aacdec_mips.c",
-     "libavcodec/mips/aacpsdsp_mips.c",
-@@ -490,7 +490,7 @@ if ((is_android && current_cpu == "mips6
-   ]
- }
- 
--if (is_linux && current_cpu == "mipsel") {
-+if ((is_linux || is_bsd) && current_cpu == "mipsel") {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/h264pred_init_mips.c",
-     "libavcodec/mips/hpeldsp_init_mips.c",
-@@ -498,7 +498,7 @@ if (is_linux && current_cpu == "mipsel")
-   ]
- }
- 
--if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/h264chroma_init_mips.c",
-     "libavcodec/mips/h264dsp_init_mips.c",
-@@ -506,7 +506,7 @@ if ((is_linux && current_cpu == "mipsel"
-   ]
- }
- 
--if (is_linux && current_cpu == "arm64") {
-+if ((is_linux || is_bsd) && current_cpu == "arm64") {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/h264pred_init.c",
-     "libavcodec/aarch64/hpeldsp_init_aarch64.c",
-@@ -519,7 +519,7 @@ if (is_linux && current_cpu == "arm64") 
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/mpegaudiodsp_init.c",
-   ]
-@@ -528,7 +528,7 @@ if ((is_android && current_cpu == "arm64
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/h264chroma_init_aarch64.c",
-     "libavcodec/aarch64/h264dsp_init_aarch64.c",
-@@ -542,7 +542,7 @@ if ((is_linux && current_cpu == "arm64" 
-   ]
- }
- 
--if (is_linux && current_cpu == "arm" && arm_use_neon) {
-+if ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/hpeldsp_init_neon.c",
-     "libavcodec/arm/vp8dsp_init_neon.c",
-@@ -555,14 +555,14 @@ if (is_linux && current_cpu == "arm" && 
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_gas_sources += [
-     "libavcodec/arm/aacpsdsp_neon.S",
-     "libavcodec/arm/sbrdsp_neon.S",
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/blockdsp_init_arm.c",
-     "libavcodec/arm/idctdsp_init_arm.c",
-@@ -586,13 +586,13 @@ if ((is_linux && current_cpu == "arm" &&
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c",
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_gas_sources += [
-     "libavcodec/arm/h264cmc_neon.S",
-     "libavcodec/arm/h264dsp_neon.S",
-@@ -607,7 +607,7 @@ if (is_win && current_cpu == "x64") {
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || is_bsd) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || is_bsd) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/blockdsp_init.c",
-     "libavcodec/x86/fdct.c",
-@@ -634,7 +634,7 @@ if ((is_linux && current_cpu == "x64" &&
-   ]
- }
- 
--if (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
-+if ((is_linux || is_bsd) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/blockdsp_init_mips.c",
-     "libavcodec/mips/h263dsp_init_mips.c",
-@@ -647,7 +647,7 @@ if (is_linux && current_cpu == "mipsel" 
-   ]
- }
- 
--if (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
-+if ((is_linux || is_bsd) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/blockdsp_init_neon.c",
-     "libavcodec/arm/idctdsp_init_neon.c",
diff --git a/www/iridium/files/patch-third__party_fontconfig_BUILD.gn b/www/iridium/files/patch-third__party_fontconfig_BUILD.gn
deleted file mode 100644
index d6be0905f47d..000000000000
--- a/www/iridium/files/patch-third__party_fontconfig_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/fontconfig/BUILD.gn.orig	2017-04-19 19:06:51 UTC
-+++ third_party/fontconfig/BUILD.gn
-@@ -2,7 +2,7 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
--assert(is_linux)
-+assert(is_linux || is_bsd)
- 
- config("fontconfig_config") {
-   include_dirs = [ "src" ]
diff --git a/www/iridium/files/patch-third__party_glslang_BUILD.gn b/www/iridium/files/patch-third__party_glslang_BUILD.gn
deleted file mode 100644
index dda33f071ba2..000000000000
--- a/www/iridium/files/patch-third__party_glslang_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/glslang/BUILD.gn.orig	2017-04-19 19:06:51 UTC
-+++ third_party/glslang/BUILD.gn
-@@ -8,7 +8,7 @@ config("glslang_config") {
-   include_dirs = [ "src" ]
- 
-   defines = []
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     defines += [ "GLSLANG_OSINCLUDE_UNIX" ]
-   } else if (is_win) {
-     defines += [ "GLSLANG_OSINCLUDE_WIN32" ]
-@@ -132,7 +132,7 @@ static_library("glslang") {
-     "src/glslang/Public/ShaderLang.h",
-   ]
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     sources += [ "src/glslang/OSDependent/Unix/ossource.cpp" ]
-   } else if (is_win) {
-     sources += [
diff --git a/www/iridium/files/patch-third__party_harfbuzz-ng_BUILD.gn b/www/iridium/files/patch-third__party_harfbuzz-ng_BUILD.gn
deleted file mode 100644
index 717835d33d65..000000000000
--- a/www/iridium/files/patch-third__party_harfbuzz-ng_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/harfbuzz-ng/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/harfbuzz-ng/BUILD.gn
-@@ -50,7 +50,7 @@ if (use_system_harfbuzz) {
- 
-   # See also chrome/browser/ui/libgtkui/BUILD.gn which pulls this.
-   config("pangoft2_link_hack") {
--    if (is_linux && use_pango && !is_chromeos && !is_official_build &&
-+    if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build &&
-         current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {
-       # These symbols are referenced from libpangoft2, which will be
-       # dynamically linked later.
-@@ -200,7 +200,7 @@ if (use_system_harfbuzz) {
-     # in the tree, all symbols pango needs must be included, or
-     # pango uses mixed versions of harfbuzz and leads to crash.
-     # See crbug.com/462689.
--    if (is_linux && use_pango && !is_chromeos && !is_official_build &&
-+    if ((is_linux || is_bsd) && use_pango && !is_chromeos && !is_official_build &&
-         current_cpu != "arm" && current_cpu != "mipsel") {
-       deps += [ "//build/linux:freetype2" ]
-       configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
diff --git a/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c b/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c
new file mode 100644
index 000000000000..2810288f5d1b
--- /dev/null
+++ b/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c
@@ -0,0 +1,25 @@
+--- third_party/libXNVCtrl/NVCtrl.c.orig	2017-12-30 16:57:06.449527000 +0100
++++ third_party/libXNVCtrl/NVCtrl.c	2017-12-30 16:57:57.055972000 +0100
+@@ -27,10 +27,6 @@
+  * libXNVCtrl library properly protects the Display connection.
+  */
+ 
+-#if !defined(XTHREADS)
+-#define XTHREADS
+-#endif /* XTHREADS */
+-
+ #define NEED_EVENTS
+ #define NEED_REPLIES
+ #include <stdint.h>
+@@ -39,6 +35,11 @@
+ #include <X11/Xutil.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
++
++#if !defined(XTHREADS)
++#define XTHREADS
++#endif /* XTHREADS */
++
+ #include "NVCtrlLib.h"
+ #include "nv_control.h"
+ 
diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
index 4663573fab03..65aa11388ae4 100644
--- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
+++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
@@ -1,6 +1,6 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2017-04-19 19:07:47 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2017-06-05 19:04:19 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
-@@ -56,7 +56,7 @@ template <class T> boost::once_flag Sing
+@@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag
  #include "phonenumbers/base/logging.h"
  #include "phonenumbers/base/thread_checker.h"
  
diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
index b4af7627b1ea..ff7472a6bf75 100644
--- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
+++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
@@ -1,6 +1,6 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2017-04-19 19:07:47 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2017-06-05 19:04:19 UTC
 +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
-@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLo
+@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock;
  // 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.
diff --git a/www/iridium/files/patch-third__party_libusb_BUILD.gn b/www/iridium/files/patch-third__party_libusb_BUILD.gn
deleted file mode 100644
index 05273d1c0de4..000000000000
--- a/www/iridium/files/patch-third__party_libusb_BUILD.gn
+++ /dev/null
@@ -1,256 +0,0 @@
---- third_party/libusb/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/libusb/BUILD.gn
-@@ -6,8 +6,25 @@ assert(!is_android && !is_ios)
- 
- import("//build/config/features.gni")
- 
--config("libusb_config") {
--  include_dirs = [ "src/libusb" ]
-+declare_args() {
-+  use_system_libusb = is_bsd
-+}
-+
-+
-+if (use_system_libusb) {
-+  config("libusb_config") {
-+    defines = ["USE_SYSTEM_LIBUSB"]
-+    libs = ["usb"]
-+   }
-+
-+  source_set("libusb") {
-+    public_configs = [ ":libusb_config" ]
-+  }
-+} else {
-+
-+  config("libusb_config") {
-+    include_dirs = [ "src/libusb" ]
-+  }
- }
- 
- config("libusb_warnings") {
-@@ -21,118 +38,119 @@ config("libusb_warnings") {
-   }
- }
- 
--static_library("libusb") {
--  sources = [
--    "src/config.h",
--    "src/libusb/core.c",
--    "src/libusb/descriptor.c",
--    "src/libusb/hotplug.c",
--    "src/libusb/hotplug.h",
--    "src/libusb/interrupt.c",
--    "src/libusb/interrupt.h",
--    "src/libusb/io.c",
--    "src/libusb/libusb.h",
--    "src/libusb/libusbi.h",
--    "src/libusb/os/darwin_usb.c",
--    "src/libusb/os/darwin_usb.h",
--    "src/libusb/os/poll_posix.c",
--    "src/libusb/os/poll_posix.h",
--    "src/libusb/os/poll_windows.c",
--    "src/libusb/os/poll_windows.h",
--    "src/libusb/os/threads_posix.c",
--    "src/libusb/os/threads_posix.h",
--    "src/libusb/os/threads_windows.c",
--    "src/libusb/os/threads_windows.h",
--    "src/libusb/os/windows_common.h",
--    "src/libusb/os/windows_usb.c",
--    "src/libusb/os/windows_usb.h",
--    "src/libusb/strerror.c",
--    "src/libusb/sync.c",
--    "src/libusb/version.h",
--    "src/libusb/version_nano.h",
--    "src/msvc/config.h",
--    "src/msvc/inttypes.h",
--    "src/msvc/stdint.h",
--  ]
--  deps = []
--  include_dirs = [ "src/libusb/os" ]
-+if (!use_system_libusb) {
-+  static_library("libusb") {
-+    sources = [
-+      "src/config.h",
-+      "src/libusb/core.c",
-+      "src/libusb/descriptor.c",
-+      "src/libusb/hotplug.c",
-+      "src/libusb/hotplug.h",
-+      "src/libusb/interrupt.c",
-+      "src/libusb/interrupt.h",
-+      "src/libusb/io.c",
-+      "src/libusb/libusb.h",
-+      "src/libusb/libusbi.h",
-+      "src/libusb/os/darwin_usb.c",
-+      "src/libusb/os/darwin_usb.h",
-+      "src/libusb/os/poll_posix.c",
-+      "src/libusb/os/poll_posix.h",
-+      "src/libusb/os/poll_windows.c",
-+      "src/libusb/os/poll_windows.h",
-+      "src/libusb/os/threads_posix.c",
-+      "src/libusb/os/threads_posix.h",
-+      "src/libusb/os/threads_windows.c",
-+      "src/libusb/os/threads_windows.h",
-+      "src/libusb/os/windows_common.h",
-+      "src/libusb/os/windows_usb.c",
-+      "src/libusb/os/windows_usb.h",
-+      "src/libusb/strerror.c",
-+      "src/libusb/sync.c",
-+      "src/libusb/version.h",
-+      "src/libusb/version_nano.h",
-+      "src/msvc/config.h",
-+      "src/msvc/inttypes.h",
-+      "src/msvc/stdint.h",
-+      ]
-+        deps = []
-+        include_dirs = [ "src/libusb/os" ]
- 
--  configs -= [ "//build/config/compiler:chromium_code" ]
--  configs += [
--    "//build/config/compiler:no_chromium_code",
-+        configs -= [ "//build/config/compiler:chromium_code" ]
-+        configs += [
-+        "//build/config/compiler:no_chromium_code",
- 
--    # Must be after no_chromium_code for warning flags to be ordered correctly.
--    ":libusb_warnings",
--  ]
-+# Must be after no_chromium_code for warning flags to be ordered correctly.
-+      ":libusb_warnings",
-+        ]
- 
--  public_configs = [ ":libusb_config" ]
-+          public_configs = [ ":libusb_config" ]
- 
--  if (is_posix) {
--    defines = [
--      "DEFAULT_VISIBILITY=",
--      "HAVE_GETTIMEOFDAY=1",
--      "HAVE_POLL_H=1",
--      "HAVE_SYS_TIME_H=1",
--      "LIBUSB_DESCRIBE=\"1.0.16\"",
--      "POLL_NFDS_TYPE=nfds_t",
--      "THREADS_POSIX=1",
--    ]
--  }
-+          if (is_posix) {
-+            defines = [
-+              "DEFAULT_VISIBILITY=",
-+            "HAVE_GETTIMEOFDAY=1",
-+            "HAVE_POLL_H=1",
-+            "HAVE_SYS_TIME_H=1",
-+            "LIBUSB_DESCRIBE=\"1.0.16\"",
-+            "POLL_NFDS_TYPE=nfds_t",
-+            "THREADS_POSIX=1",
-+            ]
-+          }
- 
--  if (is_mac) {
--    defines += [
--      "OS_DARWIN=1",
-+    if (is_mac) {
-+      defines += [
-+        "OS_DARWIN=1",
- 
--      # Needed on OSX 10.12 to silence a deprecation warning.
-+# Needed on OSX 10.12 to silence a deprecation warning.
-       "OBJC_SILENCE_GC_DEPRECATIONS=1",
--    ]
--  } else {
--    sources -= [
--      "src/libusb/os/darwin_usb.c",
-+      ]
-+    } else {
-+      sources -= [
-+        "src/libusb/os/darwin_usb.c",
-       "src/libusb/os/darwin_usb.h",
--    ]
--  }
-+      ]
-+    }
- 
--  if (is_linux) {
--    sources += [
--      "src/libusb/os/linux_usbfs.c",
-+    if (is_linux) {
-+      sources += [
-+        "src/libusb/os/linux_usbfs.c",
-       "src/libusb/os/linux_usbfs.h",
--    ]
--    defines += [
--      "OS_LINUX=1",
-+      ]
-+        defines += [
-+        "OS_LINUX=1",
-       "_GNU_SOURCE=1",
--    ]
--  }
-+        ]
-+    }
- 
--  if (is_chromeos) {
--    defines += [ "USBI_TIMERFD_AVAILABLE" ]
--  }
-+    if (is_chromeos) {
-+      defines += [ "USBI_TIMERFD_AVAILABLE" ]
-+    }
- 
--  if (use_udev) {
--    sources += [ "src/libusb/os/linux_udev.cc" ]
--    defines += [
--      "HAVE_LIBUDEV=1",
--      "USE_UDEV=1",
--    ]
--    deps += [ "//build/linux/libudev" ]
--  }
-+    if (use_udev) {
-+      sources += [ "src/libusb/os/linux_udev.cc" ]
-+        defines += [
-+        "HAVE_LIBUDEV=1",
-+        "USE_UDEV=1",
-+        ]
-+          deps += [ "//build/linux/libudev" ]
-+    }
- 
--  if (is_linux && !use_udev) {
--    sources += [ "src/libusb/os/linux_netlink.c" ]
--    defines += [ "HAVE_LINUX_NETLINK_H" ]
--  }
-+    if (is_linux && !use_udev) {
-+      sources += [ "src/libusb/os/linux_netlink.c" ]
-+        defines += [ "HAVE_LINUX_NETLINK_H" ]
-+    }
- 
--  if (is_win) {
--    include_dirs += [ "src/msvc" ]
--    sources -= [
--      "src/libusb/os/poll_posix.c",
--      "src/libusb/os/threads_posix.c",
--    ]
--    libs = [ "setupapi.lib" ]
--  } else {
--    include_dirs += [ "src" ]
--    sources -= [
--      "src/libusb/os/poll_windows.c",
-+    if (is_win) {
-+      include_dirs += [ "src/msvc" ]
-+        sources -= [
-+        "src/libusb/os/poll_posix.c",
-+        "src/libusb/os/threads_posix.c",
-+        ]
-+          libs = [ "setupapi.lib" ]
-+    } else {
-+      include_dirs += [ "src" ]
-+        sources -= [
-+        "src/libusb/os/poll_windows.c",
-       "src/libusb/os/poll_windows.h",
-       "src/libusb/os/threads_windows.c",
-       "src/libusb/os/threads_windows.h",
-@@ -142,6 +160,7 @@ static_library("libusb") {
-       "src/msvc/config.h",
-       "src/msvc/inttypes.h",
-       "src/msvc/stdint.h",
--    ]
-+        ]
-+    }
-   }
- }
diff --git a/www/iridium/files/patch-third__party_libxml_BUILD.gn b/www/iridium/files/patch-third__party_libxml_BUILD.gn
deleted file mode 100644
index ca1f0871a73d..000000000000
--- a/www/iridium/files/patch-third__party_libxml_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libxml/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/libxml/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- # Define an "os_include" variable that points at the OS-specific generated
- # headers.  These were generated by running the configure script offline.
--if (is_linux || is_android || is_nacl) {
-+if (is_linux || is_bsd || is_android || is_nacl) {
-   os_include = "linux"
- } else if (is_mac || is_ios) {
-   os_include = "mac"
diff --git a/www/iridium/files/patch-third__party_libxslt_BUILD.gn b/www/iridium/files/patch-third__party_libxslt_BUILD.gn
deleted file mode 100644
index d4e07a9f4735..000000000000
--- a/www/iridium/files/patch-third__party_libxslt_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libxslt/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/libxslt/BUILD.gn
-@@ -82,7 +82,7 @@ static_library("libxslt") {
-   public_configs = [ ":libxslt_config" ]
- 
-   cflags = []
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     include_dirs = [ "linux" ]
-   } else if (is_win) {
-     include_dirs = [ "win32" ]
diff --git a/www/iridium/files/patch-third__party_mesa_BUILD.gn b/www/iridium/files/patch-third__party_mesa_BUILD.gn
index 7fd1838dbff0..2e534118fc1f 100644
--- a/www/iridium/files/patch-third__party_mesa_BUILD.gn
+++ b/www/iridium/files/patch-third__party_mesa_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/mesa/BUILD.gn.orig	2017-04-19 19:06:52 UTC
+--- third_party/mesa/BUILD.gn.orig	2017-06-05 19:03:28 UTC
 +++ third_party/mesa/BUILD.gn
 @@ -90,6 +90,10 @@ config("mesa_internal_config") {
      defines += [ "_GNU_SOURCE" ]
@@ -11,13 +11,3 @@
    if (is_win) {
      defines += [
        # Generated files use const only if __cplusplus or __STDC__ is defined.
-@@ -757,7 +761,8 @@ loadable_module("osmesa") {
-   ]
- 
-   # Required for the allocator implementation, which is not used on Mac.
--  if (!is_mac) {
-+  # For BSD, there's no poing to include everything.
-+  if (!is_mac && !is_bsd) {
-     deps += [ "//base" ]
-   }
- 
diff --git a/www/iridium/files/patch-third__party_minigbm_BUILD.gn b/www/iridium/files/patch-third__party_minigbm_BUILD.gn
deleted file mode 100644
index 68ed5d26997e..000000000000
--- a/www/iridium/files/patch-third__party_minigbm_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/minigbm/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/minigbm/BUILD.gn
-@@ -4,7 +4,7 @@
- 
- import("//build/config/linux/pkg_config.gni")
- 
--assert(is_linux)
-+assert(is_linux || is_bsd)
- 
- declare_args() {
-   # Controls whether the build should use the version of minigbm library
diff --git a/www/iridium/files/patch-third__party_node_node.py b/www/iridium/files/patch-third__party_node_node.py
index 0cae32db5058..b411057af615 100644
--- a/www/iridium/files/patch-third__party_node_node.py
+++ b/www/iridium/files/patch-third__party_node_node.py
@@ -4,7 +4,7 @@
  def GetBinaryPath():
    return os_path.join(os_path.dirname(__file__), *{
      'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
-+    'FreeBSD': ('linux', 'node-linux-x64', 'bin', 'node'),
++    'FreeBSD': ('freebsd', 'node-freebsd-x64', 'bin', 'node'),
      'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
      'Windows': ('win', 'node.exe'),
    }[platform.system()])
diff --git a/www/iridium/files/patch-third__party_opus_BUILD.gn b/www/iridium/files/patch-third__party_opus_BUILD.gn
deleted file mode 100644
index f15683ab5cb8..000000000000
--- a/www/iridium/files/patch-third__party_opus_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/opus/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/opus/BUILD.gn
-@@ -14,7 +14,7 @@ use_opus_arm_optimization = current_cpu 
- # If OPUS Run Time CPU Detections (RTCD) shall be used.
- # Based on the conditions in celt/arm/armcpu.c:
- # defined(_MSC_VER) || defined(__linux__).
--use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux)
-+use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux || is_bsd)
- 
- config("opus_config") {
-   include_dirs = [ "src/include" ]
diff --git a/www/iridium/files/patch-third__party_ots_include_opentype-sanitiser.h b/www/iridium/files/patch-third__party_ots_include_opentype-sanitiser.h
deleted file mode 100644
index 295e94d48c37..000000000000
--- a/www/iridium/files/patch-third__party_ots_include_opentype-sanitiser.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/ots/include/opentype-sanitiser.h.orig	2017-04-19 19:06:52 UTC
-+++ third_party/ots/include/opentype-sanitiser.h
-@@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t;
- #else
- #include <arpa/inet.h>
- #include <stdint.h>
-+#include <sys/types.h>
- #endif
- 
- #include <algorithm>
diff --git a/www/iridium/files/patch-third__party_pdfium_BUILD.gn b/www/iridium/files/patch-third__party_pdfium_BUILD.gn
deleted file mode 100644
index b14844a92bb9..000000000000
--- a/www/iridium/files/patch-third__party_pdfium_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/pdfium/BUILD.gn.orig	2017-04-19 19:07:49 UTC
-+++ third_party/pdfium/BUILD.gn
-@@ -65,7 +65,7 @@ config("pdfium_core_config") {
-   cflags = []
-   configs = [ ":pdfium_common_config" ]
-   defines = [ "V8_DEPRECATION_WARNINGS" ]
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (current_cpu == "x64") {
-       defines += [ "_FX_CPU_=_FX_X64_" ]
-       cflags += [ "-fPIC" ]
diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
index 582042a88fee..95914efb0cb0 100644
--- a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
+++ b/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	2017-04-19 19:07:50 UTC
-+++ third_party/pdfium/core/fxcrt/fx_system.h
+--- third_party/pdfium/core/fxcrt/fx_system.h.orig	2017-12-15 02:05:39.000000000 +0100
++++ third_party/pdfium/core/fxcrt/fx_system.h	2017-12-24 18:45:42.922884000 +0100
 @@ -40,7 +40,7 @@
  #elif defined(_WIN64)
- #define _FX_OS_ _FX_WIN64_DESKTOP_
- #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
+ #define _FX_OS_ _FX_OS_WIN64_
+ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
 -#elif defined(__linux__)
 +#elif defined(__linux__) || defined(__FreeBSD__)
- #define _FX_OS_ _FX_LINUX_DESKTOP_
- #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
+ #define _FX_OS_ _FX_OS_LINUX_
+ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
  #elif defined(__APPLE__)
diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp
new file mode 100644
index 000000000000..c4087e2e631d
--- /dev/null
+++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp
@@ -0,0 +1,14 @@
+--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig	2017-09-10 01:29:26.531645000 +0200
++++ third_party/pdfium/core/fxge/fx_ge_linux.cpp	2017-09-10 01:35:18.727698000 +0200
+@@ -149,9 +149,8 @@
+     const char** pUserPaths) {
+   auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
+   if (!pInfo->ParseFontCfg(pUserPaths)) {
+-    pInfo->AddPath("/usr/share/fonts");
+-    pInfo->AddPath("/usr/share/X11/fonts/Type1");
+-    pInfo->AddPath("/usr/share/X11/fonts/TTF");
++    pInfo->AddPath("/usr/local/share/fonts/Type1");
++    pInfo->AddPath("/usr/local/share/fonts/TTF");
+     pInfo->AddPath("/usr/local/share/fonts");
+   }
+   return std::move(pInfo);
diff --git a/www/iridium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp b/www/iridium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
deleted file mode 100644
index 70a7add9e253..000000000000
--- a/www/iridium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2017-04-19 19:07:50 UTC
-+++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp
-@@ -457,11 +457,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C
- }
- 
- double _getLocalTZA() {
-+  struct tm *lt;
-   if (!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
-     return 0;
-   time_t t = 0;
-   time(&t);
--  localtime(&t);
-+  lt = localtime(&t);
- #if _MSC_VER >= 1900
-   // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
-   // variable declared in time.h. That variable was deprecated and in VS 2015
-@@ -469,7 +470,11 @@ double _getLocalTZA() {
-   long timezone = 0;
-   _get_timezone(&timezone);
- #endif
-+#if defined(__FreeBSD__)
-+  return (double)(-(lt->tm_gmtoff * 1000));
-+#else
-   return (double)(-(timezone * 1000));
-+#endif
- }
- 
- int _getDaylightSavingTA(double d) {
diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp
new file mode 100644
index 000000000000..83a170684d27
--- /dev/null
+++ b/www/iridium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp
@@ -0,0 +1,15 @@
+--- third_party/pdfium/fxjs/JS_Define.cpp.orig	2018-03-04 04:13:13.591977000 +0100
++++ third_party/pdfium/fxjs/JS_Define.cpp	2018-03-04 04:14:44.297142000 +0100
+@@ -30,7 +30,12 @@
+   long timezone = 0;
+   _get_timezone(&timezone);
+ #endif  // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
++#ifdef __FreeBSD__
++  struct tm *lt;
++  return (double)(-(lt->tm_gmtoff * 1000));
++#else
+   return (double)(-(timezone * 1000));
++#endif
+ }
+ 
+ int GetDaylightSavingTA(double d) {
diff --git a/www/iridium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp
index 495f6870a690..5b4f89a585a4 100644
--- a/www/iridium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
+++ b/www/iridium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2017-04-19 19:07:50 UTC
-+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp
-@@ -68,6 +68,103 @@ const FX_WCHAR* const fullmonths[] = {L"
+--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig	2018-03-04 04:22:35.417744000 +0100
++++ third_party/pdfium/fxjs/cjs_publicmethods.cpp	2018-03-04 04:28:41.888908000 +0100
+@@ -70,6 +70,103 @@
                                        L"July",    L"August",   L"September",
                                        L"October", L"November", L"December"};
  
@@ -63,7 +63,7 @@
 +    *decpt = r2;
 +    if (p1 < &buf[0]) {
 +	buf[0] = '\0';
-+	return (buf);
++        return (buf);
 +    }
 +    while (p <= p1 && p < &buf[NDIG]) {
 +	arg *= 10;
@@ -97,10 +97,10 @@
 +static char *
 +     fcvt(double arg, int ndigits, int *decpt, int *sign)
 +{
-+    return (ap_cvt(arg, ndigits, decpt, sign, 0));
++     return (ap_cvt(arg, ndigits, decpt, sign, 0));
 +}
 +#endif // defined(__FreeBSD__)
 +
- CFX_ByteString StrTrim(const CFX_ByteString& pStr) {
-   CFX_ByteString result(pStr);
-   result.TrimLeft(' ');
+ template <typename T>
+ T StrTrim(const T& str) {
+   T result = str;
diff --git a/www/iridium/files/patch-third__party_pdfium_pdfium.gni b/www/iridium/files/patch-third__party_pdfium_pdfium.gni
deleted file mode 100644
index 5501d64f8816..000000000000
--- a/www/iridium/files/patch-third__party_pdfium_pdfium.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/pdfium/pdfium.gni.orig	2017-05-09 19:03:55 UTC
-+++ third_party/pdfium/pdfium.gni
-@@ -9,7 +9,7 @@ import("//build_overrides/pdfium.gni")
- declare_args() {
-   # On Android there's no system FreeType. On Windows and Mac, only a few
-   # methods are used from it.
--  pdfium_bundle_freetype = !is_linux
-+  pdfium_bundle_freetype = false
- 
-   # Build PDFium either with or without v8 support.
-   pdf_enable_v8 = pdf_enable_v8_override
diff --git a/www/iridium/files/patch-third__party_pdfium_skia_BUILD.gn b/www/iridium/files/patch-third__party_pdfium_skia_BUILD.gn
deleted file mode 100644
index 1e14e84e7998..000000000000
--- a/www/iridium/files/patch-third__party_pdfium_skia_BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/pdfium/skia/BUILD.gn.orig	2017-04-19 19:07:50 UTC
-+++ third_party/pdfium/skia/BUILD.gn
-@@ -102,7 +102,7 @@ config("skia_library_config") {
-   }
- 
-   # Settings for text blitting, chosen to approximate the system browser.
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     defines += [
-       "SK_GAMMA_EXPONENT=1.2",
-       "SK_GAMMA_CONTRAST=0.2",
-@@ -280,7 +280,7 @@ component("skia") {
-       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
-     ]
-   }
--  if (!is_linux && !is_android && !is_win && !is_mac) {
-+  if (!is_linux && !is_android && !is_win && !is_mac || !is_bsd) {
-     sources -= [
-       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -309,7 +309,7 @@ component("skia") {
-     "../third_party:fx_zlib",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//third_party/icu:icuuc" ]
-   }
- 
diff --git a/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp b/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp
new file mode 100644
index 000000000000..f88a0a40e727
--- /dev/null
+++ b/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp
@@ -0,0 +1,13 @@
+--- third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp.orig	2017-12-15 02:05:39.000000000 +0100
++++ third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp	2017-12-24 19:04:05.574318000 +0100
+@@ -436,8 +436,8 @@
+ 
+ constexpr const char* g_FontFolders[] = {
+ #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
+-    "/usr/share/fonts", "/usr/share/X11/fonts/Type1",
+-    "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
++    "/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_
diff --git a/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp
new file mode 100644
index 000000000000..2fabf991e3a9
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp
@@ -0,0 +1,19 @@
+--- third_party/skia/src/core/SkCpu.cpp.orig	2018-06-13 00:12:11.000000000 +0200
++++ third_party/skia/src/core/SkCpu.cpp	2018-07-19 20:40:05.469146000 +0200
+@@ -78,6 +78,8 @@
+     #include <sys/auxv.h>
+ 
+     static uint32_t read_cpu_features() {
++return 0;
++#if 0
+         const uint32_t kHWCAP_CRC32   = (1<< 7),
+                        kHWCAP_ASIMDHP = (1<<10);
+ 
+@@ -86,6 +88,7 @@
+         if (hwcaps & kHWCAP_CRC32  ) { features |= SkCpu::CRC32; }
+         if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; }
+         return features;
++#endif
+     }
+ 
+ #elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \
diff --git a/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
new file mode 100644
index 000000000000..af8600ec5449
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
@@ -0,0 +1,41 @@
+--- third_party/skia/src/images/SkJpegEncoder.cpp.orig	2017-12-28 17:28:55.164840000 +0100
++++ third_party/skia/src/images/SkJpegEncoder.cpp	2017-12-28 17:34:22.821694000 +0100
+@@ -86,9 +86,14 @@
+         }
+     };
+ 
++#ifdef JCS_EXTENSIONS
+     J_COLOR_SPACE jpegColorType = JCS_EXT_RGBA;
++#else
++    J_COLOR_SPACE jpegColorType = JCS_RGB;
++#endif
+     int numComponents = 0;
+     switch (srcInfo.colorType()) {
++#ifdef JCS_EXTENSIONS
+         case kRGBA_8888_SkColorType:
+             fProc = chooseProc8888();
+             jpegColorType = JCS_EXT_RGBA;
+@@ -99,6 +104,7 @@
+             jpegColorType = JCS_EXT_BGRA;
+             numComponents = 4;
+             break;
++#endif
+         case kRGB_565_SkColorType:
+             fProc = transform_scanline_565;
+             jpegColorType = JCS_RGB;
+@@ -118,6 +124,7 @@
+             jpegColorType = JCS_GRAYSCALE;
+             numComponents = 1;
+             break;
++#ifdef JCS_EXTENSIONS
+         case kRGBA_F16_SkColorType:
+             if (!srcInfo.colorSpace() || !srcInfo.colorSpace()->gammaIsLinear() ||
+                     SkTransferFunctionBehavior::kRespect != options.fBlendBehavior) {
+@@ -134,6 +141,7 @@
+             jpegColorType = JCS_EXT_RGBA;
+             numComponents = 4;
+             break;
++#endif
+         default:
+             return false;
+     }
diff --git a/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h b/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h
new file mode 100644
index 000000000000..aed5fd0ce6f9
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h
@@ -0,0 +1,20 @@
+--- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig	2018-07-20 03:02:44.498284000 +0200
++++ third_party/skia/src/opts/SkRasterPipeline_opts.h	2018-07-20 03:04:09.892857000 +0200
+@@ -653,7 +653,7 @@
+ }
+ 
+ SI F from_half(U16 h) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !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)
+@@ -673,7 +673,7 @@
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !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)
diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp
new file mode 100644
index 000000000000..ab336e21f600
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp
@@ -0,0 +1,77 @@
+--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2018-07-20 01:19:49.019547000 +0200
++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp	2018-07-20 01:24:40.435966000 +0200
+@@ -99,8 +99,6 @@
+     FreeTypeLibrary()
+         : fGetVarDesignCoordinates(nullptr)
+         , fLibrary(nullptr)
+-        , fIsLCDSupported(false)
+-        , fLCDExtra(0)
+     {
+         if (FT_New_Library(&gFTMemory, &fLibrary)) {
+             return;
+@@ -147,12 +145,7 @@
+         }
+ #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) {
+@@ -161,8 +154,6 @@
+     }
+ 
+     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.
+@@ -173,8 +164,6 @@
+ 
+ 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.
+@@ -660,17 +649,6 @@
+         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();
+-    }
+-
+     SkPaint::Hinting h = rec->getHinting();
+     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
+         // collapse full->normal hinting if we're not doing LCD
+@@ -1063,11 +1041,11 @@
+ void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
+     if (isLCD(fRec)) {
+         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;
+         }
+     }
+ }
diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp
new file mode 100644
index 000000000000..7281e6b2aa59
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp
@@ -0,0 +1,11 @@
+--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig	2017-08-10 02:10:46.427948000 +0200
++++ third_party/skia/src/ports/SkOSFile_stdio.cpp	2017-08-10 02:11:15.515911000 +0200
+@@ -117,7 +117,7 @@
+ 
+ void sk_fsync(FILE* f) {
+ #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
+-        && !defined(_NEWLIB_VERSION)
++        && !defined(_NEWLIB_VERSION) && !defined(__FreeBSD__)
+     int fd = fileno(f);
+     fsync(fd);
+ #endif
diff --git a/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h
new file mode 100644
index 000000000000..c7344a6bb992
--- /dev/null
+++ b/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h
@@ -0,0 +1,11 @@
+--- third_party/skia/src/sksl/SkSLString.h.orig	2017-12-24 19:10:48.599527000 +0100
++++ third_party/skia/src/sksl/SkSLString.h	2017-12-24 19:11:12.662001000 +0100
+@@ -22,6 +22,8 @@
+     #include "SkString.h"
+ #endif
+ 
++#include <stdarg.h>
++
+ namespace SkSL {
+ 
+ // Represents a (not necessarily null-terminated) slice of a string.
diff --git a/www/iridium/files/patch-third__party_sqlite_BUILD.gn b/www/iridium/files/patch-third__party_sqlite_BUILD.gn
index ca83cf293643..5890a421beda 100644
--- a/www/iridium/files/patch-third__party_sqlite_BUILD.gn
+++ b/www/iridium/files/patch-third__party_sqlite_BUILD.gn
@@ -1,47 +1,29 @@
---- third_party/sqlite/BUILD.gn.orig	2017-04-19 19:06:52 UTC
-+++ third_party/sqlite/BUILD.gn
-@@ -22,7 +22,7 @@ if (!use_system_sqlite) {
-       # sqlite3Fts3InitTok).
-       cflags += [ "-Wno-unused-function" ]
-     }
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       cflags += [
-         # SQLite doesn"t believe in compiler warnings,
-         # preferring testing.
-@@ -150,7 +150,7 @@ if (!use_system_sqlite) {
-       ":sqlite_warnings",
-     ]
- 
--    if (is_linux) {
-+    if (is_linux && !is_bsd) {
-       libs = [ "dl" ]
-     } else if (is_mac || is_ios) {
-       libs = [
-@@ -187,7 +187,7 @@ if (!use_system_sqlite) {
-     public_configs = [ ":sqlite_export" ]
+--- third_party/sqlite/BUILD.gn.orig	2018-06-13 00:11:05.000000000 +0200
++++ third_party/sqlite/BUILD.gn	2018-07-19 20:59:10.723249000 +0200
+@@ -155,7 +155,7 @@
+     # sqlite3Fts3InitTok).
+     cflags += [ "-Wno-unused-function" ]
    }
- 
 -  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     executable("sqlite_shell") {
-       # So shell.c can find the correct sqlite3.h.
-       include_dirs = [ "amalgamation" ]
-@@ -216,7 +216,7 @@ if (use_system_sqlite) {
- 
-   config("sqlite_config") {
-     defines = [ "USE_SYSTEM_SQLITE" ]
--    if (is_ios) {
-+    if (is_ios || is_bsd) {
-       libs = [ "sqlite3" ]
-     } else {
-       assert(false, "extra flags to use system sqlite3 library missing")
-@@ -235,7 +235,7 @@ if (use_system_sqlite) {
++  if (is_linux && !is_bsd) {
+     cflags += [
+       # SQLite doesn"t believe in compiler warnings,
+       # preferring testing.
+@@ -208,7 +208,7 @@
      }
    }
  
--  if (is_ios) {
-+  if (is_ios || is_bsd) {
-     source_set("sqlite_recover") {
-       sources = [
-         # TODO(shess): Move out of the SQLite source tree, perhaps to ext/.
+-  if (is_linux || is_android) {
++  if ((is_linux && !is_bsd) || is_android) {
+     defines += [
+       # Linux provides fdatasync(), a faster equivalent of fsync().
+       "fdatasync=fdatasync",
+@@ -243,7 +243,7 @@
+     ":sqlite_warnings",
+   ]
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     libs = [ "dl" ]
+   } else if (is_mac || is_ios) {
+     libs = [ "CoreFoundation.framework" ]
diff --git a/www/iridium/files/patch-third__party_swiftshader_BUILD.gn b/www/iridium/files/patch-third__party_swiftshader_BUILD.gn
new file mode 100644
index 000000000000..3d3fcc58a22c
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_BUILD.gn
@@ -0,0 +1,10 @@
+--- third_party/swiftshader/BUILD.gn.orig	2017-06-26 22:05:22.958335000 +0200
++++ third_party/swiftshader/BUILD.gn	2017-06-26 22:05:34.834212000 +0200
+@@ -85,7 +85,6 @@
+ 
+     if (is_linux) {
+       ldflags = [
+-        "-Wl,--hash-style=both",
+         "-Wl,--gc-sections",
+       ]
+     }
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
new file mode 100644
index 000000000000..7f3cdbba69c8
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
@@ -0,0 +1,12 @@
+--- third_party/swiftshader/src/Common/Configurator.cpp.orig	2018-07-19 21:20:56.462917000 +0200
++++ third_party/swiftshader/src/Common/Configurator.cpp	2018-07-19 21:23:09.940292000 +0200
+@@ -42,6 +42,9 @@
+ 
+ 	bool Configurator::readFile()
+ 	{
++#if defined(__FreeBSD__)
++                return false;
++#endif      
+ 		#if defined(__unix__)
+ 			if(access(path.c_str(), R_OK) != 0)
+ 			{
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
new file mode 100644
index 000000000000..59e590f9ac26
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/Common/MutexLock.hpp.orig	2017-06-26 22:06:54.283201000 +0200
++++ third_party/swiftshader/src/Common/MutexLock.hpp	2017-06-26 22:07:18.656810000 +0200
+@@ -17,7 +17,7 @@
+ 
+ #include "Thread.hpp"
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__FreeBSD__)
+ // Use a pthread mutex on Linux. Since many processes may use SwiftShader
+ // at the same time it's best to just have the scheduler overhead.
+ #include <pthread.h>
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
new file mode 100644
index 000000000000..361633849208
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig	2017-06-26 22:08:50.265243000 +0200
++++ third_party/swiftshader/src/Common/SharedLibrary.hpp	2017-06-26 22:10:22.637465000 +0200
+@@ -92,7 +92,7 @@
+ 
+ 	inline void *getLibraryHandle(const char *path)
+ 	{
+-		#ifdef __ANDROID__
++		#if defined( __ANDROID__) || defined(__FreeBSD__)
+ 			// bionic doesn't support RTLD_NOLOAD before L
+ 			return dlopen(path, RTLD_NOW | RTLD_LOCAL);
+ 		#else
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
new file mode 100644
index 000000000000..efddc0e2168c
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
@@ -0,0 +1,14 @@
+--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig	2018-07-19 21:23:23.845651000 +0200
++++ third_party/swiftshader/src/Main/SwiftConfig.cpp	2018-07-19 21:24:08.531304000 +0200
+@@ -762,7 +762,11 @@
+ 		struct stat status;
+ 		int lastModified = ini.getInteger("LastModified", "Time", 0);
+ 
++#if !defined(__FreeBSD__)
+ 		bool noConfig = stat("SwiftShader.ini", &status) != 0;
++#else
++                bool noConfig = false;
++#endif
+ 		newConfig = !noConfig && abs((int)status.st_mtime - lastModified) > 1;
+ 
+ 		if(disableServerOverride)
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
new file mode 100644
index 000000000000..9fd97b77dd46
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
@@ -0,0 +1,47 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig	2017-06-26 22:14:07.363371000 +0200
++++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp	2017-06-26 22:15:57.992270000 +0200
+@@ -30,7 +30,7 @@
+ #include <sys/ioctl.h>
+ #include <linux/fb.h>
+ #include <fcntl.h>
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #include "Main/libX11.hpp"
+ #elif defined(__APPLE__)
+ #include "OSXUtils.hpp"
+@@ -53,7 +53,7 @@
+ 
+ 	static void *nativeDisplay = nullptr;
+ 
+-	#if defined(__linux__) && !defined(__ANDROID__)
++	#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 		// Even if the application provides a native display handle, we open (and close) our own connection
+ 		if(!nativeDisplay && dpy != HEADLESS_DISPLAY && libX11 && libX11->XOpenDisplay)
+ 		{
+@@ -76,7 +76,7 @@
+ {
+ 	terminate();
+ 
+-	#if defined(__linux__) && !defined(__ANDROID__)
++	#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 		if(nativeDisplay && libX11->XCloseDisplay)
+ 		{
+ 			libX11->XCloseDisplay((::Display*)nativeDisplay);
+@@ -550,7 +550,7 @@
+ 			return false;
+ 		}
+ 		return true;
+-	#elif defined(__linux__)
++	#elif defined(__linux__) || defined(__FreeBSD__)
+ 		if(nativeDisplay)
+ 		{
+ 			XWindowAttributes windowAttributes;
+@@ -707,7 +707,7 @@
+ 
+ 		// No framebuffer device found, or we're in user space
+ 		return sw::FORMAT_X8B8G8R8;
+-	#elif defined(__linux__)
++	#elif defined(__linux__) || defined(__FreeBSD__)
+ 		if(nativeDisplay)
+ 		{
+ 			Screen *screen = libX11->XDefaultScreenOfDisplay((::Display*)nativeDisplay);
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
new file mode 100644
index 000000000000..7f7cdb0fa8f2
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
@@ -0,0 +1,20 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig	2017-09-07 00:06:19.888841000 +0200
++++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp	2017-09-07 00:08:19.628679000 +0200
+@@ -26,7 +26,7 @@
+ #include "common/debug.h"
+ #include "Main/FrameBuffer.hpp"
+ 
+-#if defined(__linux__) && !defined(__ANDROID__)
++#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ #include "Main/libX11.hpp"
+ #elif defined(_WIN32)
+ #include <tchar.h>
+@@ -287,7 +287,7 @@
+ 	#elif defined(__ANDROID__)
+ 		int windowWidth;  window->query(window, NATIVE_WINDOW_WIDTH, &windowWidth);
+ 		int windowHeight; window->query(window, NATIVE_WINDOW_HEIGHT, &windowHeight);
+-	#elif defined(__linux__)
++	#elif defined(__linux__) || defined(__FreeBSD__)
+ 		XWindowAttributes windowAttributes;
+ 		libX11->XGetWindowAttributes((::Display*)display->getNativeDisplay(), window, &windowAttributes);
+ 
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
new file mode 100644
index 000000000000..393960dc1f60
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
@@ -0,0 +1,47 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig	2018-03-20 23:06:53.000000000 +0100
++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp	2018-03-24 18:42:49.216641000 +0100
+@@ -25,7 +25,7 @@
+ 
+ #if defined(__ANDROID__)
+ #include <system/window.h>
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #include "Main/libX11.hpp"
+ #endif
+ 
+@@ -119,7 +119,7 @@
+ 		// FIXME: Check if display_id is the default display
+ 	}
+ 
+-	#if defined(__linux__) && !defined(__ANDROID__)
++	#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 		if(!libX11)
+ 		{
+ 			return success(HEADLESS_DISPLAY);
+@@ -176,7 +176,7 @@
+ 	{
+ 		return success(
+ 			"EGL_KHR_client_get_all_proc_addresses "
+-#if defined(__linux__) && !defined(__ANDROID__)
++#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 			"EGL_KHR_platform_gbm "
+ 			"EGL_KHR_platform_x11 "
+ #endif
+@@ -944,7 +944,7 @@
+ 
+ 	if(context)
+ 	{
+-		#if defined(__linux__) && !defined(__ANDROID__)
++		#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 			egl::Display *display = context->getDisplay();
+ 
+ 			if(!display)
+@@ -1110,7 +1110,7 @@
+ {
+ 	TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list);
+ 
+-	#if defined(__linux__) && !defined(__ANDROID__)
++	#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+ 		switch(platform)
+ 		{
+ 		case EGL_PLATFORM_X11_EXT: break;
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
new file mode 100644
index 000000000000..e486741b0e40
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig	2017-06-26 22:22:21.418803000 +0200
++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp	2017-06-26 22:22:37.089147000 +0200
+@@ -106,7 +106,7 @@
+ 				#else
+ 					const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"};
+ 				#endif
+-			#elif defined(__linux__)
++			#elif defined(__linux__) || defined(__FreeBSD__)
+ 				#if defined(__LP64__)
+ 					const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
+ 				#else
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp
new file mode 100644
index 000000000000..977c5641f2d2
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig	2017-06-26 22:23:31.609734000 +0200
++++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp	2017-06-26 22:23:56.904096000 +0200
+@@ -267,7 +267,7 @@
+ 				#else
+ 					const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"};
+ 				#endif
+-			#elif defined(__linux__)
++			#elif defined(__linux__) || defined(__FreeBSD__)
+ 				#if defined(__LP64__)
+ 					const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
+ 				#else
diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
new file mode 100644
index 000000000000..157eebf3aa06
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig	2017-06-26 22:26:03.983772000 +0200
++++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp	2017-06-26 22:26:31.197604000 +0200
+@@ -290,7 +290,7 @@
+ 				#else
+ 					const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so"};
+ 				#endif
+-			#elif defined(__linux__)
++			#elif defined(__linux__) || defined(__FreeBSD__)
+ 				#if defined(__LP64__)
+ 					const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
+ 				#else
diff --git a/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h
new file mode 100644
index 000000000000..5d2ea390314f
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h
@@ -0,0 +1,29 @@
+--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig	2017-06-26 22:28:18.140795000 +0200
++++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h	2017-06-26 22:30:40.465311000 +0200
+@@ -121,7 +121,7 @@
+ #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 */
+@@ -130,7 +130,7 @@
+ /* #undef HAVE_MALLCTL */
+ 
+ /* 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
+@@ -154,7 +154,7 @@
+ /* #undef HAVE_NDIR_H */
+ 
+ /* Define to 1 if you have the `posix_fallocate' function. */
+-#define HAVE_POSIX_FALLOCATE 1
++/* #undef HAVE_POSIX_FALLOCATE */
+ 
+ /* Define to 1 if you have the `posix_spawn' function. */
+ #define HAVE_POSIX_SPAWN 1
diff --git a/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc b/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc
new file mode 100644
index 000000000000..c0bdc586f31b
--- /dev/null
+++ b/www/iridium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig	2017-12-30 20:23:57.746690000 +0100
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc	2017-12-30 20:25:19.279850000 +0100
+@@ -35,7 +35,7 @@
+ // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
+ // <stdlib.h> instead. Unix.h includes this for us already.
+ #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \
+-    !defined(__OpenBSD__) && !defined(__Bitrig__)
++    !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__Bitrig__)
+ #include <malloc.h>
+ #endif
+ #if defined(HAVE_MALLCTL)
diff --git a/www/iridium/files/patch-third__party_usrsctp_BUILD.gn b/www/iridium/files/patch-third__party_usrsctp_BUILD.gn
index 813dff51f54b..d4d49ded4c00 100644
--- a/www/iridium/files/patch-third__party_usrsctp_BUILD.gn
+++ b/www/iridium/files/patch-third__party_usrsctp_BUILD.gn
@@ -1,11 +1,16 @@
---- third_party/usrsctp/BUILD.gn.orig	2017-04-19 19:06:53 UTC
-+++ third_party/usrsctp/BUILD.gn
-@@ -112,6 +112,12 @@ static_library("usrsctp") {
+--- third_party/usrsctp/BUILD.gn.orig	2017-12-15 02:04:50.000000000 +0100
++++ third_party/usrsctp/BUILD.gn	2018-01-03 13:28:10.295173000 +0100
+@@ -109,11 +109,16 @@
+     "-UINET6",
+   ]
+ 
+-  if (is_linux || is_android) {
++  if ((is_linux && !is_bsd) || is_android ) {
+     defines += [
        "__Userspace_os_Linux",
        "_GNU_SOURCE",
      ]
 +  } else if (is_bsd) {
-+    # For now, freebsd hard coding, differentiate different bsd is a plan
 +    defines += [
 +      "__Userspace_os_FreeBSD",
 +    ]
diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn
index f6ec0e7531fe..8fb6fad4ac4a 100644
--- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,11 +1,11 @@
---- third_party/webrtc/BUILD.gn.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/BUILD.gn
-@@ -59,6 +59,9 @@ config("common_inherited_config") {
+--- third_party/webrtc/BUILD.gn.orig	2017-12-15 02:05:39.000000000 +0100
++++ third_party/webrtc/BUILD.gn	2017-12-24 19:21:52.441317000 +0100
+@@ -80,6 +80,9 @@
    if (is_linux) {
      defines += [ "WEBRTC_LINUX" ]
    }
 +  if (is_bsd) {
-+    defines += [ "WEBRTC_LINUX", "WEBRTC_BSD", "WEBRTC_THREAD_RR" ]
++    defines += [ "WEBRTC_BSD" ]
 +  }
    if (is_mac) {
      defines += [ "WEBRTC_MAC" ]
diff --git a/www/iridium/files/patch-third__party_webrtc_base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_base_BUILD.gn
deleted file mode 100644
index 3af4a959006c..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_base_BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
---- third_party/webrtc/base/BUILD.gn.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/BUILD.gn
-@@ -566,7 +566,6 @@ rtc_static_library("rtc_base") {
- 
-   if (use_x11) {
-     libs += [
--      "dl",
-       "rt",
-       "Xext",
-       "X11",
-@@ -577,7 +576,6 @@ rtc_static_library("rtc_base") {
- 
-   if (is_linux) {
-     libs += [
--      "dl",
-       "rt",
-     ]
-   }
diff --git a/www/iridium/files/patch-third__party_webrtc_base_ifaddrs__converter.h b/www/iridium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
deleted file mode 100644
index 7328dd9721e2..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/webrtc/base/ifaddrs_converter.h.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/ifaddrs_converter.h
-@@ -14,6 +14,8 @@
- #if defined(WEBRTC_ANDROID)
- #include "webrtc/base/ifaddrs-android.h"
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
- #endif  // WEBRTC_ANDROID
- 
diff --git a/www/iridium/files/patch-third__party_webrtc_base_network.h b/www/iridium/files/patch-third__party_webrtc_base_network.h
deleted file mode 100644
index 48246d7e249a..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_base_network.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/webrtc/base/network.h.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/network.h
-@@ -24,6 +24,10 @@
- #include "webrtc/base/messagehandler.h"
- #include "webrtc/base/sigslot.h"
- 
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#endif
-+
- #if defined(WEBRTC_POSIX)
- struct ifaddrs;
- #endif  // defined(WEBRTC_POSIX)
diff --git a/www/iridium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/iridium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
deleted file mode 100644
index a0fd729a45a7..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- third_party/webrtc/base/physicalsocketserver.cc.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/physicalsocketserver.cc
-@@ -61,7 +61,11 @@ typedef void* SockOptArg;
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
-+#if defined(WEBRTC_BSD)
-+  int ret = ioctl(socket, SO_TIMESTAMP, &tv_ioctl);
-+#else
-   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
-+#endif
-   if (ret != 0)
-     return -1;
-   int64_t timestamp =
-@@ -302,7 +306,7 @@ int PhysicalSocket::GetOption(Option opt
-   socklen_t optlen = sizeof(*value);
-   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
-   if (ret != -1 && opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
- #endif
-   }
-@@ -315,7 +319,7 @@ int PhysicalSocket::SetOption(Option opt
-   if (TranslateOption(opt, &slevel, &sopt) == -1)
-     return -1;
-   if (opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
- #endif
-   }
-@@ -597,10 +601,10 @@ int PhysicalSocket::TranslateOption(Opti
-       *slevel = IPPROTO_IP;
-       *sopt = IP_DONTFRAGMENT;
-       break;
--#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
-+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__)
-       LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
-       return -1;
--#elif defined(WEBRTC_POSIX)
-+#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD)
-       *slevel = IPPROTO_IP;
-       *sopt = IP_MTU_DISCOVER;
-       break;
diff --git a/www/iridium/files/patch-third__party_webrtc_base_platform__thread.cc b/www/iridium/files/patch-third__party_webrtc_base_platform__thread.cc
deleted file mode 100644
index bd2394f3265a..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_base_platform__thread.cc
+++ /dev/null
@@ -1,42 +0,0 @@
---- third_party/webrtc/base/platform_thread.cc.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/platform_thread.cc
-@@ -13,11 +13,18 @@
- #include "webrtc/base/atomicops.h"
- #include "webrtc/base/checks.h"
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
- #include <sys/prctl.h>
- #include <sys/syscall.h>
- #endif
- 
-+#if defined(WEBRTC_BSD)
-+#include <pthread.h>
-+#include <pthread_np.h>
-+#include <sys/syscall.h>
-+#include <sys/thr.h>
-+#endif
-+
- namespace rtc {
- 
- PlatformThreadId CurrentThreadId() {
-@@ -27,6 +34,8 @@ PlatformThreadId CurrentThreadId() {
- #elif defined(WEBRTC_POSIX)
- #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   ret = pthread_mach_thread_np(pthread_self());
-+#elif defined(WEBRTC_BSD)
-+  ret = reinterpret_cast<int>(pthread_getthreadid_np());
- #elif defined(WEBRTC_LINUX)
-   ret =  syscall(__NR_gettid);
- #elif defined(WEBRTC_ANDROID)
-@@ -70,7 +79,9 @@ void SetCurrentThreadName(const char* na
-                      reinterpret_cast<ULONG_PTR*>(&threadname_info));
-   } __except (EXCEPTION_EXECUTE_HANDLER) {
-   }
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#elif defined(WEBRTC_BSD)
-+  pthread_set_name_np(pthread_self(), name);
-+#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
-   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   pthread_setname_np(name);
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index a5294906b586..05758efac66b 100644
--- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,20 +1,11 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -82,7 +82,7 @@ rtc_static_library("audio_device") {
-   ]
- 
-   include_dirs = []
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     include_dirs += [ "linux" ]
-   }
-   if (is_ios) {
-@@ -130,7 +130,7 @@ rtc_static_library("audio_device") {
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2017-12-15 02:05:40.000000000 +0100
++++ third_party/webrtc/modules/audio_device/BUILD.gn	2017-12-30 03:44:43.126008000 +0100
+@@ -177,7 +177,7 @@
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
 -      if (is_linux) {
-+      if (is_linux || is_bsd) {
++      if (is_linux && !is_bsd) {
          sources += [
            "linux/alsasymboltable_linux.cc",
            "linux/alsasymboltable_linux.h",
diff --git a/www/iridium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
deleted file mode 100644
index 787581703a72..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2017-04-19 19:07:53 UTC
-+++ third_party/webrtc/modules/video_coding/BUILD.gn
-@@ -154,12 +154,7 @@ rtc_static_library("webrtc_h264") {
-   }
- 
-   defines = []
--  deps = [
--    ":video_coding_utility",
--    "../../base:rtc_base_approved",
--    "../../media:rtc_media_base",
--    "../../system_wrappers",
--  ]
-+  deps = []  
- 
-   if (rtc_use_h264) {
-     defines += [ "WEBRTC_USE_H264" ]
-@@ -173,10 +168,10 @@ rtc_static_library("webrtc_h264") {
-       "codecs/h264/h264_encoder_impl.h",
-     ]
-     deps += [
--      "../../common_video",
--      "../../media:rtc_media_base",
-       "//third_party/ffmpeg:ffmpeg",
-       "//third_party/openh264:encoder",
-+      "../../common_video",
-+      "../../media:rtc_media_base",
-     ]
-   }
- }
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_rtc_base_BUILD.gn
new file mode 100644
index 000000000000..f97dacf0dbdc
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_BUILD.gn
@@ -0,0 +1,20 @@
+--- third_party/webrtc/rtc_base/BUILD.gn.orig	2017-12-15 02:05:40.000000000 +0100
++++ third_party/webrtc/rtc_base/BUILD.gn	2017-12-24 19:35:21.721858000 +0100
+@@ -649,8 +649,6 @@
+ 
+   if (use_x11) {
+     libs += [
+-      "dl",
+-      "rt",
+       "Xext",
+       "X11",
+       "Xcomposite",
+@@ -658,7 +656,7 @@
+     ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     libs += [
+       "dl",
+       "rt",
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_byteorder.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_byteorder.h
new file mode 100644
index 000000000000..55f2a06cba43
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_byteorder.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/byteorder.h.orig	2017-09-07 00:29:50.482044000 +0200
++++ third_party/webrtc/rtc_base/byteorder.h	2017-09-07 00:30:15.190287000 +0200
+@@ -77,7 +77,7 @@
+ #error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined.
+ #endif  // defined(RTC_ARCH_CPU_LITTLE_ENDIAN)
+ #elif defined(WEBRTC_POSIX)
+-#include <endian.h>
++#include <sys/endian.h>
+ #endif
+ 
+ namespace rtc {
diff --git a/www/iridium/files/patch-third__party_webrtc_base_httpcommon.cc b/www/iridium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc
index 3db8b5ed937c..0f60a4c95a79 100644
--- a/www/iridium/files/patch-third__party_webrtc_base_httpcommon.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/base/httpcommon.cc.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/httpcommon.cc
-@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string
+--- third_party/webrtc/rtc_base/httpcommon.cc.orig	2017-09-07 00:39:17.532376000 +0200
++++ third_party/webrtc/rtc_base/httpcommon.cc	2017-09-07 00:41:55.817287000 +0200
+@@ -384,7 +384,7 @@
      gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
    }
    // TODO: Android should support timezone, see b/2441195
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h
new file mode 100644
index 000000000000..ac0646ebd20e
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig	2017-09-07 00:50:44.713781000 +0200
++++ third_party/webrtc/rtc_base/ifaddrs_converter.h	2017-09-07 00:51:25.775459000 +0200
+@@ -14,6 +14,8 @@
+ #if defined(WEBRTC_ANDROID)
+ #include "webrtc/rtc_base/ifaddrs-android.h"
+ #else
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
+ #endif  // WEBRTC_ANDROID
+ 
diff --git a/www/iridium/files/patch-third__party_webrtc_base_ipaddress.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_ipaddress.h
index 58a6c4b13491..c9fda9dcddee 100644
--- a/www/iridium/files/patch-third__party_webrtc_base_ipaddress.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_ipaddress.h
@@ -1,5 +1,5 @@
---- third_party/webrtc/base/ipaddress.h.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/ipaddress.h
+--- third_party/webrtc/rtc_base/ipaddress.h.orig	2017-09-07 00:55:47.412632000 +0200
++++ third_party/webrtc/rtc_base/ipaddress.h	2017-09-07 00:59:49.903165000 +0200
 @@ -17,6 +17,10 @@
  #include <arpa/inet.h>
  #include <netdb.h>
diff --git a/www/iridium/files/patch-third__party_webrtc_base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc_base_network.cc
index d98bbc965c84..cb07ce15e4e3 100644
--- a/www/iridium/files/patch-third__party_webrtc_base_network.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_network.cc
@@ -1,5 +1,5 @@
---- third_party/webrtc/base/network.cc.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/network.cc
+--- third_party/webrtc/rtc_base/network.cc.orig	2017-09-07 00:56:00.388312000 +0200
++++ third_party/webrtc/rtc_base/network.cc	2017-09-07 01:03:02.971562000 +0200
 @@ -14,7 +14,7 @@
  // linux/if.h can't be included at the same time as the posix sys/if.h, and
  // it's transitively required by linux/route.h, so include that version on
@@ -9,7 +9,7 @@
  #include <linux/if.h>
  #include <linux/route.h>
  #elif !defined(__native_client__)
-@@ -658,7 +658,7 @@ bool BasicNetworkManager::CreateNetworks
+@@ -658,7 +658,7 @@
  }
  #endif  // WEBRTC_WIN
  
@@ -18,7 +18,7 @@
  bool IsDefaultRoute(const std::string& network_name) {
    FileStream fs;
    if (!fs.Open("/proc/net/route", "r", nullptr)) {
-@@ -701,7 +701,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
+@@ -701,7 +701,7 @@
        strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
      return true;
    }
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_network.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_network.h
new file mode 100644
index 000000000000..d2b4a2f364d7
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_network.h
@@ -0,0 +1,13 @@
+--- third_party/webrtc/rtc_base/network.h.orig	2017-09-07 00:56:08.460370000 +0200
++++ third_party/webrtc/rtc_base/network.h	2017-09-07 01:05:58.608460000 +0200
+@@ -24,6 +24,10 @@
+ #include "webrtc/rtc_base/networkmonitor.h"
+ #include "webrtc/rtc_base/sigslot.h"
+ 
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(WEBRTC_POSIX)
+ struct ifaddrs;
+ #endif  // defined(WEBRTC_POSIX)
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc b/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc
new file mode 100644
index 000000000000..b50aeecd72de
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc
@@ -0,0 +1,47 @@
+--- third_party/webrtc/rtc_base/physicalsocketserver.cc.orig	2018-02-24 16:26:17.000000000 +0100
++++ third_party/webrtc/rtc_base/physicalsocketserver.cc	2018-03-04 04:38:51.589837000 +0100
+@@ -60,7 +60,7 @@
+ 
+ #endif  // WEBRTC_POSIX
+ 
+-#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
++#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
+ 
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+@@ -317,7 +317,7 @@
+   socklen_t optlen = sizeof(*value);
+   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
+   if (ret != -1 && opt == OPT_DONTFRAGMENT) {
+-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
+     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
+ #endif
+   }
+@@ -330,7 +330,7 @@
+   if (TranslateOption(opt, &slevel, &sopt) == -1)
+     return -1;
+   if (opt == OPT_DONTFRAGMENT) {
+-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
+     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
+ #endif
+   }
+@@ -340,7 +340,7 @@
+ int PhysicalSocket::Send(const void* pv, size_t cb) {
+   int sent = DoSend(s_, reinterpret_cast<const char *>(pv),
+       static_cast<int>(cb),
+-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
+       // 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
+@@ -560,7 +560,7 @@
+       *slevel = IPPROTO_IP;
+       *sopt = IP_DONTFRAGMENT;
+       break;
+-#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__)
+       RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
+       return -1;
+ #elif defined(WEBRTC_POSIX)
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h
new file mode 100644
index 000000000000..835628075a40
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/physicalsocketserver.h.orig	2017-09-07 05:58:03.996342000 +0200
++++ third_party/webrtc/rtc_base/physicalsocketserver.h	2017-09-07 05:58:28.882396000 +0200
+@@ -11,7 +11,7 @@
+ #ifndef WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_
+ #define WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_
+ 
+-#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
++#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ #include <sys/epoll.h>
+ #define WEBRTC_USE_EPOLL 1
+ #endif
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc b/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc
new file mode 100644
index 000000000000..a355353f01bb
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread.cc
@@ -0,0 +1,12 @@
+--- third_party/webrtc/rtc_base/platform_thread.cc.orig	2018-06-13 00:12:10.000000000 +0200
++++ third_party/webrtc/rtc_base/platform_thread.cc	2018-07-19 21:16:37.263549000 +0200
+@@ -15,7 +15,9 @@
+ #include "rtc_base/timeutils.h"
+ 
+ #if defined(WEBRTC_LINUX)
++#if !defined(__FreeBSD__)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/syscall.h>
+ #endif
+ 
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc b/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc
new file mode 100644
index 000000000000..8ec4c7636343
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc
@@ -0,0 +1,40 @@
+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig	2018-07-19 22:28:12.880328000 +0200
++++ third_party/webrtc/rtc_base/platform_thread_types.cc	2018-07-19 22:30:17.907866000 +0200
+@@ -11,7 +11,9 @@
+ #include "rtc_base/platform_thread_types.h"
+ 
+ #if defined(WEBRTC_LINUX)
++#if !defined(__FreeBSD__)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/syscall.h>
+ #endif
+ 
+@@ -27,8 +29,10 @@
+   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 @@
+ }
+ 
+ void SetCurrentThreadName(const char* name) {
++#if !defined(__FreeBSD__)
+ #if defined(WEBRTC_WIN)
+   struct {
+     DWORD dwType;
+@@ -72,6 +77,7 @@
+   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   pthread_setname_np(name);
++#endif
+ #endif
+ }
+ 
diff --git a/www/iridium/files/patch-third__party_webrtc_base_stringutils.h b/www/iridium/files/patch-third__party_webrtc_rtc_base_stringutils.h
index ee8623a11003..debbb1865be5 100644
--- a/www/iridium/files/patch-third__party_webrtc_base_stringutils.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc_base_stringutils.h
@@ -1,7 +1,7 @@
---- third_party/webrtc/base/stringutils.h.orig	2017-04-19 19:07:52 UTC
-+++ third_party/webrtc/base/stringutils.h
+--- third_party/webrtc/rtc_base/stringutils.h.orig	2017-09-07 00:56:34.723687000 +0200
++++ third_party/webrtc/rtc_base/stringutils.h	2017-09-07 01:34:35.259034000 +0200
 @@ -23,11 +23,11 @@
- #endif  // WEBRTC_WIN 
+ #endif  // WEBRTC_WIN
  
  #if defined(WEBRTC_POSIX)
 -#ifdef BSD
diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 2efac34c7c42..b8f49e406ff0 100644
--- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,20 +1,11 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2017-04-19 19:07:53 UTC
-+++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -87,7 +87,7 @@ rtc_static_library("system_wrappers") {
-     libs += [ "log" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     defines += [ "WEBRTC_THREAD_RR" ]
- 
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2017-12-15 02:05:40.000000000 +0100
++++ third_party/webrtc/system_wrappers/BUILD.gn	2017-12-24 19:38:19.942270000 +0100
+@@ -72,8 +72,6 @@
      if (!build_with_chromium) {
-@@ -97,7 +97,7 @@ rtc_static_library("system_wrappers") {
-     libs += [ "rt" ]
-   }
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_android || is_bsd) {
-     sources += [ "source/atomic32_non_darwin_unix.cc" ]
+       deps += [ ":cpu_features_linux" ]
+     }
+-
+-    libs += [ "rt" ]
    }
  
+   if (is_linux || is_android) {
diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc b/www/iridium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc
deleted file mode 100644
index 7a5081134694..000000000000
--- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc.orig	2017-04-19 19:07:53 UTC
-+++ third_party/webrtc/system_wrappers/source/atomic32_non_darwin_unix.cc
-@@ -12,7 +12,7 @@
- 
- #include <assert.h>
- #include <inttypes.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "webrtc/common_types.h"
- 
diff --git a/www/iridium/files/patch-third__party_webrtc_webrtc.gni b/www/iridium/files/patch-third__party_webrtc_webrtc.gni
new file mode 100644
index 000000000000..0369772412e8
--- /dev/null
+++ b/www/iridium/files/patch-third__party_webrtc_webrtc.gni
@@ -0,0 +1,11 @@
+--- third_party/webrtc/webrtc.gni.orig	2018-03-20 23:06:54.000000000 +0100
++++ third_party/webrtc/webrtc.gni	2018-03-24 18:56:59.262948000 +0100
+@@ -206,7 +206,7 @@
+ rtc_opus_dir = "//third_party/opus"
+ 
+ # Desktop capturer is supported only on Windows, OSX and Linux.
+-rtc_desktop_capture_supported = is_win || is_mac || (is_linux && rtc_use_x11)
++rtc_desktop_capture_supported = is_win || is_mac || ((is_linux && rtc_use_x11) && !is_bsd)
+ 
+ ###############################################################################
+ # Templates
diff --git a/www/iridium/files/patch-third__party_widevine_cdm_BUILD.gn b/www/iridium/files/patch-third__party_widevine_cdm_BUILD.gn
deleted file mode 100644
index 3bd5319abd02..000000000000
--- a/www/iridium/files/patch-third__party_widevine_cdm_BUILD.gn
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/widevine/cdm/BUILD.gn.orig	2017-04-19 19:06:53 UTC
-+++ third_party/widevine/cdm/BUILD.gn
-@@ -26,7 +26,7 @@ if (is_android) {
-     widevine_cdm_version_h_file =
-         "chromeos/$widevine_arch/widevine_cdm_version.h"
-     widevine_cdm_binary_files = [ "chromeos/$widevine_arch/libwidevinecdm.so" ]
--  } else if (is_linux) {
-+  } else if (is_linux || is_bsd) {
-     widevine_cdm_version_h_file = "linux/$widevine_arch/widevine_cdm_version.h"
-     widevine_cdm_binary_files = [ "linux/$widevine_arch/libwidevinecdm.so" ]
-   } else if (is_win) {
-@@ -165,7 +165,7 @@ if ((is_chrome_branded || enable_widevin
-       ":widevinecdm",
-     ]
- 
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       ldflags =
-           [ rebase_path("$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
-                         root_build_dir) ]
-@@ -188,7 +188,7 @@ if ((is_chrome_branded || enable_widevin
- # This target exists for tests to depend on that pulls in a runtime dependency
- # on the license server.
- source_set("widevine_test_license_server") {
--  if (is_chrome_branded && is_linux) {
-+  if (is_chrome_branded && is_linux || is_bsd) {
-     deps = [
-       # TODO(jrummell)
-       # This target should be removed and targets should have data_deps on this target:
diff --git a/www/iridium/files/patch-third__party_yasm_BUILD.gn b/www/iridium/files/patch-third__party_yasm_BUILD.gn
index 11a2eabd708f..4a4b810d4b41 100644
--- a/www/iridium/files/patch-third__party_yasm_BUILD.gn
+++ b/www/iridium/files/patch-third__party_yasm_BUILD.gn
@@ -1,11 +1,11 @@
---- third_party/yasm/BUILD.gn.orig	2017-04-19 19:06:53 UTC
-+++ third_party/yasm/BUILD.gn
-@@ -32,7 +32,12 @@ import("//build/config/compiler/compiler
- if (current_toolchain == host_toolchain) {
-   # Various files referenced by multiple targets.
-   yasm_gen_include_dir = "$target_gen_dir/include"
--  config_makefile = "source/config/$host_os/Makefile"
-+  # HACK for All BSD derivatives use openbsd include directory
+--- third_party/yasm/BUILD.gn.orig	2017-12-15 02:04:50.000000000 +0100
++++ third_party/yasm/BUILD.gn	2017-12-24 19:31:25.638531000 +0100
+@@ -60,7 +60,12 @@
+   # x86insn_nasm.c. These files were previously generated during the build but
+   # are now shipped pre-generated by yasm.
+   yasm_gen_include_dir = "$target_gen_dir/gen_include"
+-  config_makefile = "source/config/Makefile"
++  # Hack for all BSD derivatives use OpenBSD include directory
 +  if (is_bsd) {
 +    config_makefile = "source/config/openbsd/Makefile"
 +  } else {
diff --git a/www/iridium/files/patch-third__party_zlib_BUILD.gn b/www/iridium/files/patch-third__party_zlib_BUILD.gn
index f34a2225b201..70ed07a6777c 100644
--- a/www/iridium/files/patch-third__party_zlib_BUILD.gn
+++ b/www/iridium/files/patch-third__party_zlib_BUILD.gn
@@ -1,11 +1,11 @@
---- third_party/zlib/BUILD.gn.orig	2017-04-19 19:06:53 UTC
-+++ third_party/zlib/BUILD.gn
-@@ -115,7 +115,7 @@ static_library("minizip") {
-       "contrib/minizip/iowin32.h",
+--- third_party/zlib/BUILD.gn.orig	2018-06-13 00:11:08.000000000 +0200
++++ third_party/zlib/BUILD.gn	2018-07-19 21:36:13.071700000 +0200
+@@ -327,7 +327,7 @@
      ]
    }
--  if (is_mac || is_ios || is_android) {
-+  if (is_mac || is_ios || is_android || is_bsd) {
+ 
+-  if (is_mac || is_ios || is_android || is_nacl) {
++  if (is_mac || is_ios || is_android || is_nacl || is_bsd) {
      # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
      # use fopen, ftell, and fseek instead on these systems.
      defines = [ "USE_FILE32API" ]
diff --git a/www/iridium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc b/www/iridium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc
new file mode 100644
index 000000000000..bc3b25820fed
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc.orig	2018-07-19 16:25:31.421721000 +0200
++++ third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc	2018-07-19 16:26:01.053291000 +0200
+@@ -54,7 +54,7 @@
+ 
+ #if defined(OS_WIN)
+ #include <malloc.h>
+-#else
++#elif !defined(OS_FREEBSD)
+ #include <alloca.h>
+ #endif
+ 
diff --git a/www/iridium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc b/www/iridium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc
new file mode 100644
index 000000000000..19559ac67014
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig	2018-07-19 16:36:31.131399000 +0200
++++ third_party/blink/renderer/core/editing/editing_behavior.cc	2018-07-19 16:36:56.793922000 +0200
+@@ -270,7 +270,7 @@
+   // unexpected behaviour
+   if (ch < ' ')
+     return false;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // According to XKB map no keyboard combinations with ctrl key are mapped to
+   // printable characters, however we need the filter as the DomKey/text could
+   // contain printable characters.
diff --git a/www/iridium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc b/www/iridium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc
new file mode 100644
index 000000000000..5276fe30fd9a
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2018-07-19 19:17:49.426163000 +0200
++++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc	2018-07-19 19:19:17.512247000 +0200
+@@ -31,7 +31,7 @@
+     0.001;  // a small slack period between deadline and current time for safety
+ 
+ /* The value is based on user statistics on Nov 2017. */
+-#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN))
++#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) || defined(OS_BSD)
+ const double kIdleTaskStartTimeoutDelayMs = 1000.0;
+ #else
+ const double kIdleTaskStartTimeoutDelayMs = 4000.0;  // For ChromeOS, Mobile
diff --git a/www/iridium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc b/www/iridium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc
new file mode 100644
index 000000000000..00353a1198d5
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig	2018-07-19 19:21:46.343805000 +0200
++++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc	2018-07-19 19:22:00.957461000 +0200
+@@ -126,7 +126,7 @@
+         is_in_group_(false),
+         buffer_(buffer) {
+     DCHECK(buffer_);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     // On other platforms, the <option> background color is the same as the
+     // <select> background color. On Linux, that makes the <option>
+     // background color very dark, so by default, try to use a lighter
diff --git a/www/iridium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc b/www/iridium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc
new file mode 100644
index 000000000000..980fd2fd3811
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc
@@ -0,0 +1,23 @@
+--- third_party/blink/renderer/core/xml/parser/xml_document_parser.cc.orig	2018-07-20 01:07:52.189302000 +0200
++++ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc	2018-07-20 01:10:37.425716000 +0200
+@@ -28,6 +28,10 @@
+ 
+ #include <libxml/parser.h>
+ #include <libxml/parserInternals.h>
++#include <libxml/xmlversion.h>
++#if defined(LIBXML_CATALOG_ENABLED)
++#include <libxml/catalog.h>
++#endif
+ #include <libxslt/xslt.h>
+ 
+ #include <memory>
+@@ -646,6 +650,9 @@
+   if (did_init)
+     return;
+ 
++#if defined(LIBXML_CATALOG_ENABLED)
++  xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
++#endif
+   xmlInitParser();
+   xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
+   xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third_party_blink_renderer_platform_BUILD.gn
new file mode 100644
index 000000000000..2fd7fc605603
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_BUILD.gn
@@ -0,0 +1,10 @@
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2018-07-19 20:33:30.438352000 +0200
++++ third_party/blink/renderer/platform/BUILD.gn	2018-07-19 20:34:04.587283000 +0200
+@@ -146,6 +146,7 @@
+     "//build/win:default_exe_manifest",
+     "//third_party/icu",
+   ]
++  libs = [ "cxxrt" ]
+ }
+ 
+ # This isn't strictly necessary since we can just add the deps to "platform",
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc
new file mode 100644
index 000000000000..ff14e816dae2
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2018-07-19 19:24:25.598357000 +0200
++++ third_party/blink/renderer/platform/fonts/font_cache.cc	2018-07-19 19:24:38.659689000 +0200
+@@ -85,7 +85,7 @@
+ FontPlatformData* FontCache::SystemFontPlatformData(
+     const FontDescription& font_description) {
+   const AtomicString& family = FontCache::SystemFontFamily();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (family.IsEmpty() || family == FontFamilyNames::system_ui)
+     return nullptr;
+ #else
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h
new file mode 100644
index 000000000000..af11edbae85e
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig	2018-07-19 19:26:12.883838000 +0200
++++ third_party/blink/renderer/platform/fonts/font_cache.h	2018-07-19 19:26:49.537827000 +0200
+@@ -213,7 +213,7 @@
+       const FontDescription&);
+ #endif  // defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   struct PlatformFallbackFont {
+     String name;
+     CString filename;
+@@ -287,7 +287,7 @@
+                                const FontFaceCreationParams&,
+                                CString& name);
+ 
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+   static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
+                                                 UChar32,
+                                                 const FontDescription&,
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc
new file mode 100644
index 000000000000..2d14db04f675
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc
@@ -0,0 +1,29 @@
+--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig	2018-07-19 19:27:56.537970000 +0200
++++ third_party/blink/renderer/platform/fonts/font_metrics.cc	2018-07-19 19:28:32.800265000 +0200
+@@ -38,7 +38,7 @@
+ 
+ namespace blink {
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ // This is the largest VDMX table which we'll try to load and parse.
+ static const size_t kMaxVDMXTableSize = 1024 * 1024;  // 1 MB
+ #endif
+@@ -60,7 +60,7 @@
+   int vdmx_ascent = 0, vdmx_descent = 0;
+   bool is_vdmx_valid = false;
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+   // 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).
+@@ -106,7 +106,7 @@
+       visual_overflow_inflation_for_ascent = 1;
+     if (descent < metrics.fDescent) {
+       visual_overflow_inflation_for_descent = 1;
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+       // When subpixel positioning is enabled, if the descent is rounded down,
+       // the descent part of the glyph may be truncated when displayed in a
+       // 'overflow: hidden' container.  To avoid that, borrow 1 unit from the
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc
new file mode 100644
index 000000000000..331eb842671b
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2018-07-19 19:29:54.256436000 +0200
++++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc	2018-07-19 19:30:19.879244000 +0200
+@@ -60,7 +60,7 @@
+   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:
+@@ -249,7 +249,7 @@
+   }
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   // 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
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc
new file mode 100644
index 000000000000..9bb60095006b
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc
@@ -0,0 +1,14 @@
+--- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig	2018-07-19 19:31:59.775056000 +0200
++++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc	2018-07-19 19:32:43.812459000 +0200
+@@ -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;
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc
new file mode 100644
index 000000000000..6aba9f2d9e7f
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc
@@ -0,0 +1,12 @@
+--- third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc.orig	2018-08-13 22:34:03.760055000 +0200
++++ third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc	2018-08-13 22:41:48.671075000 +0200
+@@ -643,6 +643,9 @@
+   IntSize UvSize() const { return uv_size_; }
+ 
+  private:
++#if defined(USE_SYSTEM_LIBJPEG)
++  NO_SANITIZE_CFI_ICALL
++#endif
+   JSAMPARRAY AllocateSampleArray() {
+ // Some output color spaces don't need the sample array: don't allocate in that
+ // case.
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc
new file mode 100644
index 000000000000..d67e09586552
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/image-encoders/image_encoder.cc.orig	2018-08-13 22:25:20.364425000 +0200
++++ third_party/blink/renderer/platform/image-encoders/image_encoder.cc	2018-08-13 22:28:52.206462000 +0200
+@@ -4,6 +4,17 @@
+ 
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ 
++#include "build/build_config.h"
++
++#if defined(OS_WIN)
++#include <basetsd.h>  // Included before jpeglib.h because of INT32 clash
++#endif                // OS_WIN
++#include <stdio.h>    // Needed by jpeglib.h
++
++#include "jpeglib.h"  // for JPEG_MAX_DIMENSION
++
++#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
++
+ namespace blink {
+ 
+ bool ImageEncoder::Encode(Vector<unsigned char>* dst,
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn
new file mode 100644
index 000000000000..2f0425f105fc
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn
@@ -0,0 +1,16 @@
+--- third_party/blink/renderer/platform/wtf/BUILD.gn.orig	2018-07-19 20:14:10.239594000 +0200
++++ third_party/blink/renderer/platform/wtf/BUILD.gn	2018-07-19 20:15:01.317226000 +0200
+@@ -279,8 +279,12 @@
+   if (is_android) {
+     libs = [ "log" ]
+   }
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     libs = [ "dl" ]
++  }
++
++  if (is_bsd) {
++    libs = [ "execinfo" ]
+   }
+ 
+   if (is_mac) {
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc
new file mode 100644
index 000000000000..9cbb81b475c2
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/wtf/assertions.cc.orig	2018-07-19 20:11:56.254657000 +0200
++++ third_party/blink/renderer/platform/wtf/assertions.cc	2018-07-19 20:13:24.142405000 +0200
+@@ -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>
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h
new file mode 100644
index 000000000000..f52678e85c7f
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/wtf/atomics.h.orig	2018-07-19 20:13:40.615473000 +0200
++++ third_party/blink/renderer/platform/wtf/atomics.h	2018-07-19 20:13:55.934336000 +0200
+@@ -176,7 +176,7 @@
+ #if defined(THREAD_SANITIZER)
+ // The definitions below assume an LP64 data model. This is fine because
+ // TSan is only supported on x86_64 Linux.
+-#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX)
++#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX) || defined(OS_BSD)
+ ALWAYS_INLINE void ReleaseStore(volatile int* ptr, int value) {
+   __tsan_atomic32_store(ptr, value, __tsan_memory_order_release);
+ }
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h
new file mode 100644
index 000000000000..d4825f902123
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h
@@ -0,0 +1,24 @@
+--- third_party/blink/renderer/platform/wtf/byte_swap.h.orig	2018-07-19 20:15:20.782500000 +0200
++++ third_party/blink/renderer/platform/wtf/byte_swap.h	2018-07-19 20:16:32.779700000 +0200
+@@ -60,15 +60,21 @@
+ 
+ #else
+ 
++#ifndef Bswap64
+ ALWAYS_INLINE uint64_t Bswap64(uint64_t x) {
+   return __builtin_bswap64(x);
+ }
++#endif
++#ifndef Bswap32
+ ALWAYS_INLINE uint32_t Bswap32(uint32_t x) {
+   return __builtin_bswap32(x);
+ }
++#endif
++#ifndef Bswap16
+ ALWAYS_INLINE uint16_t Bswap16(uint16_t x) {
+   return __builtin_bswap16(x);
+ }
++#endif
+ 
+ #endif
+ 
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h
new file mode 100644
index 000000000000..a3c7c304c518
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h
@@ -0,0 +1,13 @@
+--- third_party/blink/renderer/platform/wtf/compiler.h.orig	2018-08-13 22:36:40.462317000 +0200
++++ third_party/blink/renderer/platform/wtf/compiler.h	2018-08-13 22:38:32.823279000 +0200
+@@ -74,8 +74,10 @@
+ #if defined(__clang__)
+ #define NO_SANITIZE_UNRELATED_CAST \
+   __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
++#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
+ #else
+ #define NO_SANITIZE_UNRELATED_CAST
++#define NO_SANITIZE_CFI_ICALL
+ #endif
+ 
+ #endif /* WTF_Compiler_h */
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h
new file mode 100644
index 000000000000..ed293c65d607
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig	2018-07-19 20:16:53.004477000 +0200
++++ third_party/blink/renderer/platform/wtf/container_annotations.h	2018-07-19 20:17:16.730907000 +0200
+@@ -10,7 +10,7 @@
+ 
+ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
+ // once the crashes there have been fixed: http://crbug.com/461406
+-#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#if defined(ADDRESS_SANITIZER) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
+ #define ANNOTATE_CONTIGUOUS_CONTAINER
+ #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)                       \
+   if (buffer) {                                                              \
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc
new file mode 100644
index 000000000000..fa38bae27a8e
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc
@@ -0,0 +1,14 @@
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2018-07-19 20:18:16.483555000 +0200
++++ third_party/blink/renderer/platform/wtf/stack_util.cc	2018-07-19 20:18:51.633152000 +0200
+@@ -16,6 +16,11 @@
+ extern "C" void* __libc_stack_end;  // NOLINT
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <sys/signal.h>
++#include <pthread_np.h>
++#endif
++
+ namespace WTF {
+ 
+ size_t GetUnderestimatedStackSize() {
diff --git a/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc
new file mode 100644
index 000000000000..dd0c498f335b
--- /dev/null
+++ b/www/iridium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc
@@ -0,0 +1,33 @@
+--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig	2018-07-19 20:19:23.794139000 +0200
++++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc	2018-07-19 20:21:15.447060000 +0200
+@@ -51,14 +51,19 @@
+ #include <objc/objc-auto.h>
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/syscall.h>
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include <unistd.h>
+ #endif
+ 
++#if defined(OS_BSD)
++#include <sys/signal.h>
++#include <pthread_np.h>
++#endif
++
+ namespace WTF {
+ 
+ namespace internal {
+@@ -70,6 +75,8 @@
+   return syscall(__NR_gettid);
+ #elif defined(OS_ANDROID)
+   return gettid();
++#elif defined(OS_BSD)
++  return pthread_getthreadid_np();
+ #else
+   return reinterpret_cast<uintptr_t>(pthread_self());
+ #endif
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni b/www/iridium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni
new file mode 100644
index 000000000000..2323e0051abc
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2018-07-19 19:41:47.198522000 +0200
++++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni	2018-07-19 19:41:59.956618000 +0200
+@@ -38,7 +38,7 @@
+ if (crashpad_is_in_chromium) {
+   crashpad_is_mac = is_mac
+   crashpad_is_win = is_win
+-  crashpad_is_linux = is_linux
++  crashpad_is_linux = is_linux && !is_bsd
+   crashpad_is_android = is_android
+   crashpad_is_fuchsia = is_fuchsia
+ 
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h
new file mode 100644
index 000000000000..3738f7abc224
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h
@@ -0,0 +1,20 @@
+--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2018-05-09 21:06:31.000000000 +0200
++++ third_party/crashpad/crashpad/util/misc/capture_context.h	2018-08-16 12:52:21.940592000 +0200
+@@ -21,7 +21,7 @@
+ #include <mach/mach.h>
+ #elif defined(OS_WIN)
+ #include <windows.h>
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include <ucontext.h>
+ #endif  // OS_MACOSX
+ 
+@@ -33,7 +33,7 @@
+ #endif
+ #elif defined(OS_WIN)
+ using NativeCPUContext = CONTEXT;
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ using NativeCPUContext = ucontext_t;
+ #endif  // OS_MACOSX
+ 
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc
new file mode 100644
index 000000000000..6013f8f3de67
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2018-07-19 19:45:25.874776000 +0200
++++ third_party/crashpad/crashpad/util/misc/metrics.cc	2018-07-19 19:45:38.273062000 +0200
+@@ -24,7 +24,7 @@
+ #define METRICS_OS_NAME "Win"
+ #elif defined(OS_ANDROID)
+ #define METRICS_OS_NAME "Android"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define METRICS_OS_NAME "Linux"
+ #elif defined(OS_FUCHSIA)
+ #define METRICS_OS_NAME "Fuchsia"
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc
new file mode 100644
index 000000000000..64f4f20ebcd0
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2018-07-19 19:46:52.081549000 +0200
++++ third_party/crashpad/crashpad/util/misc/uuid.cc	2018-07-19 19:47:05.207892000 +0200
+@@ -95,7 +95,7 @@
+   InitializeFromBytes(uuid);
+   return true;
+ #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \
+-    defined(OS_FUCHSIA)
++    defined(OS_FUCHSIA) || defined(OS_BSD)
+   // Linux, Android, and Fuchsia do not provide a UUID generator in a
+   // widely-available system library. On Linux and Android, uuid_generate()
+   // from libuuid is not available everywhere.
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc
new file mode 100644
index 000000000000..c2fa7f668425
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2018-07-19 19:49:00.959630000 +0200
++++ third_party/crashpad/crashpad/util/posix/close_multiple.cc	2018-07-19 19:49:23.277639000 +0200
+@@ -71,7 +71,7 @@
+ // This is an advantage over looping over all possible file descriptors, because
+ // no attempt needs to be made to close file descriptors that are not open.
+ bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   static constexpr char kFDDir[] = "/dev/fd";
+ #elif defined(OS_LINUX) || defined(OS_ANDROID)
+   static constexpr char kFDDir[] = "/proc/self/fd";
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc
new file mode 100644
index 000000000000..94eb906d3339
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2018-07-19 19:50:51.829905000 +0200
++++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc	2018-07-19 19:51:04.660155000 +0200
+@@ -23,7 +23,7 @@
+   gid_t gid = getgid();
+   uid_t uid = getuid();
+ 
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
+   // setregid(), setreuid() and setregid() alone should be sufficient to drop
+   // privileges. The standard specifies that the saved ID should be set to the
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc
new file mode 100644
index 000000000000..9d0d6e4a1d2a
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc
@@ -0,0 +1,33 @@
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig	2018-07-19 19:52:18.124704000 +0200
++++ third_party/crashpad/crashpad/util/posix/signals.cc	2018-07-19 19:53:53.609005000 +0200
+@@ -44,7 +44,7 @@
+ #if defined(SIGEMT)
+     SIGEMT,
+ #endif  // defined(SIGEMT)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     SIGXCPU,
+     SIGXFSZ,
+ #endif  // defined(OS_LINUX)
+@@ -84,7 +84,7 @@
+     SIGXCPU,
+     SIGXFSZ,
+ #endif  // defined(OS_MACOSX)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     SIGIO,
+ #endif  // defined(OS_LINUX)
+ };
+@@ -214,8 +214,12 @@
+          // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
+          // psignal_internal().
+          (code > 0 &&
++#if defined(SI_ASYNCIO)
+           code != SI_ASYNCIO &&
++#endif
++#if defined(SI_MESGQ)
+           code != SI_MESGQ &&
++#endif
+           code != SI_QUEUE &&
+           code != SI_TIMER &&
+           code != SI_USER &&
diff --git a/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc
new file mode 100644
index 000000000000..67c495e0cfde
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc
@@ -0,0 +1,20 @@
+--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2018-07-19 19:55:17.168592000 +0200
++++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc	2018-07-19 19:55:37.640206000 +0200
+@@ -64,7 +64,7 @@
+     "INFO",
+     "USR1",
+     "USR2",
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+     // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/    "\1",/p'
+     //     /usr/include/asm-generic/signal.h
+     // and fix up by removing SIGIOT, SIGLOST, SIGUNUSED, and SIGRTMIN.
+@@ -101,7 +101,7 @@
+     "SYS",
+ #endif
+ };
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ // NSIG is 64 to account for real-time signals.
+ static_assert(arraysize(kSignalNames) == 32, "kSignalNames length");
+ #else
diff --git a/www/iridium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/iridium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h
new file mode 100644
index 000000000000..576f7825be55
--- /dev/null
+++ b/www/iridium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h
@@ -0,0 +1,19 @@
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h	2018-04-13 18:15:04 UTC
++++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
+@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type)
+ 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
+ }
+ 
+ }  // namespace crc32c
diff --git a/www/iridium/files/patch-tools_battor__agent_BUILD.gn b/www/iridium/files/patch-tools_battor__agent_BUILD.gn
deleted file mode 100644
index 80c12b6d9a60..000000000000
--- a/www/iridium/files/patch-tools_battor__agent_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/battor_agent/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ tools/battor_agent/BUILD.gn
-@@ -5,7 +5,7 @@
- import("//testing/test.gni")
- 
- # Works only on desktop platforms.
--assert(is_win || is_linux || is_mac)
-+assert(is_win || is_linux || is_bsd || is_mac)
- 
- executable("battor_agent") {
-   sources = [
diff --git a/www/iridium/files/patch-tools_gn_args.cc b/www/iridium/files/patch-tools_gn_args.cc
index 4c9ef989b180..915e8aac8460 100644
--- a/www/iridium/files/patch-tools_gn_args.cc
+++ b/www/iridium/files/patch-tools_gn_args.cc
@@ -1,6 +1,6 @@
---- tools/gn/args.cc.orig	2017-04-19 19:06:54 UTC
+--- tools/gn/args.cc.orig	2017-06-05 19:03:29 UTC
 +++ tools/gn/args.cc
-@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* de
+@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
    os = "mac";
  #elif defined(OS_LINUX)
    os = "linux";
diff --git a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
index e385d4cc4f68..a6586afe6d3e 100644
--- a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
+++ b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py
@@ -1,31 +1,25 @@
---- tools/gn/bootstrap/bootstrap.py.orig	2017-04-24 16:40:24.605680492 +0200
-+++ tools/gn/bootstrap/bootstrap.py	2017-06-15 22:19:51.805806000 +0200
-@@ -23,6 +23,7 @@
- import shutil
- import subprocess
- import sys
-+import platform
- import tempfile
- 
- BOOTSTRAP_DIR = os.path.dirname(os.path.abspath(__file__))
-@@ -31,8 +32,9 @@
+--- tools/gn/bootstrap/bootstrap.py.orig	2018-06-13 00:11:08.000000000 +0200
++++ tools/gn/bootstrap/bootstrap.py	2018-07-19 21:45:27.959100000 +0200
+@@ -32,9 +32,10 @@
  
  is_win = sys.platform.startswith('win')
  is_linux = sys.platform.startswith('linux')
 +is_bsd = platform.system().lower().endswith('bsd')
  is_mac = sys.platform.startswith('darwin')
--is_posix = is_linux or is_mac
-+is_posix = is_linux or is_mac or is_bsd
+ is_aix = sys.platform.startswith('aix')
+-is_posix = is_linux or is_mac or is_aix
++is_posix = is_linux or is_mac or is_aix or is_bsd
  
  def check_call(cmd, **kwargs):
    logging.debug('Running: %s', ' '.join(cmd))
-@@ -625,6 +627,39 @@
-         'base/third_party/libevent/epoll.c',
-     ])
+@@ -712,6 +713,43 @@
+         'cflags': cflags + ['-DHAVE_CONFIG_H'],
+     }
  
 +  if is_bsd:
 +    libs.extend(['-lexecinfo', '-lkvm'])
 +    ldflags.extend(['-pthread'])
++    include_dirs += ["/usr/local/include"]
 +
 +    static_libraries['xdg_user_dirs'] = {
 +        'sources': [
@@ -34,19 +28,20 @@
 +        'tool': 'cxx',
 +    }
 +    static_libraries['base']['sources'].extend([
-+        'base/allocator/allocator_shim.cc',
-+        'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
++        'base/memory/shared_memory_handle_posix.cc',
 +        'base/memory/shared_memory_posix.cc',
 +        'base/nix/xdg_util.cc',
++        'base/process/memory_stubs.cc',
++        'base/process/process_info_linux.cc',
 +        'base/process/internal_linux.cc',
-+        'base/process/process_handle_' + platform.system().lower() + '.cc',
-+        'base/process/process_iterator_' + platform.system().lower() + '.cc',
-+        # 'base/process/process_linux.cc',
-+        'base/process/process_metrics_'+ platform.system().lower() + '.cc',
++        'base/process/process_handle_freebsd.cc',
++        'base/process/process_metrics_freebsd.cc',
 +        'base/strings/sys_string_conversions_posix.cc',
-+        'base/sys_info_' + platform.system().lower() + '.cc',
-+        'base/threading/platform_thread_' + platform.system().lower() + '.cc',
-+        # 'base/trace_event/malloc_dump_provider.cc',
++        'base/sys_info_freebsd.cc',
++        'base/threading/platform_thread_linux.cc',
++        'base/synchronization/waitable_event_posix.cc',
++        'base/time/time_exploded_posix.cc',
++        'base/time/time_now_posix.cc',
 +    ])
 +    static_libraries['libevent']['include_dirs'].extend([
 +        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd')
@@ -54,8 +49,29 @@
 +    static_libraries['libevent']['sources'].extend([
 +        'base/third_party/libevent/kqueue.c',
 +    ])
++
 +    # Suppressing warnings
 +    cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality'])
++
+   if is_linux or is_aix:
+     static_libraries['xdg_user_dirs'] = {
+         'sources': [
+@@ -827,18 +865,6 @@
+       ])
+       static_libraries['libevent']['sources'].extend([
+          'base/third_party/libevent/epoll.c',
+-      ])
+-    else:
+-      ldflags.extend(['-pthread'])
+-      libs.extend(['-lrt'])
+-      static_libraries['base']['sources'].extend([
+-          'base/process/internal_aix.cc'
+-      ])
+-      static_libraries['libevent']['include_dirs'].extend([
+-          os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix')
+-      ])
+-      static_libraries['libevent']['include_dirs'].extend([
+-          os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat')
+       ])
  
    if is_mac:
-     static_libraries['base']['sources'].extend([
diff --git a/www/iridium/files/patch-tools_json_schema_compiler_feature_compiler.py b/www/iridium/files/patch-tools_json_schema_compiler_feature_compiler.py
new file mode 100644
index 000000000000..3e39ba415bae
--- /dev/null
+++ b/www/iridium/files/patch-tools_json_schema_compiler_feature_compiler.py
@@ -0,0 +1,10 @@
+--- tools/json_schema_compiler/feature_compiler.py.orig	2017-12-30 06:35:45.162972000 +0100
++++ tools/json_schema_compiler/feature_compiler.py	2017-12-30 06:37:35.101873000 +0100
+@@ -211,6 +211,7 @@
+         'enum_map': {
+           'chromeos': 'Feature::CHROMEOS_PLATFORM',
+           'linux': 'Feature::LINUX_PLATFORM',
++          'bsd': 'Feature::LINUX_PLATFORM',
+           'mac': 'Feature::MACOSX_PLATFORM',
+           'win': 'Feature::WIN_PLATFORM',
+         }
diff --git a/www/iridium/files/patch-tools_json_schema_compiler_model.py b/www/iridium/files/patch-tools_json_schema_compiler_model.py
new file mode 100644
index 000000000000..703f5ca13dac
--- /dev/null
+++ b/www/iridium/files/patch-tools_json_schema_compiler_model.py
@@ -0,0 +1,11 @@
+--- tools/json_schema_compiler/model.py.orig	2017-12-30 06:35:55.601371000 +0100
++++ tools/json_schema_compiler/model.py	2017-12-30 06:36:37.374966000 +0100
+@@ -599,7 +599,7 @@
+   """
+   CHROMEOS = _PlatformInfo("chromeos")
+   CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
+-  LINUX = _PlatformInfo("linux")
++  LINUX = _PlatformInfo("bsd")
+   MAC = _PlatformInfo("mac")
+   WIN = _PlatformInfo("win")
+ 
diff --git a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index 8db977712a7c..e5477c629d5e 100644
--- a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,11 +1,11 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -93,7 +93,7 @@ group("telemetry_chrome_test") {
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2017-12-15 02:04:51.000000000 +0100
++++ tools/perf/chrome_telemetry_build/BUILD.gn	2017-12-24 19:48:41.050737000 +0100
+@@ -37,7 +37,7 @@
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
 -  if (is_linux) {
 +  if (is_linux && !is_bsd) {
-     data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
+     data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
    }
  
diff --git a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
index 2385c7f73d0f..0e683a15c671 100644
--- a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
+++ b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py
@@ -1,11 +1,11 @@
---- tools/variations/fieldtrial_to_struct.py.orig	2017-04-19 19:06:54 UTC
-+++ tools/variations/fieldtrial_to_struct.py
-@@ -116,7 +116,7 @@ def main(arguments):
-   if not opts.platform:
+--- tools/variations/fieldtrial_to_struct.py.orig	2017-12-15 02:04:51.000000000 +0100
++++ tools/variations/fieldtrial_to_struct.py	2017-12-24 19:54:09.044002000 +0100
+@@ -117,7 +117,7 @@
      parser.error('You must specify a --platform.')
  
--  supported_platforms = ['android', 'chromeos', 'ios', 'linux', 'mac', 'win']
-+  supported_platforms = ['android', 'chromeos', 'ios', 'linux', 'mac', 'win', 'bsd']
+   supported_platforms = ['android', 'chromeos', 'fuchsia', 'ios', 'linux',
+-                         'mac', 'win']
++                         'mac', 'win', 'bsd']
    if opts.platform not in supported_platforms:
      parser.error('\'%s\' is an unknown platform. Supported platforms: %s' %
          (opts.platform, supported_platforms))
diff --git a/www/iridium/files/patch-ui_accessibility_platform_ax__platform__node.h b/www/iridium/files/patch-ui_accessibility_platform_ax__platform__node.h
deleted file mode 100644
index 801c06f915bc..000000000000
--- a/www/iridium/files/patch-ui_accessibility_platform_ax__platform__node.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/accessibility/platform/ax_platform_node.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/accessibility/platform/ax_platform_node.h
-@@ -22,7 +22,7 @@
- #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
- #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
- #endif
- 
diff --git a/www/iridium/files/patch-ui_app__list_app__list__constants.cc b/www/iridium/files/patch-ui_app__list_app__list__constants.cc
deleted file mode 100644
index 8342c354919d..000000000000
--- a/www/iridium/files/patch-ui_app__list_app__list__constants.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/app_list/app_list_constants.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/app_list/app_list_constants.cc
-@@ -140,7 +140,7 @@ const char kSearchQueryLength[] = "Apps.
- const char kSearchResultDistanceFromOrigin[] =
-     "Apps.AppListSearchResultDistanceFromOrigin";
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #if defined(GOOGLE_CHROME_BUILD)
- const char kAppListWMClass[] = "chrome_app_list";
- #else  // CHROMIUM_BUILD
diff --git a/www/iridium/files/patch-ui_app__list_app__list__constants.h b/www/iridium/files/patch-ui_app__list_app__list__constants.h
deleted file mode 100644
index 0eae8007079a..000000000000
--- a/www/iridium/files/patch-ui_app__list_app__list__constants.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/app_list/app_list_constants.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/app_list/app_list_constants.h
-@@ -89,8 +89,8 @@ APP_LIST_EXPORT extern const char kSearc
- APP_LIST_EXPORT extern const char kSearchQueryLength[];
- APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];
- 
--#if defined(OS_LINUX)
--// The WM_CLASS name for the app launcher window on Linux.
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-+// The WM_CLASS name for the app launcher window on Linux/FreeBSD.
- APP_LIST_EXPORT extern const char kAppListWMClass[];
- #endif
- 
diff --git a/www/iridium/files/patch-ui_app__list_views_app__list__item__view.cc b/www/iridium/files/patch-ui_app__list_views_app__list__item__view.cc
deleted file mode 100644
index 8fff20be1613..000000000000
--- a/www/iridium/files/patch-ui_app__list_views_app__list__item__view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/app_list/views/app_list_item_view.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/app_list/views/app_list_item_view.cc
-@@ -55,7 +55,7 @@ gfx::FontList GetFontList() {
-   const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
- // The font is different on each platform. The font size is adjusted on some
- // platforms to keep a consistent look.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Reducing the font size by 2 makes it the same as the Windows font size.
-   const int kFontSizeDelta = -2;
-   return font_list.DeriveWithSizeDelta(kFontSizeDelta);
diff --git a/www/iridium/files/patch-ui_aura_BUILD.gn b/www/iridium/files/patch-ui_aura_BUILD.gn
deleted file mode 100644
index 8167b4b52343..000000000000
--- a/www/iridium/files/patch-ui_aura_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/aura/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/aura/BUILD.gn
-@@ -369,7 +369,7 @@ test("aura_unittests") {
-     "//ui/gl:test_support",
-   ]
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//third_party/mesa" ]
-   }
- 
diff --git a/www/iridium/files/patch-ui_base_BUILD.gn b/www/iridium/files/patch-ui_base_BUILD.gn
deleted file mode 100644
index 3b91873101eb..000000000000
--- a/www/iridium/files/patch-ui_base_BUILD.gn
+++ /dev/null
@@ -1,61 +0,0 @@
---- ui/base/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/BUILD.gn
-@@ -357,7 +357,7 @@ component("base") {
-     sources += [ "touch/touch_device_android.cc" ]
-   } else if (is_ios) {
-     sources += [ "touch/touch_device_ios.cc" ]
--  } else if (is_linux) {
-+  } else if (is_linux || is_bsd) {
-     sources += [ "touch/touch_device_linux.cc" ]
-   } else {
-     # Empty implementation for all other cases.
-@@ -467,11 +467,11 @@ component("base") {
-     ]
-   }
- 
--  if (!use_aura || !is_linux) {
-+  if (!use_aura || !(is_linux || is_bsd)) {
-     sources -= [ "resource/resource_bundle_auralinux.cc" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//build/linux:fontconfig" ]
-   }
- 
-@@ -479,7 +479,7 @@ component("base") {
-     configs += [ "//build/config/linux:glib" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     if (!toolkit_views && !use_aura) {
-       sources -= [
-         "dragdrop/drag_utils.cc",
-@@ -831,7 +831,7 @@ test("ui_base_unittests") {
-       "ime/win/imm32_manager_unittest.cc",
-       "ime/win/tsf_input_scope_unittest.cc",
-     ]
--    if (is_linux && use_aura && !is_chromeos) {
-+    if ((is_linux || is_bsd) && use_aura && !is_chromeos) {
-       sources += [ "ime/input_method_auralinux_unittest.cc" ]
-     }
-     if (use_x11) {
-@@ -952,7 +952,7 @@ test("ui_base_unittests") {
-     ]
-   }
- 
--  if (is_android || is_linux || is_mac || is_win) {
-+  if (is_android || is_linux || is_bsd || is_mac || is_win) {
-     # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
-     # instead of depending directly on the non-test .pak files, but depending
-     # on ui_test_pak seems to have no effect.
-@@ -965,7 +965,7 @@ test("ui_base_unittests") {
-       "//third_party/mesa:osmesa",
-     ]
-   }
--  if (is_linux || is_win) {
-+  if (is_linux || is_bsd || is_win) {
-     data += [
-       # TODO(brettw): Remove these two lines.
-       "$root_out_dir/ui/en-US.pak",
diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
index 273c33fe3acb..8317eee7ca98 100644
--- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
@@ -1,20 +1,20 @@
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/dragdrop/os_exchange_data_provider_factory.cc
-@@ -8,7 +8,7 @@
+--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2018-02-24 16:25:37.000000000 +0100
++++ ui/base/dragdrop/os_exchange_data_provider_factory.cc	2018-03-04 04:46:54.356687000 +0100
+@@ -9,7 +9,7 @@
  
- #if defined(USE_X11) && !defined(OS_CHROMEOS)
+ #if defined(USE_X11)
  #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
  #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"
-@@ -34,7 +34,7 @@ OSExchangeDataProviderFactory::CreatePro
+@@ -43,7 +43,7 @@
  
- #if defined(USE_X11) && !defined(OS_CHROMEOS)
-   return base::MakeUnique<OSExchangeDataProviderAuraX11>();
+ #if defined(USE_X11)
+   return std::make_unique<OSExchangeDataProviderAuraX11>();
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
-   return base::MakeUnique<OSExchangeDataProviderAura>();
+   return std::make_unique<OSExchangeDataProviderAura>();
  #elif defined(OS_MACOSX)
    return ui::BuildOSExchangeDataProviderMac();
diff --git a/www/iridium/files/patch-ui_base_ime_BUILD.gn b/www/iridium/files/patch-ui_base_ime_BUILD.gn
deleted file mode 100644
index f18610b808a3..000000000000
--- a/www/iridium/files/patch-ui_base_ime_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/base/ime/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/ime/BUILD.gn
-@@ -124,7 +124,7 @@ component("ime") {
-     "//skia",
-   ]
- 
--  if (!use_aura || (!is_linux && !use_ozone)) {
-+  if (!use_aura || (!(is_linux || is_bsd) && !use_ozone)) {
-     sources -= [
-       "input_method_auralinux.cc",
-       "input_method_auralinux.h",
-@@ -138,7 +138,7 @@ component("ime") {
-     ]
-   }
- 
--  if (!is_chromeos && is_linux) {
-+  if (!is_chromeos && (is_linux || is_bsd)) {
-     sources += [
-       "linux/text_edit_command_auralinux.cc",
-       "linux/text_edit_command_auralinux.h",
diff --git a/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
index a8b2b27ab2ac..3d9782d5f0e3 100644
--- a/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
+++ b/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h
@@ -1,6 +1,6 @@
---- ui/base/ime/ime_engine_handler_interface.h.orig	2017-04-19 19:06:54 UTC
+--- ui/base/ime/ime_engine_handler_interface.h.orig	2017-06-05 19:03:30 UTC
 +++ ui/base/ime/ime_engine_handler_interface.h
-@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
+@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
    // Hides the input view window (from API call).
    virtual void HideInputView() = 0;
  
diff --git a/www/iridium/files/patch-ui_base_ime_input__method__factory.cc b/www/iridium/files/patch-ui_base_ime_input__method__factory.cc
deleted file mode 100644
index 658d5fad65f3..000000000000
--- a/www/iridium/files/patch-ui_base_ime_input__method__factory.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- ui/base/ime/input_method_factory.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/ime/input_method_factory.cc
-@@ -16,7 +16,8 @@
- #include "ui/base/ime/input_method_win.h"
- #elif defined(OS_MACOSX)
- #include "ui/base/ime/input_method_mac.h"
--#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \
-+      defined(USE_X11)
- #include "ui/base/ime/input_method_auralinux.h"
- #elif defined(OS_ANDROID)
- #include "ui/base/ime/input_method_android.h"
-@@ -60,7 +61,8 @@ std::unique_ptr<InputMethod> CreateInput
-   return base::MakeUnique<InputMethodWin>(delegate, widget);
- #elif defined(OS_MACOSX)
-   return base::MakeUnique<InputMethodMac>(delegate);
--#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) && \
-+      defined(USE_X11)
-   return base::MakeUnique<InputMethodAuraLinux>(delegate);
- #elif defined(OS_ANDROID)
-   return base::MakeUnique<InputMethodAndroid>(delegate);
diff --git a/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc b/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
index 078ebbd9dfd2..2afd67b9bb21 100644
--- a/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
+++ b/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc
@@ -1,6 +1,6 @@
---- ui/base/ime/input_method_initializer.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/ime/input_method_initializer.cc
-@@ -8,14 +8,14 @@
+--- ui/base/ime/input_method_initializer.cc.orig	2018-06-13 00:11:09.000000000 +0200
++++ ui/base/ime/input_method_initializer.cc	2018-07-19 21:52:04.744818000 +0200
+@@ -8,7 +8,7 @@
  
  #if defined(OS_CHROMEOS)
  #include "ui/base/ime/ime_bridge.h"
@@ -8,25 +8,26 @@
 +#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"
- #endif
+ #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;
+ const ui::LinuxInputMethodContextFactory*
+     g_linux_input_method_context_factory_for_testing;
  #endif
- 
-@@ -38,7 +38,7 @@ void ShutdownInputMethod() {
+@@ -46,7 +46,7 @@
  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)
-     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
-   const LinuxInputMethodContextFactory* factory =
-@@ -54,7 +54,7 @@ void InitializeInputMethodForTesting() {
+   if (!g_linux_input_method_context_factory_for_testing)
+     g_linux_input_method_context_factory_for_testing =
+         new FakeInputMethodContextFactory();
+@@ -67,7 +67,7 @@
  void ShutdownInputMethodForTesting() {
  #if defined(OS_CHROMEOS)
    IMEBridge::Shutdown();
@@ -34,4 +35,4 @@
 +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) 
    const LinuxInputMethodContextFactory* factory =
        LinuxInputMethodContextFactory::instance();
-   CHECK(!factory || factory == g_linux_input_method_context_factory)
+   CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
index 003e7f84f944..e36c823b4353 100644
--- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,20 +1,20 @@
---- ui/base/resource/resource_bundle.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/resource/resource_bundle.cc
-@@ -661,7 +661,7 @@ void ResourceBundle::ReloadFonts() {
+--- ui/base/resource/resource_bundle.cc.orig	2018-06-13 00:11:10.000000000 +0200
++++ ui/base/resource/resource_bundle.cc	2018-07-19 21:58:34.994550000 +0200
+@@ -708,7 +708,7 @@
  }
  
  ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
--#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
    return max_scale_factor_;
  #else
    return GetSupportedScaleFactors().back();
-@@ -719,7 +719,7 @@ void ResourceBundle::InitSharedInstance(
-     supported_scale_factors.push_back(SCALE_FACTOR_100P);
-   }
- #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
--    defined(OS_WIN)
-+    defined(OS_WIN) || defined(OS_BSD)
+@@ -754,7 +754,7 @@
+   // 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);
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
    supported_scale_factors.push_back(SCALE_FACTOR_200P);
  #endif
-   ui::SetSupportedScaleFactors(supported_scale_factors);
+ #endif
diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle__freebsd.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
new file mode 100644
index 000000000000..326e40c22580
--- /dev/null
+++ b/www/iridium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
@@ -0,0 +1,24 @@
+--- ui/base/resource/resource_bundle_freebsd.cc.orig	2017-09-08 18:23:28.279481000 +0200
++++ ui/base/resource/resource_bundle_freebsd.cc	2017-09-08 18:23:04.528326000 +0200
+@@ -0,0 +1,21 @@
++// Copyright 2017 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.
++
++#include "ui/base/resource/resource_bundle.h"
++
++#include "base/logging.h"
++#include "base/macros.h"
++#include "ui/gfx/image/image.h"
++
++namespace ui {
++
++void ResourceBundle::LoadCommonResources() {
++  LoadChromeResources();
++}
++
++gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
++  return GetImageNamed(resource_id);
++}
++
++}  // namespace ui
diff --git a/www/iridium/files/patch-ui_base_ui__features.gni b/www/iridium/files/patch-ui_base_ui__features.gni
deleted file mode 100644
index 1438526c485e..000000000000
--- a/www/iridium/files/patch-ui_base_ui__features.gni
+++ /dev/null
@@ -1,8 +0,0 @@
---- ui/base/ui_features.gni.orig	2017-04-19 19:06:54 UTC
-+++ ui/base/ui_features.gni
-@@ -10,4 +10,4 @@ declare_args() {
-   mac_views_browser = false
- }
- 
--enable_hidpi = is_mac || is_win || is_linux
-+enable_hidpi = is_mac || is_win || is_linux || is_bsd
diff --git a/www/iridium/files/patch-ui_compositor_BUILD.gn b/www/iridium/files/patch-ui_compositor_BUILD.gn
deleted file mode 100644
index 08800abeb8f0..000000000000
--- a/www/iridium/files/patch-ui_compositor_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/compositor/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/compositor/BUILD.gn
-@@ -205,7 +205,7 @@ test("compositor_unittests") {
-     "//ui/gl",
-     "//ui/resources",
-   ]
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//third_party/mesa:osmesa" ]
-   }
- }
diff --git a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
index 0b88df77c8e6..bb35e4e091dc 100644
--- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ b/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	2017-04-19 19:06:54 UTC
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKe
+@@ -834,6 +834,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();
-@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice
+@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
      keyboards.erase(it);
      DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
    }
diff --git a/www/iridium/files/patch-ui_events_event__switches.cc b/www/iridium/files/patch-ui_events_event__switches.cc
index 97ce603ed348..73c2ac9ce66f 100644
--- a/www/iridium/files/patch-ui_events_event__switches.cc
+++ b/www/iridium/files/patch-ui_events_event__switches.cc
@@ -1,6 +1,6 @@
---- ui/events/event_switches.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/events/event_switches.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/events/event_switches.cc
-@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "
+@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll-
  const char kCompensateForUnstablePinchZoom[] =
      "compensate-for-unstable-pinch-zoom";
  
diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn
deleted file mode 100644
index 4f5094bc0908..000000000000
--- a/www/iridium/files/patch-ui_gfx_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/gfx/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/gfx/BUILD.gn
-@@ -383,7 +383,7 @@ component("gfx") {
-   }
- 
-   # Linux.
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//build/linux:fontconfig" ]
-   }
- 
-@@ -592,7 +592,7 @@ static_library("test_support") {
-       "test/ui_cocoa_test_helper.mm",
-     ]
-   }
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     deps += [ "//build/linux:fontconfig" ]
-   }
- }
diff --git a/www/iridium/files/patch-ui_gfx_canvas__skia.cc b/www/iridium/files/patch-ui_gfx_canvas__skia.cc
index bb9a49be08dd..8415264e47d0 100644
--- a/www/iridium/files/patch-ui_gfx_canvas__skia.cc
+++ b/www/iridium/files/patch-ui_gfx_canvas__skia.cc
@@ -1,6 +1,6 @@
---- ui/gfx/canvas_skia.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/gfx/canvas_skia.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/gfx/canvas_skia.cc
-@@ -201,7 +201,7 @@ void Canvas::DrawStringRectWithFlags(con
+@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/iridium/files/patch-ui_gfx_codec_jpeg_codec.cc b/www/iridium/files/patch-ui_gfx_codec_jpeg_codec.cc
new file mode 100644
index 000000000000..052cd8349b0e
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_codec_jpeg_codec.cc
@@ -0,0 +1,20 @@
+--- ui/gfx/codec/jpeg_codec.cc.orig	2017-10-14 03:14:08.077073000 +0200
++++ ui/gfx/codec/jpeg_codec.cc	2017-10-14 03:25:59.561802000 +0200
+@@ -219,6 +219,7 @@
+     case JCS_GRAYSCALE:
+     case JCS_RGB:
+     case JCS_YCbCr:
++#ifdef JCS_EXTENSIONS
+       // Choose an output colorspace and return if it is an unsupported one.
+       // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats
+       // used by Chromium (i.e. RGBA and BGRA) and we just map the input
+@@ -237,6 +238,9 @@
+         NOTREACHED() << "Invalid pixel format";
+         return false;
+       }
++#else
++      cinfo.out_color_space = JCS_RGB;
++#endif
+       break;
+     case JCS_CMYK:
+     case JCS_YCCK:
diff --git a/www/iridium/files/patch-ui_gfx_font__list.cc b/www/iridium/files/patch-ui_gfx_font__list.cc
index 69cf89d0c551..b559de3d3c6a 100644
--- a/www/iridium/files/patch-ui_gfx_font__list.cc
+++ b/www/iridium/files/patch-ui_gfx_font__list.cc
@@ -1,11 +1,11 @@
---- ui/gfx/font_list.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/gfx/font_list.cc
-@@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::Fo
+--- ui/gfx/font_list.cc.orig	2017-12-15 02:04:51.000000000 +0100
++++ ui/gfx/font_list.cc	2017-12-24 20:09:47.066057000 +0100
+@@ -24,7 +24,7 @@
  bool g_default_impl_initialized = false;
  
  bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) {
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-   sk_sp<SkTypeface> typeface(
-       fontManager->legacyCreateTypeface(family.c_str(), SkFontStyle()));
-   return typeface;
+   return fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle());
+ #else
+   sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str()));
diff --git a/www/iridium/files/patch-ui_gfx_font__render__params.h b/www/iridium/files/patch-ui_gfx_font__render__params.h
index 2b2f51e42feb..999ecf6af423 100644
--- a/www/iridium/files/patch-ui_gfx_font__render__params.h
+++ b/www/iridium/files/patch-ui_gfx_font__render__params.h
@@ -1,6 +1,6 @@
---- ui/gfx/font_render_params.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/gfx/font_render_params.h
-@@ -106,13 +106,13 @@ GFX_EXPORT FontRenderParams GetFontRende
+--- ui/gfx/font_render_params.h.orig	2017-12-15 02:04:51.000000000 +0100
++++ ui/gfx/font_render_params.h	2017-12-24 20:14:06.436950000 +0100
+@@ -107,13 +107,13 @@
      const FontRenderParamsQuery& query,
      std::string* family_out);
  
@@ -11,8 +11,8 @@
  GFX_EXPORT void ClearFontRenderParamsCacheForTest();
  #endif
  
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || (defined(OS_ANDROID) && BUILDFLAG(ENABLE_VR))
++#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_ANDROID) && BUILDFLAG(ENABLE_VR))
  // Gets the device scale factor to query the FontRenderParams.
  GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
  
diff --git a/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.cc b/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.cc
new file mode 100644
index 000000000000..e2d6c9d7b269
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.cc
@@ -0,0 +1,11 @@
+--- ui/gfx/gpu_memory_buffer.cc.orig	2017-08-02 17:09:18.637721000 +0200
++++ ui/gfx/gpu_memory_buffer.cc	2017-08-02 17:09:34.476081000 +0200
+@@ -37,7 +37,7 @@
+       gfx::GpuMemoryBufferHandle handle;
+       handle.type = gfx::NATIVE_PIXMAP;
+       handle.id = source_handle.id;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       handle.native_pixmap_handle =
+           gfx::CloneHandleForIPC(source_handle.native_pixmap_handle);
+ #endif
diff --git a/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.h b/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.h
new file mode 100644
index 000000000000..76f4f3a566aa
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_gpu_memory_buffer.h
@@ -0,0 +1,20 @@
+--- ui/gfx/gpu_memory_buffer.h.orig	2017-08-02 16:52:58.362137000 +0200
++++ ui/gfx/gpu_memory_buffer.h	2017-08-02 16:53:34.724326000 +0200
+@@ -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)
+ #include "ui/gfx/native_pixmap_handle.h"
+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
+ #include "ui/gfx/mac/io_surface.h"
+@@ -48,7 +48,7 @@
+   base::SharedMemoryHandle handle;
+   uint32_t offset;
+   int32_t stride;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   NativePixmapHandle native_pixmap_handle;
+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
+   ScopedRefCountedIOSurfaceMachPort mach_port;
diff --git a/www/iridium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h b/www/iridium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h
new file mode 100644
index 000000000000..3bc8fea8a299
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h
@@ -0,0 +1,29 @@
+--- ui/gfx/ipc/gfx_param_traits_macros.h.orig	2017-08-02 17:11:09.924017000 +0200
++++ ui/gfx/ipc/gfx_param_traits_macros.h	2017-08-02 17:11:50.017756000 +0200
+@@ -15,7 +15,7 @@
+ #include "ui/gfx/selection_bound.h"
+ #include "ui/gfx/swap_result.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/gfx/native_pixmap_handle.h"
+ #endif
+ 
+@@ -39,7 +39,7 @@
+   IPC_STRUCT_TRAITS_MEMBER(handle)
+   IPC_STRUCT_TRAITS_MEMBER(offset)
+   IPC_STRUCT_TRAITS_MEMBER(stride)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
+ #elif defined(OS_MACOSX)
+   IPC_STRUCT_TRAITS_MEMBER(mach_port)
+@@ -50,7 +50,7 @@
+   IPC_STRUCT_TRAITS_MEMBER(id)
+ IPC_STRUCT_TRAITS_END()
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
+   IPC_STRUCT_TRAITS_MEMBER(stride)
+   IPC_STRUCT_TRAITS_MEMBER(offset)
diff --git a/www/iridium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc b/www/iridium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc
new file mode 100644
index 000000000000..129bbd31acec
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc
@@ -0,0 +1,25 @@
+--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2017-08-02 16:54:46.101075000 +0200
++++ ui/gfx/linux/client_native_pixmap_dmabuf.cc	2017-08-02 16:55:49.754442000 +0200
+@@ -5,7 +5,9 @@
+ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
+ 
+ #include <fcntl.h>
++#if !defined(__FreeBSD__)
+ #include <linux/version.h>
++#endif
+ #include <stddef.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+@@ -19,11 +21,7 @@
+ #include "base/strings/stringprintf.h"
+ #include "base/trace_event/trace_event.h"
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-#include <linux/dma-buf.h>
+-#else
+-#include <linux/types.h>
+-
++#if defined(__FreeBSD__)
+ struct dma_buf_sync {
+   __u64 flags;
+ };
diff --git a/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc b/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
new file mode 100644
index 000000000000..f807cbc71ebc
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
@@ -0,0 +1,42 @@
+--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig	2017-12-15 02:04:51.000000000 +0100
++++ ui/gfx/mojo/buffer_types_struct_traits.cc	2017-12-24 20:18:51.935594000 +0100
+@@ -12,10 +12,10 @@
+ StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
+     fds(const gfx::NativePixmapHandle& pixmap_handle) {
+   std::vector<mojo::ScopedHandle> handles;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   for (const base::FileDescriptor& fd : pixmap_handle.fds)
+     handles.emplace_back(mojo::WrapPlatformFile(fd.fd));
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   return handles;
+ }
+ 
+@@ -23,7 +23,7 @@
+     gfx::mojom::NativePixmapHandleDataView,
+     gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
+                                    gfx::NativePixmapHandle* out) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   mojo::ArrayDataView<mojo::ScopedHandle> handles_data_view;
+   data.GetFdsDataView(&handles_data_view);
+   for (size_t i = 0; i < handles_data_view.size(); ++i) {
+@@ -55,7 +55,7 @@
+ StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
+              gfx::GpuMemoryBufferHandle>::
+     native_pixmap_handle(const gfx::GpuMemoryBufferHandle& handle) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   return handle.native_pixmap_handle;
+ #else
+   static gfx::NativePixmapHandle pixmap_handle;
+@@ -94,7 +94,7 @@
+     out->offset = data.offset();
+     out->stride = data.stride();
+   }
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   if (out->type == gfx::NATIVE_PIXMAP &&
+       !data.ReadNativePixmapHandle(&out->native_pixmap_handle))
+     return false;
diff --git a/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h b/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
new file mode 100644
index 000000000000..b48369ec222f
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
@@ -0,0 +1,11 @@
+--- ui/gfx/mojo/buffer_types_struct_traits.h.orig	2017-08-02 17:14:09.584825000 +0200
++++ ui/gfx/mojo/buffer_types_struct_traits.h	2017-08-02 17:14:27.990894000 +0200
+@@ -240,7 +240,7 @@
+                               void* context);
+ 
+   static bool IsNull(const gfx::NativePixmapHandle& handle) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     return false;
+ #else
+     // NativePixmapHandle are not used on non-linux platforms.
diff --git a/www/iridium/files/patch-ui_gfx_native_pixmap_handle.cc b/www/iridium/files/patch-ui_gfx_native_pixmap_handle.cc
new file mode 100644
index 000000000000..7a5499a5ba1b
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_native_pixmap_handle.cc
@@ -0,0 +1,28 @@
+--- ui/gfx/native_pixmap_handle.cc.orig	2018-03-20 23:05:56.000000000 +0100
++++ ui/gfx/native_pixmap_handle.cc	2018-03-24 19:09:06.975980000 +0100
+@@ -4,14 +4,14 @@
+ 
+ #include "ui/gfx/native_pixmap_handle.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <drm_fourcc.h>
+ #include "base/posix/eintr_wrapper.h"
+ #endif
+ 
+ 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"
+               "DRM_FORMAT_MOD_INVALID");
+@@ -36,7 +36,7 @@
+ 
+ NativePixmapHandle::~NativePixmapHandle() {}
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
+   NativePixmapHandle clone;
+   std::vector<base::ScopedFD> scoped_fds;
diff --git a/www/iridium/files/patch-ui_gfx_native_pixmap_handle.h b/www/iridium/files/patch-ui_gfx_native_pixmap_handle.h
new file mode 100644
index 000000000000..9e9261d7e7f2
--- /dev/null
+++ b/www/iridium/files/patch-ui_gfx_native_pixmap_handle.h
@@ -0,0 +1,28 @@
+--- ui/gfx/native_pixmap_handle.h.orig	2017-08-02 17:17:40.381296000 +0200
++++ ui/gfx/native_pixmap_handle.h	2017-08-02 17:18:15.306967000 +0200
+@@ -13,7 +13,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"
+ #endif
+ 
+@@ -46,14 +46,14 @@
+ 
+   ~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
+   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|.
diff --git a/www/iridium/files/patch-ui_gfx_render__text.cc b/www/iridium/files/patch-ui_gfx_render__text.cc
index 46acc6092ef5..deddc3d5161b 100644
--- a/www/iridium/files/patch-ui_gfx_render__text.cc
+++ b/www/iridium/files/patch-ui_gfx_render__text.cc
@@ -1,6 +1,6 @@
---- ui/gfx/render_text.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/gfx/render_text.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/gfx/render_text.cc
-@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int ho
+@@ -948,32 +948,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
    const int extra_content = GetContentWidth() - display_rect_.width();
    const int cursor_width = cursor_enabled_ ? 1 : 0;
  
diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn
index 3edb9fec8900..3ff574bc5f8a 100644
--- a/www/iridium/files/patch-ui_gl_BUILD.gn
+++ b/www/iridium/files/patch-ui_gl_BUILD.gn
@@ -1,20 +1,21 @@
---- ui/gl/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/gl/BUILD.gn
-@@ -13,7 +13,7 @@ declare_args() {
-   enable_swiftshader = is_chrome_branded && is_win
- }
- 
--use_egl = is_win || is_android || is_linux
-+use_egl = is_win || is_android || is_linux || is_bsd
- use_glx = use_x11 || ozone_platform_x11
- 
- if (is_android) {
-@@ -170,7 +170,7 @@ component("gl") {
-       "gl_surface_egl.h",
+--- ui/gl/BUILD.gn.orig	2018-05-09 21:06:41.000000000 +0200
++++ ui/gl/BUILD.gn	2018-08-16 13:08:19.550126000 +0200
+@@ -307,7 +307,6 @@
+     data_deps += [
+       "//third_party/angle:libEGL",
+       "//third_party/angle:libGLESv2",
+-      "//third_party/mesa:osmesa",
+       "//third_party/swiftshader",
      ]
    }
--  if (is_android || is_linux) {
-+  if (is_android || is_linux || is_bsd) {
-     sources += [
-       "gl_implementation_osmesa.cc",
-       "gl_implementation_osmesa.h",
+@@ -506,10 +505,6 @@
+     "//ui/gl/init",
+     "//ui/platform_window",
+     "//ui/platform_window:platform_impls",
+-  ]
+-
+-  data_deps = [
+-    "//third_party/mesa:osmesa",
+   ]
+ 
+   if (use_x11) {
diff --git a/www/iridium/files/patch-ui_gl_generate_bindings.py b/www/iridium/files/patch-ui_gl_generate_bindings.py
new file mode 100644
index 000000000000..cf67dd5e9ba2
--- /dev/null
+++ b/www/iridium/files/patch-ui_gl_generate_bindings.py
@@ -0,0 +1,12 @@
+--- ui/gl/generate_bindings.py.orig	2017-09-10 02:49:38.177014000 +0200
++++ ui/gl/generate_bindings.py	2017-09-10 02:52:26.524647000 +0200
+@@ -2257,6 +2257,9 @@
+   'arguments':
+       'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
+       'int32_t* denominator' },
++{ 'return_type': '__GLXextFuncPtr',
++  'names': ['glXGetProcAddressARB'],
++  'arguments': 'const GLubyte* procName', },
+ { 'return_type': 'void',
+   'names': ['glXGetSelectedEvent'],
+   'arguments': 'Display* dpy, GLXDrawable drawable, unsigned long* mask', },
diff --git a/www/iridium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h b/www/iridium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h
new file mode 100644
index 000000000000..34f2a8164a20
--- /dev/null
+++ b/www/iridium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h
@@ -0,0 +1,10 @@
+--- ui/gl/gl_bindings_api_autogen_glx.h.orig	2017-12-30 16:59:26.294402000 +0100
++++ ui/gl/gl_bindings_api_autogen_glx.h	2017-12-30 17:01:57.250690000 +0100
+@@ -84,6 +84,7 @@
+                         GLXDrawable drawable,
+                         int32_t* numerator,
+                         int32_t* denominator) override;
++__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override;
+ void glXGetSelectedEventFn(Display* dpy,
+                            GLXDrawable drawable,
+                            unsigned long* mask) override;
diff --git a/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.cc b/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.cc
new file mode 100644
index 000000000000..61ceece285e7
--- /dev/null
+++ b/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.cc
@@ -0,0 +1,61 @@
+--- ui/gl/gl_bindings_autogen_glx.cc.orig	2018-02-24 16:25:37.000000000 +0100
++++ ui/gl/gl_bindings_autogen_glx.cc	2018-03-04 04:53:49.532617000 +0100
+@@ -115,6 +115,8 @@
+ 
+   ext.b_GLX_ARB_create_context =
+       HasExtension(extensions, "GLX_ARB_create_context");
++  ext.b_GLX_ARB_get_proc_address =
++      HasExtension(extensions, "GLX_ARB_get_proc_address");
+   ext.b_GLX_EXT_swap_control = HasExtension(extensions, "GLX_EXT_swap_control");
+   ext.b_GLX_EXT_texture_from_pixmap =
+       HasExtension(extensions, "GLX_EXT_texture_from_pixmap");
+@@ -142,6 +144,11 @@
+             GetGLProcAddress("glXCreateContextAttribsARB"));
+   }
+ 
++  if (ext.b_GLX_ARB_get_proc_address) {
++    fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>(
++        GetGLProcAddress("glXGetProcAddressARB"));
++  }
++
+   if (ext.b_GLX_SGIX_fbconfig) {
+     fn.glXGetFBConfigFromVisualSGIXFn =
+         reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>(
+@@ -343,6 +350,10 @@
+   return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
+ }
+ 
++__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) {
++  return driver_->fn.glXGetProcAddressARBFn(procName);
++}
++
+ void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
+                                        GLXDrawable drawable,
+                                        unsigned long* mask) {
+@@ -643,6 +654,11 @@
+   return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
+ }
+ 
++__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
++  TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetProcAddressARB")
++  return glx_api_->glXGetProcAddressARBFn(procName);
++}
++
+ void TraceGLXApi::glXGetSelectedEventFn(Display* dpy,
+                                         GLXDrawable drawable,
+                                         unsigned long* mask) {
+@@ -1065,6 +1081,14 @@
+                  << static_cast<const void*>(denominator) << ")");
+   bool result =
+       glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
++  GL_SERVICE_LOG("GL_RESULT: " << result);
++  return result;
++}
++
++__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
++  GL_SERVICE_LOG("glXGetProcAddressARB"
++                 << "(" << static_cast<const void*>(procName) << ")");
++  __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);
+   GL_SERVICE_LOG("GL_RESULT: " << result);
+   return result;
+ }
diff --git a/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.h b/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.h
new file mode 100644
index 000000000000..b384d0bdb171
--- /dev/null
+++ b/www/iridium/files/patch-ui_gl_gl_bindings_autogen_glx.h
@@ -0,0 +1,43 @@
+--- ui/gl/gl_bindings_autogen_glx.h.orig	2017-12-15 02:04:52.000000000 +0100
++++ ui/gl/gl_bindings_autogen_glx.h	2017-12-30 20:37:25.644088000 +0100
+@@ -104,6 +104,8 @@
+                                                     GLXDrawable drawable,
+                                                     int32_t* numerator,
+                                                     int32_t* denominator);
++typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)(
++    const GLubyte* procName);
+ typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy,
+                                                        GLXDrawable drawable,
+                                                        unsigned long* mask);
+@@ -166,6 +168,7 @@
+ 
+ struct ExtensionsGLX {
+   bool b_GLX_ARB_create_context;
++  bool b_GLX_ARB_get_proc_address;
+   bool b_GLX_EXT_swap_control;
+   bool b_GLX_EXT_texture_from_pixmap;
+   bool b_GLX_MESA_copy_sub_buffer;
+@@ -203,6 +206,7 @@
+   glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn;
+   glXGetFBConfigsProc glXGetFBConfigsFn;
+   glXGetMscRateOMLProc glXGetMscRateOMLFn;
++  glXGetProcAddressARBProc glXGetProcAddressARBFn;
+   glXGetSelectedEventProc glXGetSelectedEventFn;
+   glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn;
+   glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn;
+@@ -310,6 +314,7 @@
+                                   GLXDrawable drawable,
+                                   int32_t* numerator,
+                                   int32_t* denominator) = 0;
++  virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0;
+   virtual void glXGetSelectedEventFn(Display* dpy,
+                                      GLXDrawable drawable,
+                                      unsigned long* mask) = 0;
+@@ -394,6 +399,7 @@
+   ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn
+ #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn
+ #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn
++#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn
+ #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn
+ #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn
+ #define glXGetVisualFromFBConfig \
diff --git a/www/iridium/files/patch-ui_gl_gl_implementation.cc b/www/iridium/files/patch-ui_gl_gl_implementation.cc
new file mode 100644
index 000000000000..bea960e45309
--- /dev/null
+++ b/www/iridium/files/patch-ui_gl_gl_implementation.cc
@@ -0,0 +1,11 @@
+--- ui/gl/gl_implementation.cc.orig	2018-05-09 21:06:41.000000000 +0200
++++ ui/gl/gl_implementation.cc	2018-08-16 15:08:00.138967000 +0200
+@@ -121,7 +121,7 @@
+ }
+ 
+ GLImplementation GetSoftwareGLImplementation() {
+-#if (defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)))
++#if (defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)))
+   return kGLImplementationSwiftShaderGL;
+ #else
+   return kGLImplementationOSMesaGL;
diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
index d8da75fc7617..c96e835933e9 100644
--- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
+++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc
@@ -1,5 +1,5 @@
---- ui/gl/sync_control_vsync_provider.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/gl/sync_control_vsync_provider.cc
+--- ui/gl/sync_control_vsync_provider.cc.orig	2018-03-20 23:05:56.000000000 +0100
++++ ui/gl/sync_control_vsync_provider.cc	2018-03-24 19:15:24.360217000 +0100
 @@ -11,7 +11,7 @@
  #include "base/trace_event/trace_event.h"
  #include "build/build_config.h"
@@ -9,7 +9,7 @@
  // These constants define a reasonable range for a calculated refresh interval.
  // Calculating refreshes out of this range will be considered a fatal error.
  const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
-@@ -26,7 +26,7 @@ const double kRelativeIntervalDifference
+@@ -26,7 +26,7 @@
  namespace gl {
  
  SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() {
@@ -18,21 +18,21 @@
    // On platforms where we can't get an accurate reading on the refresh
    // rate we fall back to the assumption that we're displaying 60 frames
    // per second.
-@@ -39,7 +39,7 @@ SyncControlVSyncProvider::~SyncControlVS
- void SyncControlVSyncProvider::GetVSyncParameters(
-     const UpdateVSyncCallback& callback) {
+@@ -48,7 +48,7 @@
+     base::TimeTicks* timebase_out,
+     base::TimeDelta* interval_out) {
    TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
-   base::TimeTicks timebase;
- 
    // The actual clock used for the system time returned by glXGetSyncValuesOML
-@@ -155,7 +155,7 @@ void SyncControlVSyncProvider::GetVSyncP
-   last_timebase_ = timebase;
-   last_media_stream_counter_ = media_stream_counter;
-   callback.Run(timebase, last_good_interval_);
+   // 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
+@@ -161,7 +161,7 @@
+   return true;
+ #else
+   return false;
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  }
  
- }  // namespace gl
+ bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() {
diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
index 7abf154d16a4..ecd2976f4c93 100644
--- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
+++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h
@@ -1,6 +1,20 @@
---- ui/gl/sync_control_vsync_provider.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/gl/sync_control_vsync_provider.h
-@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public 
+--- ui/gl/sync_control_vsync_provider.h.orig	2017-12-15 02:04:52.000000000 +0100
++++ ui/gl/sync_control_vsync_provider.h	2017-12-24 20:29:58.843365000 +0100
+@@ -23,11 +23,11 @@
+   void GetVSyncParameters(const UpdateVSyncCallback& callback) override;
+ 
+   static constexpr bool IsSupported() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     return true;
+ #else
+     return false;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   }
+ 
+  protected:
+@@ -38,7 +38,7 @@
    virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;
  
   private:
@@ -9,10 +23,10 @@
    base::TimeTicks last_timebase_;
    uint64_t last_media_stream_counter_ = 0;
    base::TimeDelta last_good_interval_;
-@@ -42,7 +42,7 @@ class SyncControlVSyncProvider : public 
+@@ -49,7 +49,7 @@
    // from configuration change (monitor reconfiguration, moving windows
    // between monitors, suspend and resume, etc.).
-   std::queue<base::TimeDelta> last_computed_intervals_;
+   base::queue<base::TimeDelta> last_computed_intervals_;
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
diff --git a/www/iridium/files/patch-ui_message__center_message__center__style.h b/www/iridium/files/patch-ui_message__center_message__center__style.h
deleted file mode 100644
index 51a6c114fd47..000000000000
--- a/www/iridium/files/patch-ui_message__center_message__center__style.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/message_center/message_center_style.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/message_center/message_center_style.h
-@@ -121,7 +121,7 @@ const int kButtonHorizontalPadding = 16;
- const int kButtonIconTopPadding = 11;      // In DIPs.
- const int kButtonIconToTitlePadding = 16;  // In DIPs.
- 
--#if !defined(OS_LINUX) || defined(USE_AURA)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
- const SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
- const SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
- #endif
diff --git a/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.cc b/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.cc
deleted file mode 100644
index 7c285d5abd83..000000000000
--- a/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ui/message_center/views/message_center_button_bar.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/message_center/views/message_center_button_bar.cc
-@@ -95,7 +95,7 @@ MessageCenterButtonBar::MessageCenterBut
-     const base::string16& title)
-     : message_center_view_(message_center_view),
-       message_center_(message_center),
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-       close_bubble_button_(NULL),
- #endif
-       title_arrow_(NULL),
-@@ -170,7 +170,7 @@ MessageCenterButtonBar::MessageCenterBut
-                                    IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
-   button_container_->AddChildView(settings_button_);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   close_bubble_button_ = new views::ImageButton(this);
-   close_bubble_button_->SetImage(
-       views::Button::STATE_NORMAL,
-@@ -232,7 +232,7 @@ void MessageCenterButtonBar::ViewVisibil
-                     0,
-                     0);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // The close-bubble button.
-   column->AddColumn(views::GridLayout::LEADING,
-                     views::GridLayout::LEADING,
-@@ -247,7 +247,7 @@ void MessageCenterButtonBar::ViewVisibil
-     layout->AddView(title_arrow_);
-   layout->AddView(notification_label_);
-   layout->AddView(button_container_);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   layout->AddView(close_bubble_button_);
- #endif
- }
-@@ -316,7 +316,7 @@ void MessageCenterButtonBar::ButtonPress
-     else
-       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
-     quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   } else if (sender == close_bubble_button_) {
-     message_center_view()->tray()->HideMessageCenterBubble();
- #endif
diff --git a/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.h b/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.h
deleted file mode 100644
index 35f4a1ade207..000000000000
--- a/www/iridium/files/patch-ui_message__center_views_message__center__button__bar.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/message_center/views/message_center_button_bar.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/message_center/views/message_center_button_bar.h
-@@ -78,7 +78,7 @@ class MessageCenterButtonBar : public vi
-   // close-on-deactivation is off. This is a tentative solution. Once pkotwicz
-   // Fixes the problem of focus-follow-mouse, close-on-deactivation will be
-   // back and this field will be removed. See crbug.com/319516.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   views::ImageButton* close_bubble_button_;
- #endif
- 
diff --git a/www/iridium/files/patch-ui_message__center_views_message__view__factory.cc b/www/iridium/files/patch-ui_message__center_views_message__view__factory.cc
index e0b64bbc403d..523a0ce364eb 100644
--- a/www/iridium/files/patch-ui_message__center_views_message__view__factory.cc
+++ b/www/iridium/files/patch-ui_message__center_views_message__view__factory.cc
@@ -1,6 +1,6 @@
---- ui/message_center/views/message_view_factory.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/message_center/views/message_view_factory.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/message_center/views/message_view_factory.cc
-@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(
+@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(MessageCenterC
        notification_view = new NotificationView(controller, notification);
    }
  
diff --git a/www/iridium/files/patch-ui_native_theme_native_theme.h b/www/iridium/files/patch-ui_native_theme_native_theme.h
new file mode 100644
index 000000000000..4a8391ba8019
--- /dev/null
+++ b/www/iridium/files/patch-ui_native_theme_native_theme.h
@@ -0,0 +1,11 @@
+--- ui/native_theme/native_theme.h.orig	2017-09-07 02:03:42.878086000 +0200
++++ ui/native_theme/native_theme.h	2017-09-07 02:04:02.716811000 +0200
+@@ -47,7 +47,7 @@
+   // The part to be painted / sized.
+   enum Part {
+     kCheckbox,
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     kFrameTopArea,
+ #endif
+     kInnerSpinButton,
diff --git a/www/iridium/files/patch-ui_native_theme_native_theme_base.cc b/www/iridium/files/patch-ui_native_theme_native_theme_base.cc
new file mode 100644
index 000000000000..ac0188d60d35
--- /dev/null
+++ b/www/iridium/files/patch-ui_native_theme_native_theme_base.cc
@@ -0,0 +1,11 @@
+--- ui/native_theme/native_theme_base.cc.orig	2017-09-07 02:01:55.087892000 +0200
++++ ui/native_theme/native_theme_base.cc	2017-09-07 02:02:23.038570000 +0200
+@@ -172,7 +172,7 @@
+     case kCheckbox:
+       PaintCheckbox(canvas, state, rect, extra.button);
+       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;
diff --git a/www/iridium/files/patch-ui_resources_ui__resources.grd b/www/iridium/files/patch-ui_resources_ui__resources.grd
deleted file mode 100644
index ea1581f68241..000000000000
--- a/www/iridium/files/patch-ui_resources_ui__resources.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/resources/ui_resources.grd.orig	2017-04-19 19:06:54 UTC
-+++ ui/resources/ui_resources.grd
-@@ -15,7 +15,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 and use_aura">
-+      <if expr="(is_linux or is_bsd) and use_aura">
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
diff --git a/www/iridium/files/patch-ui_strings_app_locale_settings.grd b/www/iridium/files/patch-ui_strings_app_locale_settings.grd
new file mode 100644
index 000000000000..bcd14612c2f9
--- /dev/null
+++ b/www/iridium/files/patch-ui_strings_app_locale_settings.grd
@@ -0,0 +1,11 @@
+--- ui/strings/app_locale_settings.grd.orig	2017-09-07 19:24:56.013911000 +0200
++++ ui/strings/app_locale_settings.grd	2017-09-07 19:26:00.987366000 +0200
+@@ -187,7 +187,7 @@
+           75%
+         </message>
+       </if>
+-      <if expr="(is_linux or is_android or is_bsd) and not chromeos">
++      <if expr="is_posix and not chromeos">
+         <!-- The font used in Web UI (e.g. History). Note that these are only
+              backups. We try to use the system font if possible. -->
+         <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
diff --git a/www/iridium/files/patch-ui_views_BUILD.gn b/www/iridium/files/patch-ui_views_BUILD.gn
deleted file mode 100644
index e1e373e4aaf2..000000000000
--- a/www/iridium/files/patch-ui_views_BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/views/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/views/BUILD.gn
-@@ -457,7 +457,7 @@ component("views") {
-   if (use_x11 && !is_chromeos) {
-     deps += [ "//ui/display/util" ]
-   }
--  if (is_linux && !is_chromeos) {
-+  if ((is_linux || is_bsd) && !is_chromeos) {
-     sources -= [ "window/window_button_order_provider.cc" ]
-     deps += [ "//ui/shell_dialogs" ]
-   } else {
-@@ -645,7 +645,7 @@ component("views") {
-           "widget/desktop_aura/desktop_window_tree_host_ozone.cc",
-         ]
-       }
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         sources += [ "style/platform_style_linux.cc" ]
-       }
-     }
diff --git a/www/iridium/files/patch-ui_views_accessibility_native__view__accessibility.h b/www/iridium/files/patch-ui_views_accessibility_native__view__accessibility.h
deleted file mode 100644
index 42a38a53c1aa..000000000000
--- a/www/iridium/files/patch-ui_views_accessibility_native__view__accessibility.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/accessibility/native_view_accessibility.h.orig	2017-04-19 19:06:54 UTC
-+++ ui/views/accessibility/native_view_accessibility.h
-@@ -27,7 +27,7 @@
- #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
- #endif
- 
--#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS)
- #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
- #endif
- 
diff --git a/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc b/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
index c0c37f6595ef..d484e65fe1af 100644
--- a/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
+++ b/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/bubble/bubble_dialog_delegate.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/views/bubble/bubble_dialog_delegate.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/bubble/bubble_dialog_delegate.cc
-@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::Create
+@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
    // the parent frame and let DWM handle compositing.  If not, then we don't
    // want to allow the bubble to extend the frame because it will be clipped.
    bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
diff --git a/www/iridium/files/patch-ui_views_controls_label.cc b/www/iridium/files/patch-ui_views_controls_label.cc
index 47a6cd875be2..9a3e5f9998c8 100644
--- a/www/iridium/files/patch-ui_views_controls_label.cc
+++ b/www/iridium/files/patch-ui_views_controls_label.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/label.cc.orig	2017-04-19 19:06:54 UTC
+--- ui/views/controls/label.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/controls/label.cc
-@@ -549,7 +549,7 @@ bool Label::OnMousePressed(const ui::Mou
+@@ -553,7 +553,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
      GetFocusManager()->SetFocusedView(this);
    }
  
@@ -9,7 +9,7 @@
    if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus)
      GetFocusManager()->SetFocusedView(this);
  #endif
-@@ -725,7 +725,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() {
  }
  
  void Label::UpdateSelectionClipboard() {
diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
index 675e3c0f8692..a5c558313bca 100644
--- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2017-04-19 19:06:54 UTC
-+++ ui/views/controls/textfield/textfield.cc
-@@ -54,7 +54,7 @@
+--- ui/views/controls/textfield/textfield.cc.orig	2017-07-25 21:05:19.000000000 +0200
++++ ui/views/controls/textfield/textfield.cc	2017-08-02 16:52:12.933845000 +0200
+@@ -58,7 +58,7 @@
  #include "ui/base/win/osk_display_manager.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"
-@@ -153,14 +153,14 @@ ui::TextEditCommand GetCommandForKeyEven
+@@ -165,14 +165,14 @@
      case ui::VKEY_BACK:
        if (!control)
          return ui::TextEditCommand::DELETE_BACKWARD;
@@ -26,7 +26,16 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift && control)
          return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -606,7 +606,7 @@ bool Textfield::OnMousePressed(const ui:
+@@ -233,7 +233,7 @@
+ // Control-modified key combination, but we cannot extend it to other platforms
+ // as Control has different meanings and behaviors.
+ // https://crrev.com/2580483002/#msg46
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   return flags & ui::EF_CONTROL_DOWN;
+ #else
+   return false;
+@@ -619,7 +619,7 @@
      ShowImeIfNeeded();
    }
  
@@ -35,7 +44,7 @@
    if (!handled && !had_focus && event.IsOnlyMiddleMouseButton())
      RequestFocus();
  #endif
-@@ -645,7 +645,7 @@ bool Textfield::OnKeyPressed(const ui::K
+@@ -658,7 +658,7 @@
    if (!textfield)
      return handled;
  
@@ -44,7 +53,7 @@
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -785,7 +785,7 @@ void Textfield::AboutToRequestFocusFromT
+@@ -801,7 +801,7 @@
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -53,16 +62,7 @@
    // Skip any accelerator handling that conflicts with custom keybindings.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
-@@ -1076,7 +1076,7 @@ void Textfield::WriteDragDataForView(Vie
- 
-   SkBitmap bitmap;
-   float raster_scale = ScaleFactorForDragFromWidget(GetWidget());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Desktop Linux Aura does not yet support transparency in drag images.
-   SkColor color = GetBackgroundColor();
- #else
-@@ -1873,7 +1873,7 @@ bool Textfield::PasteSelectionClipboard(
+@@ -1897,7 +1897,7 @@
  }
  
  void Textfield::UpdateSelectionClipboard() {
diff --git a/www/iridium/files/patch-ui_views_controls_webview_BUILD.gn b/www/iridium/files/patch-ui_views_controls_webview_BUILD.gn
deleted file mode 100644
index 10c48d780caa..000000000000
--- a/www/iridium/files/patch-ui_views_controls_webview_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/controls/webview/BUILD.gn.orig	2017-04-19 19:06:54 UTC
-+++ ui/views/controls/webview/BUILD.gn
-@@ -39,7 +39,7 @@ component("webview") {
-     "//ui/views",
-   ]
- 
--  if (is_linux || is_android) {
-+  if (is_linux || is_bsd || is_android) {
-     sources += [ "unhandled_keyboard_event_handler_default.cc" ]
-   }
- }
diff --git a/www/iridium/files/patch-ui_views_examples_widget__example.cc b/www/iridium/files/patch-ui_views_examples_widget__example.cc
index 570aa282d0ad..fff47b1fd49e 100644
--- a/www/iridium/files/patch-ui_views_examples_widget__example.cc
+++ b/www/iridium/files/patch-ui_views_examples_widget__example.cc
@@ -1,6 +1,6 @@
---- ui/views/examples/widget_example.cc.orig	2017-04-19 19:06:55 UTC
+--- ui/views/examples/widget_example.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/examples/widget_example.cc
-@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(Vi
+@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(View* container)
    BuildButton(container, "Popup widget", POPUP);
    BuildButton(container, "Dialog widget", DIALOG);
    BuildButton(container, "Modal Dialog", MODAL_DIALOG);
diff --git a/www/iridium/files/patch-ui_views_mus_BUILD.gn b/www/iridium/files/patch-ui_views_mus_BUILD.gn
deleted file mode 100644
index 0b108f5ca4a7..000000000000
--- a/www/iridium/files/patch-ui_views_mus_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/mus/BUILD.gn.orig	2017-04-19 19:06:55 UTC
-+++ ui/views/mus/BUILD.gn
-@@ -79,7 +79,7 @@ component("mus") {
-     "//ui/wm",
-   ]
- 
--  if (is_linux && !is_android) {
-+  if ((is_linux || is_bsd) && !is_android) {
-     deps += [ "//components/font_service/public/cpp" ]
-     data_deps = [
-       "//components/font_service",
diff --git a/www/iridium/files/patch-ui_views_mus_aura__init.cc b/www/iridium/files/patch-ui_views_mus_aura__init.cc
index a6f0483ea51b..6026fda14e96 100644
--- a/www/iridium/files/patch-ui_views_mus_aura__init.cc
+++ b/www/iridium/files/patch-ui_views_mus_aura__init.cc
@@ -1,24 +1,15 @@
---- ui/views/mus/aura_init.cc.orig	2017-04-19 19:06:55 UTC
-+++ ui/views/mus/aura_init.cc
-@@ -22,7 +22,7 @@
- #include "ui/views/mus/mus_client.h"
+--- ui/views/mus/aura_init.cc.orig	2018-06-13 00:11:10.000000000 +0200
++++ ui/views/mus/aura_init.cc	2018-07-19 22:04:02.069063000 +0200
+@@ -24,7 +24,7 @@
+ #include "ui/views/style/typography_provider.h"
  #include "ui/views/views_delegate.h"
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
- #include "components/font_service/public/cpp/font_loader.h"
+ #include "components/services/font/public/cpp/font_loader.h"
+ #include "ui/gfx/platform_font_linux.h"
  #endif
- 
-@@ -69,7 +69,7 @@ AuraInit::AuraInit(service_manager::Conn
-   InitializeResources(connector);
- 
- // Initialize the skia font code to go ask fontconfig underneath.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
-   SkFontConfigInterface::SetGlobal(font_loader_.get());
- #endif
-@@ -82,7 +82,7 @@ AuraInit::AuraInit(service_manager::Conn
+@@ -59,7 +59,7 @@
  }
  
  AuraInit::~AuraInit() {
@@ -27,3 +18,12 @@
    if (font_loader_.get()) {
      SkFontConfigInterface::SetGlobal(nullptr);
      // FontLoader is ref counted. We need to explicitly shutdown the background
+@@ -112,7 +112,7 @@
+   }
+ 
+ // Initialize the skia font code to go ask fontconfig underneath.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
+   SkFontConfigInterface::SetGlobal(font_loader_.get());
+ 
diff --git a/www/iridium/files/patch-ui_views_selection__controller.cc b/www/iridium/files/patch-ui_views_selection__controller.cc
index 0857239cd117..19120a88405b 100644
--- a/www/iridium/files/patch-ui_views_selection__controller.cc
+++ b/www/iridium/files/patch-ui_views_selection__controller.cc
@@ -1,6 +1,6 @@
---- ui/views/selection_controller.cc.orig	2017-04-19 19:06:55 UTC
+--- ui/views/selection_controller.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/selection_controller.cc
-@@ -20,7 +20,7 @@ SelectionController::SelectionController
+@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont
        delegate_(delegate),
        handles_selection_clipboard_(false) {
  // On Linux, update the selection clipboard on a text selection.
diff --git a/www/iridium/files/patch-ui_views_views__delegate.cc b/www/iridium/files/patch-ui_views_views__delegate.cc
index d9ce07c7bf3c..b8a1ae92e96a 100644
--- a/www/iridium/files/patch-ui_views_views__delegate.cc
+++ b/www/iridium/files/patch-ui_views_views__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/views_delegate.cc.orig	2017-04-19 19:06:55 UTC
+--- ui/views/views_delegate.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/views_delegate.cc
-@@ -71,7 +71,7 @@ HICON ViewsDelegate::GetDefaultWindowIco
+@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
    return false;
  }
diff --git a/www/iridium/files/patch-ui_views_views__delegate.h b/www/iridium/files/patch-ui_views_views__delegate.h
index 01a5548f5aa6..36b55522a7fd 100644
--- a/www/iridium/files/patch-ui_views_views__delegate.h
+++ b/www/iridium/files/patch-ui_views_views__delegate.h
@@ -1,6 +1,6 @@
---- ui/views/views_delegate.h.orig	2017-04-19 19:06:55 UTC
+--- ui/views/views_delegate.h.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/views_delegate.h
-@@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -161,7 +161,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;
diff --git a/www/iridium/files/patch-ui_views_views__switches.cc b/www/iridium/files/patch-ui_views_views__switches.cc
deleted file mode 100644
index fecb628c05e9..000000000000
--- a/www/iridium/files/patch-ui_views_views__switches.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/views_switches.cc.orig	2017-04-19 19:06:55 UTC
-+++ ui/views/views_switches.cc
-@@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti
-     "disable-views-rect-based-targeting";
- 
- bool IsRectBasedTargetingEnabled() {
--#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-       kDisableViewsRectBasedTargeting);
- #else
diff --git a/www/iridium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc b/www/iridium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc
new file mode 100644
index 000000000000..e5502e16089d
--- /dev/null
+++ b/www/iridium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc
@@ -0,0 +1,18 @@
+--- ui/views/widget/desktop_aura/desktop_screen_x11.cc.orig	2018-06-13 00:11:10.000000000 +0200
++++ ui/views/widget/desktop_aura/desktop_screen_x11.cc	2018-07-20 17:57:12.071809000 +0200
+@@ -216,8 +216,13 @@
+   if (host) {
+     DesktopWindowTreeHostX11* rwh = DesktopWindowTreeHostX11::GetHostForXID(
+         host->GetAcceleratedWidget());
+-    if (rwh)
+-      return GetDisplayMatching(rwh->GetX11RootWindowBounds());
++    if (rwh) {
++      const float scale = 1.0f / GetDeviceScaleFactor();
++      const gfx::Rect pixel_rect = rwh->GetX11RootWindowBounds();
++      return GetDisplayMatching(
++          gfx::Rect(gfx::ScaleToFlooredPoint(pixel_rect.origin(), scale),
++                    gfx::ScaleToCeiledSize(pixel_rect.size(), scale)));
++    }
+   }
+ 
+   return GetPrimaryDisplay();
diff --git a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
index 76e8b978a6a5..9bff3bfa6c9e 100644
--- a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,6 +1,6 @@
---- ui/views/window/custom_frame_view.cc.orig	2017-04-19 19:06:55 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/window/custom_frame_view.cc
-@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderH
+@@ -302,7 +302,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.
diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
index 75ec2f453045..a483a8a79380 100644
--- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2017-04-19 19:06:55 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2017-06-05 19:03:30 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDi
+@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
    params.bounds = bounds;
    DialogDelegate* dialog = delegate->AsDialogDelegate();
  
diff --git a/www/iridium/files/patch-ui_views_window_frame_background.cc b/www/iridium/files/patch-ui_views_window_frame_background.cc
new file mode 100644
index 000000000000..7b35800b9beb
--- /dev/null
+++ b/www/iridium/files/patch-ui_views_window_frame_background.cc
@@ -0,0 +1,11 @@
+--- ui/views/window/frame_background.cc.orig	2017-09-07 02:06:18.851705000 +0200
++++ ui/views/window/frame_background.cc	2017-09-07 02:06:40.569927000 +0200
+@@ -173,7 +173,7 @@
+ 
+ void FrameBackground::PaintFrameTopArea(gfx::Canvas* canvas,
+                                         const View* view) const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   auto* native_theme = view->GetNativeTheme();
+   ui::NativeTheme::ExtraParams params;
+   params.frame_top_area.use_custom_frame = use_custom_frame_;
diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn
index fdc21e52a427..7cad5b779cb4 100644
--- a/www/iridium/files/patch-v8_BUILD.gn
+++ b/www/iridium/files/patch-v8_BUILD.gn
@@ -1,7 +1,7 @@
---- v8/BUILD.gn.orig	2017-04-19 19:07:57 UTC
-+++ v8/BUILD.gn
-@@ -2336,7 +2336,7 @@ v8_component("v8_libbase") {
-     sources += [ "src/base/platform/platform-posix.cc" ]
+--- v8/BUILD.gn.orig	2018-05-09 21:07:43.000000000 +0200
++++ v8/BUILD.gn	2018-08-16 13:25:02.667425000 +0200
+@@ -2721,7 +2721,7 @@
+     }
    }
  
 -  if (is_linux) {
@@ -9,7 +9,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -2346,6 +2346,12 @@ v8_component("v8_libbase") {
+@@ -2741,6 +2741,12 @@
        "dl",
        "rt",
      ]
@@ -22,7 +22,7 @@
    } else if (is_android) {
      if (current_toolchain == host_toolchain) {
        libs = [
-@@ -2479,6 +2485,7 @@ if (current_toolchain == v8_snapshot_too
+@@ -2909,6 +2915,7 @@
      sources = [
        "src/snapshot/mksnapshot.cc",
      ]
diff --git a/www/iridium/files/patch-v8_include_v8-platform.h b/www/iridium/files/patch-v8_include_v8-platform.h
new file mode 100644
index 000000000000..e64286dccf91
--- /dev/null
+++ b/www/iridium/files/patch-v8_include_v8-platform.h
@@ -0,0 +1,10 @@
+--- v8/include/v8-platform.h.orig	2018-08-17 18:56:46.763426000 +0200
++++ v8/include/v8-platform.h	2018-08-17 18:57:20.212630000 +0200
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <stdlib.h>
+ #include <memory>
+ #include <string>
+ 
diff --git a/www/iridium/files/patch-v8_src_base_cpu.cc b/www/iridium/files/patch-v8_src_base_cpu.cc
new file mode 100644
index 000000000000..c653251f6a07
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_base_cpu.cc
@@ -0,0 +1,18 @@
+--- v8/src/base/cpu.cc.orig	2017-09-11 03:04:32.333164000 +0200
++++ v8/src/base/cpu.cc	2017-09-11 03:05:48.364215000 +0200
+@@ -607,6 +607,7 @@
+ 
+ #elif V8_HOST_ARCH_ARM64
+ 
++#if V8_OS_LINUX
+   CPUInfo cpu_info;
+ 
+   // Extract implementor from the "CPU implementer" field.
+@@ -640,6 +641,7 @@
+     }
+     delete[] part;
+   }
++#endif
+ 
+ #elif V8_HOST_ARCH_PPC
+ 
diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
index cdef6c4ec294..7577a15bfbcb 100644
--- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,17 +1,6 @@
---- v8/src/base/platform/platform-posix.cc.orig	2017-04-19 19:07:57 UTC
-+++ v8/src/base/platform/platform-posix.cc
-@@ -27,6 +27,10 @@
- #include <sys/sysctl.h>  // NOLINT, for sysctl
- #endif
- 
-+#if V8_OS_NETBSD
-+#include <lwp.h>       // for _lwp_self
-+#endif
-+
- #undef MAP_TYPE
- 
- #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
-@@ -352,6 +356,12 @@ int OS::GetCurrentThreadId() {
+--- v8/src/base/platform/platform-posix.cc.orig	2018-02-24 16:26:18.000000000 +0100
++++ v8/src/base/platform/platform-posix.cc	2018-03-04 05:02:38.985674000 +0100
+@@ -459,6 +459,12 @@
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
@@ -23,4 +12,4 @@
 +  return static_cast<int>(_lwp_self());
  #elif V8_OS_AIX
    return static_cast<int>(thread_self());
- #elif V8_OS_SOLARIS
+ #elif V8_OS_FUCHSIA
diff --git a/www/iridium/files/patch-v8_src_globals.h b/www/iridium/files/patch-v8_src_globals.h
index 54aac95e5f27..a6e93c6b6005 100644
--- a/www/iridium/files/patch-v8_src_globals.h
+++ b/www/iridium/files/patch-v8_src_globals.h
@@ -1,14 +1,14 @@
---- v8/src/globals.h.orig	2017-04-19 19:07:57 UTC
-+++ v8/src/globals.h
-@@ -183,7 +183,11 @@ const size_t kCodeRangeAreaAlignment = 2
- const size_t kMaximalCodeRangeSize = 512 * MB;
- const size_t kCodeRangeAreaAlignment = 64 * KB;  // OS page on PPC Linux
+--- v8/src/globals.h.orig	2018-08-16 12:05:52.848951000 +0200
++++ v8/src/globals.h	2018-08-16 12:07:04.615399000 +0200
+@@ -196,7 +196,11 @@
+ constexpr size_t kMaximalCodeRangeSize = 512 * MB;
+ constexpr size_t kCodeRangeAreaAlignment = 64 * KB;  // OS page on PPC Linux
  #else
 +#if defined(__FreeBSD__)
-+const size_t kMaximalCodeRangeSize = 256 * MB;
+ constexpr size_t kMaximalCodeRangeSize = 512 * MB;
 +#else
- const size_t kMaximalCodeRangeSize = 512 * MB;
++constexpr size_t kMaximalCodeRangeSize = 512 * MB;
 +#endif
- const size_t kCodeRangeAreaAlignment = 4 * KB;  // OS page.
+ constexpr size_t kCodeRangeAreaAlignment = 4 * KB;  // OS page.
  #endif
  #if V8_OS_WIN
diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside.cc
new file mode 100644
index 000000000000..c7ac733776bf
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside.cc
@@ -0,0 +1,16 @@
+--- v8/src/trap-handler/handler-inside.cc.orig	2018-08-16 12:03:47.253591000 +0200
++++ v8/src/trap-handler/handler-inside.cc	2018-08-16 12:04:41.967410000 +0200
+@@ -36,11 +36,13 @@
+ 
+ namespace {
+ 
++#if V8_TRAP_HANDLER_SUPPORTED && V8_OS_LINUX
+ bool IsKernelGeneratedSignal(siginfo_t* info) {
+   return info->si_code > 0 && info->si_code != SI_USER &&
+          info->si_code != SI_QUEUE && info->si_code != SI_TIMER &&
+          info->si_code != SI_ASYNCIO && info->si_code != SI_MESGQ;
+ }
++#endif
+ 
+ #if V8_TRAP_HANDLER_SUPPORTED
+ class SigUnmaskStack {
diff --git a/www/iridium/files/patch-v8_src_wasm_wasm-result.h b/www/iridium/files/patch-v8_src_wasm_wasm-result.h
deleted file mode 100644
index e83a461c07a8..000000000000
--- a/www/iridium/files/patch-v8_src_wasm_wasm-result.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- v8/src/wasm/wasm-result.h.orig	2017-05-02 19:04:10 UTC
-+++ v8/src/wasm/wasm-result.h
-@@ -5,6 +5,7 @@
- #ifndef V8_WASM_RESULT_H_
- #define V8_WASM_RESULT_H_
- 
-+#include <cstdarg>
- #include <memory>
- 
- #include "src/base/compiler-specific.h"
diff --git a/www/iridium/files/pkg-message.in b/www/iridium/files/pkg-message.in
new file mode 100644
index 000000000000..4707ddcb41a2
--- /dev/null
+++ b/www/iridium/files/pkg-message.in
@@ -0,0 +1,21 @@
+--I--
+For correct operation, shared memory support has to be enabled
+in Iridium by performing the following command as root :
+
+	# sysctl kern.ipc.shm_allow_removed=1
+
+To preserve this setting across reboots, append the following
+to /etc/sysctl.conf :
+
+	kern.ipc.shm_allow_removed=1
+
+FreeBSD 11.0-RELEASE and newer have this set by default.
+
+--II--
+Iridium 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.
diff --git a/www/iridium/files/sndio_input.cc b/www/iridium/files/sndio_input.cc
index 948fb1089f7c..4a00d8ac1083 100644
--- a/www/iridium/files/sndio_input.cc
+++ b/www/iridium/files/sndio_input.cc
@@ -15,11 +15,13 @@
 
 namespace media {
 
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
 void sndio_in_onmove(void *arg, int delta) {
   NOTIMPLEMENTED();
   SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
 
-  self->hw_delay_ = delta - self->params_.GetBytesPerFrame();
+  self->hw_delay_ = delta - self->params_.GetBytesPerFrame(kSampleFormat);
 }
 
 void *sndio_in_threadstart(void *arg) {
@@ -36,9 +38,7 @@ SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* audio_manager,
     : audio_manager_(audio_manager),
       device_name_(device_name),
       params_(params),
-      bytes_per_buffer_(params.frames_per_buffer() *
-                        (params.channels() * params.bits_per_sample()) /
-                        8),
+      bytes_per_buffer_(params.GetBytesPerBuffer(kSampleFormat)),
       buffer_duration_(base::TimeDelta::FromMicroseconds(
           params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
           static_cast<float>(params.sample_rate()))),
@@ -66,7 +66,7 @@ bool SndioAudioInputStream::Open() {
   sio_initpar(&par);
   par.rate = params_.sample_rate();
   par.pchan = params_.channels();
-  par.bits = params_.bits_per_sample();
+  par.bits = SampleFormatToBytesPerChannel(kSampleFormat);
   par.bps = par.bits / 8;
   par.sig = sig = par.bits != 8 ? 1 : 0;
   par.le = SIO_LE_NATIVE;
@@ -88,7 +88,7 @@ bool SndioAudioInputStream::Open() {
 
   if (par.rate  != (unsigned int)params_.sample_rate() ||
       par.pchan != (unsigned int)params_.channels() ||
-      par.bits  != (unsigned int)params_.bits_per_sample() ||
+      par.bits  != (unsigned int)SampleFormatToBytesPerChannel(kSampleFormat) ||
       par.sig   != (unsigned int)sig ||
       (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
       (par.bits != par.bps * 8)) {
@@ -121,31 +121,6 @@ void SndioAudioInputStream::Start(AudioInputCallback* callback) {
 
 void SndioAudioInputStream::ReadAudio() {
   NOTIMPLEMENTED();
-  DCHECK(callback_);
-
-  int num_buffers = sndio_rec_bufsize_ / params_.frames_per_buffer();
-  double normalized_volume = 0.0;
-
-  // Update the AGC volume level once every second. Note that, |volume| is
-  // also updated each time SetVolume() is called through IPC by the
-  // render-side AGC.
-  GetAgcVolume(&normalized_volume);
-
-  while (num_buffers--) {
-    int frames_read = sio_read(device_handle_, audio_buffer_.get(),
-                                         params_.frames_per_buffer());
-    if (frames_read == params_.frames_per_buffer()) {
-      audio_bus_->FromInterleaved(audio_buffer_.get(),
-                                  audio_bus_->frames(),
-                                  params_.bits_per_sample() / 8);
-      callback_->OnData(
-          this, audio_bus_.get(), hw_delay_, normalized_volume);
-    } else {
-      LOG(WARNING) << "sio_read() returning less than expected frames: "
-                   << frames_read << " vs. " << params_.frames_per_buffer()
-                   << ". Dropping this buffer.";
-    }
-  }
 }
 
 void SndioAudioInputStream::Stop() {
@@ -187,4 +162,9 @@ bool SndioAudioInputStream::IsMuted() {
   return false;
 }
 
+void SndioAudioInputStream::SetOutputDeviceForAec(
+    const std::string& output_device_id) {
+// Not supported. Do nothing.
+}
+
 }  // namespace media
diff --git a/www/iridium/files/sndio_input.h b/www/iridium/files/sndio_input.h
index b354f66fd55a..2f3fca97a3a3 100644
--- a/www/iridium/files/sndio_input.h
+++ b/www/iridium/files/sndio_input.h
@@ -59,6 +59,7 @@ class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
   void SetVolume(double volume) override;
   double GetVolume() override;
   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);
diff --git a/www/iridium/files/sndio_output.cc b/www/iridium/files/sndio_output.cc
index 27c6c1db285a..e9053d34b8aa 100644
--- a/www/iridium/files/sndio_output.cc
+++ b/www/iridium/files/sndio_output.cc
@@ -11,6 +11,8 @@
 
 namespace media {
 
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
 void sndio_onmove(void *arg, int delta) {
   SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
 
@@ -35,7 +37,7 @@ SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
     : manager(manager),
       params(params),
       audio_bus(AudioBus::Create(params)),
-      bytes_per_frame(params.GetBytesPerFrame()),
+      bytes_per_frame(params.GetBytesPerFrame(kSampleFormat)),
       state(kClosed),
       mutex(PTHREAD_MUTEX_INITIALIZER) {
 }
@@ -57,7 +59,7 @@ bool SndioAudioOutputStream::Open() {
   sio_initpar(&par);
   par.rate = params.sample_rate();
   par.pchan = params.channels();
-  par.bits = params.bits_per_sample();
+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
   par.bps = par.bits / 8;
   par.sig = sig = par.bits != 8 ? 1 : 0;
   par.le = SIO_LE_NATIVE;
@@ -74,7 +76,7 @@ bool SndioAudioOutputStream::Open() {
   }
   if (par.rate  != (unsigned int)params.sample_rate() ||
       par.pchan != (unsigned int)params.channels() ||
-      par.bits  != (unsigned int)params.bits_per_sample() ||
+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
       par.sig   != (unsigned int)sig ||
       (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
       (par.bits != par.bps * 8)) {
@@ -84,7 +86,7 @@ bool SndioAudioOutputStream::Open() {
   state = kStopped;
   volpending = 0;
   vol = 0;
-  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame()];
+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
   sio_onmove(hdl, sndio_onmove, this);
   sio_onvol(hdl, sndio_onvol, this);
   return true;
@@ -153,16 +155,16 @@ void SndioAudioOutputStream::RealTimeThread(void) {
     // Get data to play
     const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, params.sample_rate() * 1000);
     count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
-    audio_bus->ToInterleaved(count, params.bits_per_sample() / 8, buffer);
+    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
     if (count == 0) {
       // We have to submit something to the device
       count = audio_bus->frames();
-      memset(buffer, 0, count * params.GetBytesPerFrame());
+      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
       LOG(WARNING) << "No data to play, running empty cycle.";
     }
 
     // Submit data to the device
-    avail = count * params.GetBytesPerFrame();
+    avail = count * params.GetBytesPerFrame(kSampleFormat);
     count = sio_write(hdl, buffer, avail);
     if (count == 0) {
       LOG(WARNING) << "Audio device disconnected.";
diff --git a/www/iridium/pkg-message b/www/iridium/pkg-message
deleted file mode 100644
index 67852afb94e6..000000000000
--- a/www/iridium/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
---I--
-For correct operation, shared memory support has to be enabled
-in Iridium by performing the following command as root :
-
-# sysctl kern.ipc.shm_allow_removed=1
-
-To preserve this setting across reboots, append the following
-to /etc/sysctl.conf :
-
-kern.ipc.shm_allow_removed=1
-
-FreeBSD 11.0-R and newer have this set by default.
-
---II--
-Iridium has a known problem of hanging tabs. The workaround
-for this problem is to mount ~/.cache/iridium as memory-fs.
-In order to do this, before you run iridium, please run these
-commands once as root for each user who uses iridium (replace
-{user}/{group} with your user/group names):
-
-# [ -d ~{user}/.cache/iridium ] || mkdir ~{user}/.cache/iridium
-# echo "md $(echo ~{user})/.cache/iridium mfs rw,late,-w{user}:{group},-s300m 2 0" >> /etc/fstab
-# mount ~{user}/.cache/iridium
diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist
index edc9974de4dd..f4817b23c8f7 100644
--- a/www/iridium/pkg-plist
+++ b/www/iridium/pkg-plist
@@ -1,6 +1,4 @@
 bin/iridium
-man/man1/iridium.1.gz
-share/applications/iridium-browser.desktop
 %%DATADIR%%/iridium
 %%DATADIR%%/chrome_100_percent.pak
 %%DATADIR%%/chrome_200_percent.pak
@@ -8,64 +6,118 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/headless_lib.pak
 %%DATADIR%%/icudtl.dat
 %%DATADIR%%/keyboard_resources.pak
+%%DATADIR%%/libEGL.so
+%%DATADIR%%/libGLESv2.so
 %%DATADIR%%/locales/am.pak
+%%DATADIR%%/locales/am.pak.info
 %%DATADIR%%/locales/ar.pak
+%%DATADIR%%/locales/ar.pak.info
 %%DATADIR%%/locales/bg.pak
+%%DATADIR%%/locales/bg.pak.info
 %%DATADIR%%/locales/bn.pak
+%%DATADIR%%/locales/bn.pak.info
 %%DATADIR%%/locales/ca.pak
+%%DATADIR%%/locales/ca.pak.info
 %%DATADIR%%/locales/cs.pak
+%%DATADIR%%/locales/cs.pak.info
 %%DATADIR%%/locales/da.pak
+%%DATADIR%%/locales/da.pak.info
 %%DATADIR%%/locales/de.pak
+%%DATADIR%%/locales/de.pak.info
 %%DATADIR%%/locales/el.pak
+%%DATADIR%%/locales/el.pak.info
 %%DATADIR%%/locales/en-GB.pak
+%%DATADIR%%/locales/en-GB.pak.info
 %%DATADIR%%/locales/en-US.pak
+%%DATADIR%%/locales/en-US.pak.info
 %%DATADIR%%/locales/es-419.pak
+%%DATADIR%%/locales/es-419.pak.info
 %%DATADIR%%/locales/es.pak
+%%DATADIR%%/locales/es.pak.info
 %%DATADIR%%/locales/et.pak
+%%DATADIR%%/locales/et.pak.info
 %%DATADIR%%/locales/fa.pak
+%%DATADIR%%/locales/fa.pak.info
 %%DATADIR%%/locales/fi.pak
+%%DATADIR%%/locales/fi.pak.info
 %%DATADIR%%/locales/fil.pak
+%%DATADIR%%/locales/fil.pak.info
 %%DATADIR%%/locales/fr.pak
+%%DATADIR%%/locales/fr.pak.info
 %%DATADIR%%/locales/gu.pak
+%%DATADIR%%/locales/gu.pak.info
 %%DATADIR%%/locales/he.pak
+%%DATADIR%%/locales/he.pak.info
 %%DATADIR%%/locales/hi.pak
+%%DATADIR%%/locales/hi.pak.info
 %%DATADIR%%/locales/hr.pak
+%%DATADIR%%/locales/hr.pak.info
 %%DATADIR%%/locales/hu.pak
+%%DATADIR%%/locales/hu.pak.info
 %%DATADIR%%/locales/id.pak
+%%DATADIR%%/locales/id.pak.info
 %%DATADIR%%/locales/it.pak
+%%DATADIR%%/locales/it.pak.info
 %%DATADIR%%/locales/ja.pak
+%%DATADIR%%/locales/ja.pak.info
 %%DATADIR%%/locales/kn.pak
+%%DATADIR%%/locales/kn.pak.info
 %%DATADIR%%/locales/ko.pak
+%%DATADIR%%/locales/ko.pak.info
 %%DATADIR%%/locales/lt.pak
+%%DATADIR%%/locales/lt.pak.info
 %%DATADIR%%/locales/lv.pak
+%%DATADIR%%/locales/lv.pak.info
 %%DATADIR%%/locales/ml.pak
+%%DATADIR%%/locales/ml.pak.info
 %%DATADIR%%/locales/mr.pak
+%%DATADIR%%/locales/mr.pak.info
 %%DATADIR%%/locales/ms.pak
+%%DATADIR%%/locales/ms.pak.info
 %%DATADIR%%/locales/nb.pak
+%%DATADIR%%/locales/nb.pak.info
 %%DATADIR%%/locales/nl.pak
+%%DATADIR%%/locales/nl.pak.info
 %%DATADIR%%/locales/pl.pak
+%%DATADIR%%/locales/pl.pak.info
 %%DATADIR%%/locales/pt-BR.pak
+%%DATADIR%%/locales/pt-BR.pak.info
 %%DATADIR%%/locales/pt-PT.pak
+%%DATADIR%%/locales/pt-PT.pak.info
 %%DATADIR%%/locales/ro.pak
+%%DATADIR%%/locales/ro.pak.info
 %%DATADIR%%/locales/ru.pak
+%%DATADIR%%/locales/ru.pak.info
 %%DATADIR%%/locales/sk.pak
+%%DATADIR%%/locales/sk.pak.info
 %%DATADIR%%/locales/sl.pak
+%%DATADIR%%/locales/sl.pak.info
 %%DATADIR%%/locales/sr.pak
+%%DATADIR%%/locales/sr.pak.info
 %%DATADIR%%/locales/sv.pak
+%%DATADIR%%/locales/sv.pak.info
 %%DATADIR%%/locales/sw.pak
+%%DATADIR%%/locales/sw.pak.info
 %%DATADIR%%/locales/ta.pak
+%%DATADIR%%/locales/ta.pak.info
 %%DATADIR%%/locales/te.pak
+%%DATADIR%%/locales/te.pak.info
 %%DATADIR%%/locales/th.pak
+%%DATADIR%%/locales/th.pak.info
 %%DATADIR%%/locales/tr.pak
+%%DATADIR%%/locales/tr.pak.info
 %%DATADIR%%/locales/uk.pak
+%%DATADIR%%/locales/uk.pak.info
 %%DATADIR%%/locales/vi.pak
+%%DATADIR%%/locales/vi.pak.info
 %%DATADIR%%/locales/zh-CN.pak
+%%DATADIR%%/locales/zh-CN.pak.info
 %%DATADIR%%/locales/zh-TW.pak
+%%DATADIR%%/locales/zh-TW.pak.info
 %%DATADIR%%/mksnapshot
-%%DATADIR%%/mus_app_resources_100.pak
-%%DATADIR%%/mus_app_resources_200.pak
-%%DATADIR%%/mus_app_resources_strings.pak
 %%DATADIR%%/natives_blob.bin
+%%DATADIR%%/product_logo_48.png
+%%DATADIR%%/protoc
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/inspector/Images/accelerometer-back.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png
@@ -73,10 +125,7 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/accelerometer-left.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-right.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-top.png
-%%DATADIR%%/resources/inspector/Images/audits_logo.png
-%%DATADIR%%/resources/inspector/Images/audits_logo_2x.png
-%%DATADIR%%/resources/inspector/Images/audits_logo_bw.png
-%%DATADIR%%/resources/inspector/Images/audits_logo_bw_2x.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
@@ -94,8 +143,13 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/errorWave_2x.png
 %%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/navigationControls.png
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
+%%DATADIR%%/resources/inspector/Images/nodeIcon.png
 %%DATADIR%%/resources/inspector/Images/popoverArrows.png
 %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
 %%DATADIR%%/resources/inspector/Images/profileIcon.png
@@ -110,8 +164,6 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png
-%%DATADIR%%/resources/inspector/Images/resourceGlyphs.png
-%%DATADIR%%/resources/inspector/Images/resourceGlyphs_2x.png
 %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
@@ -123,34 +175,47 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/smallIcons.png
 %%DATADIR%%/resources/inspector/Images/smallIcons_2x.png
 %%DATADIR%%/resources/inspector/Images/speech.png
-%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png
-%%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.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/whatsnew.png
 %%DATADIR%%/resources/inspector/InspectorBackendCommands.js
 %%DATADIR%%/resources/inspector/SupportedCSSProperties.js
 %%DATADIR%%/resources/inspector/Tests.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
+%%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/audits2/audits2_module.js
+%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
+%%DATADIR%%/resources/inspector/browser_console/browser_console_module.js
+%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
+%%DATADIR%%/resources/inspector/changes/changes_module.js
 %%DATADIR%%/resources/inspector/cm/cm_module.js
 %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
 %%DATADIR%%/resources/inspector/console/console_module.js
+%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js
 %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
 %%DATADIR%%/resources/inspector/coverage/coverage_module.js
+%%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
+%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
+%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
+%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
 %%DATADIR%%/resources/inspector/devices/devices_module.js
+%%DATADIR%%/resources/inspector/devtools_app.html
+%%DATADIR%%/resources/inspector/devtools_app.js
 %%DATADIR%%/resources/inspector/devtools_compatibility.js
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/diff/diff_module.js
 %%DATADIR%%/resources/inspector/elements/elements_module.js
+%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg
@@ -189,42 +254,75 @@ share/applications/iridium-browser.desktop
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
 %%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/gonzales/gonzales_module.js
+%%DATADIR%%/resources/inspector/formatter/formatter_module.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
 %%DATADIR%%/resources/inspector/heap_snapshot_worker.js
+%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
+%%DATADIR%%/resources/inspector/help/help_module.js
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
 %%DATADIR%%/resources/inspector/inspector.html
 %%DATADIR%%/resources/inspector/inspector.js
+%%DATADIR%%/resources/inspector/integration_test_runner.html
+%%DATADIR%%/resources/inspector/integration_test_runner.js
+%%DATADIR%%/resources/inspector/js_app.html
+%%DATADIR%%/resources/inspector/js_app.js
+%%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
 %%DATADIR%%/resources/inspector/layers/layers_module.js
+%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
+%%DATADIR%%/resources/inspector/ndb_app.html
+%%DATADIR%%/resources/inspector/ndb_app.js
 %%DATADIR%%/resources/inspector/network/network_module.js
-%%DATADIR%%/resources/inspector/network_group_lookup/network_group_lookup_module.js
+%%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js
+%%DATADIR%%/resources/inspector/node_app.html
+%%DATADIR%%/resources/inspector/node_app.js
+%%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
+%%DATADIR%%/resources/inspector/object_ui/object_ui_module.js
 %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js
-%%DATADIR%%/resources/inspector/product_registry/product_registry_module.js
+%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
+%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
+%%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
+%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
 %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
 %%DATADIR%%/resources/inspector/resources/resources_module.js
-%%DATADIR%%/resources/inspector/sass/sass_module.js
-%%DATADIR%%/resources/inspector/screencast/screencast_module.js
+%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
+%%DATADIR%%/resources/inspector/search/search_module.js
 %%DATADIR%%/resources/inspector/security/security_module.js
+%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js
 %%DATADIR%%/resources/inspector/settings/settings_module.js
+%%DATADIR%%/resources/inspector/shell.js
 %%DATADIR%%/resources/inspector/snippets/snippets_module.js
 %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js
 %%DATADIR%%/resources/inspector/sources/sources_module.js
+%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js
 %%DATADIR%%/resources/inspector/terminal/terminal_module.js
 %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
 %%DATADIR%%/resources/inspector/timeline/timeline_module.js
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
-%%DATADIR%%/resources/inspector/unit_test_runner.html
-%%DATADIR%%/resources/inspector/unit_test_runner.js
-%%DATADIR%%/resources/inspector/utility_shared_worker.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%%/test_ime_driver.service
-%%DATADIR%%/ui.service
+%%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