91 files changed, 969 insertions, 1195 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 9a82600dd743..4742f538f02e 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	54.0.2840.100
-PORTREVISION=	1
+PORTVERSION=	55.0.2883.87
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -14,11 +13,12 @@ COMMENT=	Google web browser based on WebKit
 LICENSE=	BSD3CLAUSE LGPL21 MPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
-		bash:shells/bash \
+BUILD_DEPENDS=	bash:shells/bash \
+		clang39:devel/llvm39 \
 		python:lang/python \
-		yasm:devel/yasm \
 		flock:sysutils/flock \
+		gperf:devel/gperf \
+		yasm:devel/yasm \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
@@ -61,7 +61,7 @@ USES=		compiler bison cpe desktop-file-utils execinfo jpeg \
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_PERL5=	build
-USE_XORG=	scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \
+USE_XORG=	scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xproto xrandr xrender xscrnsaver xtst
 USE_GNOME=	atk glib20 gtk20 dconf libxslt libxml2
 MAKE_ARGS=	-C out/${BUILDTYPE}
@@ -71,13 +71,12 @@ INSTALLS_ICONS=	yes
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
-# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all the variables.
+# Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
-GN_ARGS+=	\
+GN_ARGS+=	is_clang=true \
 		clang_use_chrome_plugins=false \
-		enable_hevc_demuxing=true \
 		enable_media_router=true \
 		enable_nacl=false \
 		enable_remoting=false \
@@ -104,12 +103,15 @@ GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
-OPTIONS_DEFINE=	ALSA CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER
+OPTIONS_DEFINE=	CODECS GCONF KERBEROS DRIVER
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
+OPTIONS_GROUP=		AUDIO TESTS
+OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
+OPTIONS_GROUP_TESTS=	DEBUG TEST
 
-OPTIONS_DEFAULT=	ALSA CODECS GCONF KERBEROS
-OPTIONS_SUB=	yes
+OPTIONS_DEFAULT=	CODECS GCONF KERBEROS ALSA PULSEAUDIO
+OPTIONS_SUB=		yes
 
 GCONF_USE=	GNOME=gconf2
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -130,9 +132,27 @@ GN_ARGS+=	use_alsa=false
 .if ${PORT_OPTIONS:MCODECS}
 GN_ARGS+=	ffmpeg_branding="Chrome"
 GN_ARGS+=	proprietary_codecs=true
+GN_ARGS+=	enable_hevc_demuxing=true
 .else
 GN_ARGS+=	ffmpeg_branding="Chromium"
 GN_ARGS+=	proprietary_codecs=false
+GN_ARGS+=	enable_hevc_demuxing=false
+.endif
+
+DEBUG_MAKE_ENV=	V=1
+.if ${PORT_OPTIONS:MDEBUG}
+BUILDTYPE=	Debug
+GN_ARGS+=	is_debug=true
+GN_BOOTSTRAP_FLAGS+=	--debug
+#GN_ARGS+=	is_component_build=true
+.else
+BUILDTYPE=	Release
+.if ${ARCH} == amd64
+GN_ARGS+=	use_lld=true # harder, better, faster, stronger
+.endif
+GN_ARGS+=	is_debug=false
+GN_ARGS+=	symbol_level=0
+GN_ARGS+=	remove_webcore_debug_symbols=true
 .endif
 
 .if ${PORT_OPTIONS:MGCONF}
@@ -141,6 +161,12 @@ GN_ARGS+=	use_gconf=true
 GN_ARGS+=	use_gconf=false
 .endif
 
+.if ${PORT_OPTIONS:MKERBEROS}
+GN_ARGS+=	use_kerberos=true
+.else
+GN_ARGS+=	use_kerberos=false
+.endif
+
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 GN_ARGS+=	use_pulseaudio=true
 .else
@@ -152,55 +178,29 @@ GN_ARGS+=	use_pulseaudio=false
 ALL_TARGET+=	${TEST_TARGETS}
 .endif
 
-DEBUG_MAKE_ENV=	V=1
-.if ${PORT_OPTIONS:MDEBUG}
-BUILDTYPE=	Debug
-GN_ARGS+=	is_debug=true
-GN_BOOTSTRAP_FLAGS+=	--debug
-#GN_ARGS+=	is_component_build = true
-.else
-BUILDTYPE=	Release
-.if ${ARCH} == amd64
-GN_ARGS+=	use_lld=true # harder, better, faster, stronger
-.endif
-GN_ARGS+=	is_debug=false
-GN_ARGS+=	symbol_level=0
-GN_ARGS+=	remove_webcore_debug_symbols=true
-.endif
-
-MAKE_ENV+=	BUILDTYPE=${BUILDTYPE} \
-		GPERF="${LOCALBASE}/bin/gperf"
-
 .include <bsd.port.pre.mk>
 
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-GN_ARGS+=	gcc_version=${CXX:S/g++//}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
-.else
-BUILD_DEPENDS+=	clang39:devel/llvm39
 CC=		clang39
 CXX=		clang++39
-# /usr/local/include unlike gcc isn't clang's default
+#optionally set AR, LD, NM, READELF ?
+
+# TODO: -isystem, would be just as ugly as this approach, but more reliably
+# build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
-GN_ARGS+=	is_clang=true
+# TODO: move this big extra to small ones
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
-.endif
 
 .if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1100508
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-old
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-new
-.endif
-
 .if ${OSVERSION} < 1100000
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-10
 .endif
-.endif
 
-.if ! ${PORT_OPTIONS:MKERBEROS}
-GN_ARGS+=	use_kerberos=true
+.if ${OSVERSION} < 1200017 || (${OSVERSION} >= 1100507 && ${OSVERSION} < 1200000)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-old
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-new
+.endif
 .endif
 
 pre-everything::
@@ -228,7 +228,8 @@ pre-configure:
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
-	cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} ${PYTHON_CMD} \
+	cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \
+		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index a0c98c59d6cd..4dd3bedca907 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1478859835
-SHA256 (chromium-54.0.2840.100.tar.xz) = e2e7f54a780c93ec2e933af09e1126837e6cf940b57213d39f36d58df10c89df
-SIZE (chromium-54.0.2840.100.tar.xz) = 479762112
-SHA256 (chromium-54.0.2840.100-testdata.tar.xz) = 44319fea6de4dbb1f6d0bbeeec633b69b7064f53a54893df5b720935a6d27460
-SIZE (chromium-54.0.2840.100-testdata.tar.xz) = 123519620
+TIMESTAMP = 1481977811
+SHA256 (chromium-55.0.2883.87.tar.xz) = e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58
+SIZE (chromium-55.0.2883.87.tar.xz) = 511249724
+SHA256 (chromium-55.0.2883.87-testdata.tar.xz) = 24ee31dfe7c665cfce5e6e826d2864292585f5b95dd5ead235d0edf89f2f38c0
+SIZE (chromium-55.0.2883.87-testdata.tar.xz) = 124466280
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 13eeca5e1b7d..378e4ea57314 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -52,17 +52,6 @@
    }
 
    // Helper function to verify the most common test expectations.
---- components/sync_sessions/synced_session_tracker.cc.orig	2016-01-21 13:04:41.772845558 +0100
-+++ components/sync_sessions/synced_session_tracker.cc	2016-01-21 13:05:17.652842509 +0100
-@@ -286,7 +286,7 @@
-   }
-   DCHECK(window_ptr);
-   DCHECK_EQ(window_ptr->window_id.id(), window_id);
--  DCHECK_EQ(reinterpret_cast<sessions::SessionWindow*>(NULL),
-+  DCHECK_EQ(static_cast<sessions::SessionWindow*>(NULL),
-             GetSession(session_tag)->windows[window_id]);
-   GetSession(session_tag)->windows[window_id] = window_ptr;
- }
 --- 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/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc
deleted file mode 100644
index 8921d4cd8065..000000000000
--- a/www/chromium/files/extra-patch-gcc
+++ /dev/null
@@ -1,317 +0,0 @@
---- media/filters/file_data_source.h.orig	2011-09-14 10:01:06.000000000 +0200
-+++ media/filters/file_data_source.h	2011-09-26 19:08:17.000000000 +0200
-@@ -5,6 +5,7 @@
- #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_
- #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_
-
-+#include <cstdio>
- #include <string>
-
- #include "base/files/file.h"
---- content/public/common/child_process_sandbox_support_linux.h.orig	2013-10-11 19:30:28.000000000 +0200
-+++ content/public/common/child_process_sandbox_support_linux.h	2013-10-16 15:29:00.000000000 +0200
-@@ -7,6 +7,7 @@
-
- #include <stdint.h>
- #include <string>
-+#include <sys/types.h>
-
- #include "content/common/content_export.h"
-
---- third_party/ffmpeg/libavutil/cpu.c.orig	2013-11-16 01:26:14.000000000 +0100
-+++ third_party/ffmpeg/libavutil/cpu.c	2013-11-19 00:24:53.000000000 +0100
-@@ -24,6 +24,9 @@
- #include "opt.h"
- #include "common.h"
-
-+/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */
-+#define __BSD_VISIBLE 1
-+
- #if HAVE_SCHED_GETAFFINITY
- #ifndef _GNU_SOURCE
- # define _GNU_SOURCE
---- content/browser/browser_shutdown_profile_dumper.cc.orig    2014-02-20 15:28:24.000000000 -0500
-+++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <stdio.h>
-+
- #include "content/browser/browser_shutdown_profile_dumper.h"
-
- #include "base/base_switches.h"
---- testing/perf/perf_test.cc	2014-03-03 12:59:30.000000000 -0500
-+++ testing/perf/perf_test.cc.orig	2014-02-20 15:28:27.000000000 -0500
-@@ -2,10 +2,10 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <stdio.h>
-+
- #include "testing/perf/perf_test.h"
-
--#include <stdio.h>
--
- #include "base/logging.h"
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/stringprintf.h"
---- ui/gfx/codec/jpeg_codec.cc.orig	2014-10-02 19:19:03.000000000 +0200
-+++ ui/gfx/codec/jpeg_codec.cc	2014-10-05 22:38:28.000000000 +0200
-@@ -13,6 +13,7 @@
-
- extern "C" {
- #if defined(USE_SYSTEM_LIBJPEG)
-+#include <stdio.h>
- #include <jpeglib.h>
- #elif defined(USE_LIBJPEG_TURBO)
- #include "third_party/libjpeg_turbo/jpeglib.h"
---- third_party/webrtc/common_audio/wav_file.h.orig	2014-10-17 02:57:34.000000000 +0200
-+++ third_party/webrtc/common_audio/wav_file.h	2014-10-18 12:04:03.000000000 +0200
-@@ -14,6 +14,7 @@
- #ifdef __cplusplus
-
- #include <stdint.h>
-+#include <stdio.h>
- #include <cstddef>
- #include <string>
-
---- v8/src/base/platform/platform.h.orig	2015-01-27 03:22:59.000000000 +0100
-+++ v8/src/base/platform/platform.h	2015-01-28 18:37:43.268781292 +0100
-@@ -22,6 +22,7 @@
- #define V8_BASE_PLATFORM_PLATFORM_H_
-
- #include <cstdarg>
-+#include <cstdio>
- #include <string>
- #include <vector>
-
---- v8/src/compiler/graph-visualizer.cc.orig	2015-04-28 22:29:10.000000000 +0200
-+++ v8/src/compiler/graph-visualizer.cc	2015-05-02 21:01:32.086593000 +0200
-@@ -5,6 +5,7 @@
- #include "src/compiler/graph-visualizer.h"
-
- #include <sstream>
-+#include <cstdio>
- #include <string>
-
- #include "src/code-stubs.h"
---- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig	2015-07-24 22:27:11.000000000 +0200
-+++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c	2015-07-26 17:38:40.937606000 +0200
-@@ -1,2 +1,3 @@
- // File automatically generated. See crbug.com/495833.
-+#define __BSD_VISIBLE 1
- #include "cpu.c"
---- v8/src/log-utils.h.orig	2015-10-13 21:04:45.000000000 +0200
-+++ v8/src/log-utils.h	2015-10-17 10:17:35.535561000 +0200
-@@ -5,6 +5,9 @@
- #ifndef V8_LOG_UTILS_H_
- #define V8_LOG_UTILS_H_
-
-+#include <cstdarg>
-+#include <cstdio>
-+
- #include "src/allocation.h"
- #include "src/base/platform/mutex.h"
- #include "src/flags.h"
---- third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc.orig	2015-10-22 21:00:59.000000000 +0200
-+++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc	2015-11-01 11:32:36.293750000 +0100
-@@ -11,6 +11,7 @@
- #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
-
- #include <algorithm>
-+#include <cstdio>
- #include <sstream>
- #include <math.h>
- #include <stdlib.h>
---- ui/gfx/color_utils.cc.orig	2016-04-06 20:35:19.306577518 +0200
-+++ ui/gfx/color_utils.cc	2016-04-06 20:35:49.282575724 +0200
-@@ -42,7 +42,7 @@
-   else if (hue * 3.0 < 2.0)
-     result = temp1 + (temp2 - temp1) * (2.0 / 3.0 - hue) * 6.0;
-
--  return static_cast<int>(std::round(result * 255));
-+  return static_cast<int>(round(result * 255));
- }
-
- // Assumes sRGB.
-@@ -85,7 +85,7 @@
- }
-
- uint8_t GetLuma(SkColor color) {
--  return static_cast<uint8_t>(std::round((0.299 * SkColorGetR(color)) +
-+  return static_cast<uint8_t>(round((0.299 * SkColorGetR(color)) +
-                                          (0.587 * SkColorGetG(color)) +
-                                          (0.114 * SkColorGetB(color))));
- }
-@@ -223,9 +223,9 @@
-     b += (255.0 - b) * ((shift.l - 0.5) * 2.0);
-   }
-   return SkColorSetARGB(alpha,
--                        static_cast<int>(std::round(r)),
--                        static_cast<int>(std::round(g)),
--                        static_cast<int>(std::round(b)));
-+                        static_cast<int>(round(r)),
-+                        static_cast<int>(round(g)),
-+                        static_cast<int>(round(b)));
- }
-
- void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) {
-@@ -275,10 +275,10 @@
-   double b = (SkColorGetB(foreground) * f_weight +
-               SkColorGetB(background) * b_weight) / 255.0;
-
--  return SkColorSetARGB(static_cast<int>(std::round(normalizer)),
--                        static_cast<int>(std::round(r)),
--                        static_cast<int>(std::round(g)),
--                        static_cast<int>(std::round(b)));
-+  return SkColorSetARGB(static_cast<int>(round(normalizer)),
-+                        static_cast<int>(round(r)),
-+                        static_cast<int>(round(g)),
-+                        static_cast<int>(round(b)));
- }
-
- bool IsDark(SkColor color) {
---- media/filters/audio_clock.cc.orig	2016-04-07 11:55:00.678817033 +0200
-+++ media/filters/audio_clock.cc	2016-04-07 11:55:28.152814716 +0200
-@@ -121,7 +121,7 @@
-   }
-
-   return base::TimeDelta::FromMicroseconds(
--      std::round(frames_until_timestamp * microseconds_per_frame_));
-+      round(frames_until_timestamp * microseconds_per_frame_));
- }
-
- void AudioClock::ContiguousAudioDataBufferedForTesting(
---- media/filters/audio_clock.h.orig	2016-04-08 14:22:02.833940146 +0200
-+++ media/filters/audio_clock.h	2016-04-08 14:22:14.433876920 +0200
-@@ -92,11 +92,11 @@
-   //                                             1000 + 500 + 250 = 1750 ms.
-   base::TimeDelta front_timestamp() const {
-     return base::TimeDelta::FromMicroseconds(
--        std::round(front_timestamp_micros_));
-+        round(front_timestamp_micros_));
-   }
-   base::TimeDelta back_timestamp() const {
-     return base::TimeDelta::FromMicroseconds(
--        std::round(back_timestamp_micros_));
-+        round(back_timestamp_micros_));
-   }
-
-   // Returns the amount of wall time until |timestamp| will be played by the
---- content/browser/web_contents/web_contents_impl.cc.orig	2016-04-08 15:44:21.989537858 +0200
-+++ content/browser/web_contents/web_contents_impl.cc	2016-04-08 15:44:44.574535099 +0200
-@@ -1597,7 +1597,7 @@
-     // Count only integer cumulative scrolls as zoom events; this handles
-     // smooth scroll and regular scroll device behavior.
-     zoom_scroll_remainder_ += event.wheelTicksY;
--    int whole_zoom_scroll_remainder_ = std::lround(zoom_scroll_remainder_);
-+    int whole_zoom_scroll_remainder_ = lround(zoom_scroll_remainder_);
-     zoom_scroll_remainder_ -= whole_zoom_scroll_remainder_;
-     if (whole_zoom_scroll_remainder_ != 0) {
-       delegate_->ContentsZoomChange(whole_zoom_scroll_remainder_ > 0);
---- chrome/browser/ui/views/frame/browser_root_view.cc.orig	2016-04-08 17:23:19.749128496 +0200
-+++ chrome/browser/ui/views/frame/browser_root_view.cc	2016-04-08 17:23:30.609126494 +0200
-@@ -139,10 +139,10 @@
-
-       // Number of integer scroll events that have passed in each direction.
-       int whole_scroll_amount_x =
--          std::lround(static_cast<double>(scroll_remainder_x_) /
-+          lround(static_cast<double>(scroll_remainder_x_) /
-                       ui::MouseWheelEvent::kWheelDelta);
-       int whole_scroll_amount_y =
--          std::lround(static_cast<double>(scroll_remainder_y_) /
-+          lround(static_cast<double>(scroll_remainder_y_) /
-                       ui::MouseWheelEvent::kWheelDelta);
-
-       // Adjust the remainder such that any whole scrolls we have taken action
---- base/process/memory.h.orig	2016-06-06 21:05:12.000000000 +0200
-+++ base/process/memory.h	2016-06-12 20:04:24.000000000 +0200
-@@ -6,6 +6,7 @@
- #define BASE_PROCESS_MEMORY_H_
-
- #include <stddef.h>
-+#include <stdlib.h>
-
- #include "base/base_export.h"
- #include "base/process/process_handle.h"
---- media/audio/audio_output_device.cc.orig	2016-06-06 21:05:19.000000000 +0200
-+++ media/audio/audio_output_device.cc	2016-06-12 20:31:58.000000000 +0200
-@@ -426,7 +426,7 @@
-   // frames, and ask client to render audio.  Since |output_bus_| is wrapping
-   // the shared memory the Render() call is writing directly into the shared
-   // memory.
--  render_callback_->Render(output_bus_.get(), std::round(frames_delayed),
-+  render_callback_->Render(output_bus_.get(), round(frames_delayed),
-                            frames_skipped);
- }
-
---- media/audio/audio_output_stream_sink.cc.orig	2016-06-06 21:05:19.000000000 +0200
-+++ media/audio/audio_output_stream_sink.cc	2016-06-12 20:35:05.000000000 +0200
-@@ -85,7 +85,7 @@
-   if (!active_render_callback_)
-     return 0;
-
--  uint32_t frames_delayed = std::round(static_cast<double>(total_bytes_delay) /
-+  uint32_t frames_delayed = round(static_cast<double>(total_bytes_delay) /
-                                        active_params_.GetBytesPerFrame());
-
-   return active_render_callback_->Render(dest, frames_delayed, frames_skipped);
---- third_party/WebKit/Source/modules/battery/battery_status.h.orig	2016-06-06 21:05:36.000000000 +0200
-+++ third_party/WebKit/Source/modules/battery/battery_status.h	2016-06-13 20:21:31.000000000 +0200
-@@ -46,7 +46,7 @@
-     // of reducing the possibility of fingerprinting and triggers less level
-     // change events on platforms where the granularity is high.
-     DCHECK(level >= 0 && level <= 1);
--    return std::round(level * 100) / 100.f;
-+    return round(level * 100) / 100.f;
-   }
-
-   bool charging_;
---- chrome/common/channel_info_posix.cc.orig	2016-06-06 21:05:14.000000000 +0200
-+++ chrome/common/channel_info_posix.cc	2016-06-13 21:36:53.000000000 +0200
-@@ -8,6 +8,8 @@
- #include "build/build_config.h"
- #include "components/version_info/version_info.h"
-
-+#include <stdlib.h>
-+
- namespace chrome {
-
- namespace {
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2016-06-06 21:05:14.000000000 +0200
-+++ chrome/browser/ui/views/tabs/tab_strip.cc	2016-06-13 22:03:03.000000000 +0200
-@@ -417,11 +417,11 @@
-     const SkColor stroke_color = tab_strip_->GetToolbarTopSeparatorColor();
-     const float alpha = SkColorGetA(stroke_color);
-     const SkAlpha shadow_alpha =
--        base::saturated_cast<SkAlpha>(std::round(2.1875f * alpha));
-+        base::saturated_cast<SkAlpha>(round(2.1875f * alpha));
-     paint.setLooper(
-         CreateShadowDrawLooper(SkColorSetA(stroke_color, shadow_alpha)));
-     const SkAlpha path_alpha = static_cast<SkAlpha>(
--        std::round((pressed ? 0.875f : 0.609375f) * alpha));
-+        round((pressed ? 0.875f : 0.609375f) * alpha));
-     paint.setColor(SkColorSetA(stroke_color, path_alpha));
-     canvas->DrawPath(stroke, paint);
-   } else {
-@@ -568,7 +568,7 @@
-       }
-       const SkColor stroke_color = tab_strip_->GetToolbarTopSeparatorColor();
-       const SkAlpha alpha = static_cast<SkAlpha>(
--          std::round(SkColorGetA(stroke_color) * 0.59375f));
-+          round(SkColorGetA(stroke_color) * 0.59375f));
-       paint.setLooper(
-           CreateShadowDrawLooper(SkColorSetA(stroke_color, alpha)));
-       canvas->DrawPath(fill, paint);
-
---- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig	2016-08-03 22:02:10.000000000 +0300
-+++ base/trace_event/heap_profiler_allocation_context_tracker.cc	2016-08-21 04:17:53.717876000 +0300
-@@ -13,6 +13,7 @@
- #include "base/threading/thread_local_storage.h"
- #include "base/trace_event/heap_profiler_allocation_context.h"
-
-+#include <stdio.h>
- #if defined(OS_LINUX) || defined(OS_ANDROID)
- #include <sys/prctl.h>
- #endif
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index f8357134fe8f..b207dec8ee74 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2016-10-06 04:02:07.000000000 +0300
-+++ BUILD.gn	2016-10-13 10:32:25.742762000 +0300
-@@ -201,7 +201,7 @@
+--- BUILD.gn.orig	2016-12-01 23:02:04 UTC
++++ BUILD.gn
+@@ -215,7 +215,7 @@ group("both_gn_and_gyp") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//chrome",
        "//chrome/test:browser_tests",
-@@ -260,7 +260,7 @@
+@@ -274,7 +274,7 @@ group("both_gn_and_gyp") {
      ]
    }
  
@@ -18,7 +18,7 @@
      # 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.
      deps += [
-@@ -300,7 +300,7 @@
+@@ -316,7 +316,7 @@ group("both_gn_and_gyp") {
        "//ui/touch_selection:ui_touch_selection_unittests",
        "//url/ipc:url_ipc_unittests",
      ]
@@ -27,7 +27,7 @@
      deps += [ "//ios:all" ]
    }
  
-@@ -457,7 +457,7 @@
+@@ -474,7 +474,7 @@ group("both_gn_and_gyp") {
      ]
    }
  
@@ -36,7 +36,7 @@
      # The following are definitely linux-only.
      deps += [
        "//chrome:manpage",
-@@ -484,9 +484,16 @@
+@@ -501,9 +501,16 @@ group("both_gn_and_gyp") {
        # TODO(dpranke): add the linux_dump_symbols flag?
        deps += [ "//chrome:linux_symbols" ]
      }
@@ -54,7 +54,7 @@
      deps += [
        "//base:base_i18n_perftests",
        "//base:base_perftests",
-@@ -555,7 +562,7 @@
+@@ -574,7 +581,7 @@ group("both_gn_and_gyp") {
      if (enable_nacl) {
        deps += [ "//components/nacl/loader:nacl_loader_unittests" ]
  
@@ -63,7 +63,7 @@
          # TODO(dpranke): Figure out what platforms should actually have this.
          deps += [ "//components/nacl/loader:nacl_helper" ]
  
-@@ -664,7 +671,7 @@
+@@ -688,7 +695,7 @@ group("both_gn_and_gyp") {
        deps +=
            [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
      }
@@ -72,8 +72,8 @@
      deps += [ "//breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -713,7 +720,7 @@
-     deps += [ "//chrome/tools/disable_outdated_build_detector" ]
+@@ -736,7 +743,7 @@ group("gn_only") {
+     ]
    }
  
 -  if (is_win || is_linux) {
@@ -81,7 +81,7 @@
      deps += [
        "//mash:all",
        "//media/mojo/services:media_mojo_shell_unittests",
-@@ -726,7 +733,7 @@
+@@ -749,7 +756,7 @@ group("gn_only") {
      ]
    }
  
@@ -90,7 +90,7 @@
      # TODO(GYP): Figure out if any of these should be in gn_all
      # and figure out how cross-platform they are
      deps += [
-@@ -793,7 +800,7 @@
+@@ -816,7 +823,7 @@ group("gn_only") {
      ]
  
      if (target_cpu == "x86" || target_cpu == "x64") {
@@ -99,7 +99,7 @@
          deps += [ "//chrome/test:load_library_perf_tests" ]
        }
        deps += [
-@@ -801,7 +808,7 @@
+@@ -824,7 +831,7 @@ group("gn_only") {
          "//third_party/libjpeg_turbo:simd_asm",
        ]
      }
@@ -108,7 +108,7 @@
        deps += [ "//v8:v8_shell" ]
      }
    }
-@@ -811,7 +818,7 @@
+@@ -834,7 +841,7 @@ group("gn_only") {
    }
  
    if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
@@ -117,7 +117,7 @@
      deps += [
        "//testing/libfuzzer/fuzzers",
        "//testing/libfuzzer/tests:libfuzzer_tests",
-@@ -847,7 +854,7 @@
+@@ -876,7 +883,7 @@ group("gn_only") {
  
  group("gn_mojo_targets") {
    testonly = true
@@ -126,7 +126,7 @@
      # TODO(GYP): Figure out if any of these should be in gn_all
      # and figure out how cross-platform they are
      deps = [
-@@ -872,7 +879,7 @@
+@@ -901,7 +908,7 @@ group("gn_visibility") {
    }
  }
  
@@ -135,7 +135,7 @@
    # This group includes all of the targets needed to build and test Blink,
    # including running the layout tests (see below).
    group("blink_tests") {
-@@ -906,7 +913,7 @@
+@@ -935,7 +942,7 @@ if (!is_ios) {
        ]
      }
  
@@ -144,21 +144,21 @@
        deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
      }
  
-@@ -935,7 +942,7 @@
+@@ -961,7 +968,7 @@ group("chromium_swarm_tests") {
  group("chromium_builder_perf") {
    testonly = true
  
 -  if (!is_ios && !is_android && !is_chromecast) {
 +  if (!is_ios && !is_android && !is_chromecast && !is_bsd) {
-     deps = [
+     data_deps = [
        "//cc:cc_perftests",
        "//chrome/test:load_library_perf_tests",
-@@ -965,7 +972,7 @@
+@@ -992,7 +999,7 @@ group("chromium_builder_perf") {
          "//chrome/installer/mini_installer:mini_installer",
          "//third_party/angle/src/tests:angle_perftests",
        ]
 -    } else {
 +    } else if (!is_bsd) {
-       deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
+       data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
      }
    }
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
index 7ffd924176c0..215e804d4825 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
@@ -1,9 +1,11 @@
---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2016-08-03 22:02:10.000000000 +0300
-+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc	2016-09-21 22:14:12.220734000 +0300
-@@ -3,17 +3,28 @@
+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2016-12-01 23:02:05 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>
@@ -25,17 +27,17 @@
 +void* __memalign(size_t alignment, size_t size) {
 +  void *ret;
 +  if (__posix_memalign(&ret, alignment, size) != 0) {
-+    return nullptr;
++      return nullptr;
 +  } else {
-+    return ret;
++      return ret;
 +  }
 +}
-+int  __posix_memalign(void **ptr, size_t alignment, size_t size);
++int __posix_memalign(void **ptr, size_t alignment, size_t size);
 +void __free(void* ptr);
  }  // extern "C"
  
  namespace {
-@@ -21,23 +32,27 @@
+@@ -23,23 +32,23 @@ namespace {
  using base::allocator::AllocatorDispatch;
  
  void* GlibcMalloc(const AllocatorDispatch*, size_t size) {
@@ -58,13 +60,9 @@
 +  return __memalign(alignment, size);
  }
  
-+/* int GlibcPosixMemalign(const AllocatorDispatch*, void** ptr, size_t alignment, size_t size) { */
-+/*   return __posix_memalign(ptr, alignment, size); */
-+/* } */
-+
  void GlibcFree(const AllocatorDispatch*, void* address) {
 -  __libc_free(address);
 +  __free(address);
  }
  
- }  // namespace
+ size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) {
diff --git a/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc b/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc
new file mode 100644
index 000000000000..658728ffd206
--- /dev/null
+++ b/www/chromium/files/patch-base_debug_scoped__thread__heap__usage.cc
@@ -0,0 +1,16 @@
+--- base/debug/scoped_thread_heap_usage.cc.orig	2016-12-12 23:57:03 UTC
++++ base/debug/scoped_thread_heap_usage.cc
+@@ -14,11 +14,13 @@
+ #include "base/threading/thread_local_storage.h"
+ #include "build/build_config.h"
+ 
++#if !defined(OS_BSD)
+ #if defined(OS_MACOSX) || defined(OS_IOS)
+ #include <malloc/malloc.h>
+ #else
+ #include <malloc.h>
+ #endif
++#endif
+ 
+ namespace base {
+ namespace debug {
diff --git a/www/chromium/files/patch-base_strings_safe__sprintf.cc b/www/chromium/files/patch-base_strings_safe__sprintf.cc
deleted file mode 100644
index 3c429468d0e0..000000000000
--- a/www/chromium/files/patch-base_strings_safe__sprintf.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- base/strings/safe_sprintf.cc.orig	2016-03-25 13:04:44 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/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index f673f726f183..0a01f11d7b11 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2016-10-06 04:02:08.000000000 +0300
-+++ build/config/compiler/BUILD.gn	2016-10-24 23:25:32.101459000 +0300
-@@ -141,7 +141,7 @@
+--- build/config/compiler/BUILD.gn.orig	2016-12-01 23:02:05 UTC
++++ build/config/compiler/BUILD.gn
+@@ -153,7 +153,7 @@ config("compiler") {
      configs += [ "//build/config/win:compiler" ]
    } else if (is_android) {
      configs += [ "//build/config/android:compiler" ]
@@ -9,7 +9,7 @@
      configs += [ "//build/config/linux:compiler" ]
    } else if (is_nacl) {
      configs += [ "//build/config/nacl:compiler" ]
-@@ -271,7 +271,7 @@
+@@ -280,7 +280,7 @@ config("compiler") {
  
    # Linux/Android common flags setup.
    # ---------------------------------
@@ -18,7 +18,7 @@
      cflags += [
        "-fPIC",
        "-pipe",  # Use pipes for communicating between sub-processes. Faster.
-@@ -376,14 +376,14 @@
+@@ -407,14 +407,14 @@ config("compiler") {
    # 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.
@@ -35,16 +35,16 @@
      # 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,
-@@ -441,7 +441,7 @@
-     ldflags += [ "-flto" ]
+@@ -464,7 +464,7 @@ config("compiler") {
+       ]
  
-     # 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 {
-@@ -460,7 +460,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 {
+@@ -484,7 +484,7 @@ config("compiler") {
      # 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).
@@ -52,8 +52,8 @@
 +    if (is_linux || is_bsd) {
        ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
      }
- 
-@@ -738,7 +738,7 @@
+   }
+@@ -755,7 +755,7 @@ config("compiler_codegen") {
  #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
  # See https://crbug.com/556393 for details of where it must be avoided.
  config("clang_stackrealign") {
@@ -62,7 +62,7 @@
      cflags = [
        # Align the stack on 16-byte boundaries, http://crbug.com/418554.
        "-mstack-alignment=16",
-@@ -773,7 +773,7 @@
+@@ -790,7 +790,7 @@ config("runtime_library") {
    # smaller.
    if (is_win) {
      configs += [ "//build/config/win:runtime_library" ]
@@ -71,7 +71,7 @@
      configs += [ "//build/config/linux:runtime_library" ]
    } else if (is_ios) {
      configs += [ "//build/config/ios:runtime_library" ]
-@@ -1032,7 +1032,7 @@
+@@ -1050,7 +1050,7 @@ config("default_warnings") {
          "-Wno-nonportable-include-path",
  
          # TODO(hans): https://crbug.com/637306
@@ -80,7 +80,7 @@
        ]
      }
    }
-@@ -1064,7 +1064,7 @@
+@@ -1082,7 +1082,7 @@ config("chromium_code") {
      ]
  
      if (!is_debug && !using_sanitizer &&
@@ -89,7 +89,7 @@
        # _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
-@@ -1124,7 +1124,7 @@
+@@ -1140,7 +1140,7 @@ config("no_chromium_code") {
      ]
    }
  
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index f0c64bdd270b..ffe466005543 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig	2016-11-10 20:02:09 UTC
-+++ build/toolchain/gcc_toolchain.gni
-@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni
+--- build/toolchain/gcc_toolchain.gni.orig	2016-12-09 05:04:14.000000000 +0000
++++ build/toolchain/gcc_toolchain.gni	2016-12-21 23:03:46.063519000 +0000
+@@ -11,6 +11,11 @@
  import("//build/toolchain/goma.gni")
  import("//build/toolchain/toolchain.gni")
  
@@ -12,7 +12,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -453,14 +458,28 @@ template("clang_toolchain") {
+@@ -482,14 +487,23 @@
    }
  
    gcc_toolchain(target_name) {
@@ -20,12 +20,11 @@
 -    cc = "$prefix/clang"
 -    cxx = "$prefix/clang++"
 -    ld = cxx
+-
+-    readelf = "${toolprefix}readelf"
+-    ar = "${toolprefix}ar"
+-    nm = "${toolprefix}nm"
 +    if (is_bsd) {
-+      # cc = getenv("CC")
-+      # assert(cc != "", "CC env must me set with >= clang39")
-+      # cxx = getenv("CXX")
-+      # assert(cxx != "", "CXX env must me set with >= clang++39")
-+      # ld = cxx
 +      cc = "${toolprefix}clang39"
 +      cxx = "${toolprefix}clang++39"
 +      ld = cxx
@@ -37,10 +36,7 @@
 +      cc = "$prefix/clang"
 +      cxx = "$prefix/clang++"
 +      ld = cxx
- 
--    readelf = "${toolprefix}readelf"
--    ar = "${toolprefix}ar"
--    nm = "${toolprefix}nm"
++
 +      readelf = "${toolprefix}readelf"
 +      ar = "${toolprefix}ar"
 +      nm = "${toolprefix}nm"
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index 79bb41a329cc..9bb0c2d98f64 100644
--- a/www/chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2016-08-03 22:02:11.000000000 +0300
-+++ chrome/browser/BUILD.gn	2016-09-27 09:40:30.879973000 +0300
-@@ -540,7 +540,7 @@
+--- chrome/browser/BUILD.gn.orig	2016-12-01 23:02:06 UTC
++++ chrome/browser/BUILD.gn
+@@ -2105,7 +2105,7 @@ split_static_library("browser") {
      deps += [ "//device/udev_linux" ]
    }
  
@@ -9,44 +9,12 @@
      deps += [ "//third_party/speech-dispatcher" ]
    }
  
-@@ -730,6 +730,22 @@
-     sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
-                            ".",
-                            "//chrome")
-+    if (is_bsd) {
-+      sources -= [
-+        "media_galleries/linux/mtp_device_delegate_impl_linux.cc",
-+        "media_galleries/linux/mtp_device_delegate_impl_linux.h",
-+        "media_galleries/linux/mtp_device_object_enumerator.cc",
-+        "media_galleries/linux/mtp_device_object_enumerator.h",
-+        "media_galleries/linux/mtp_device_task_helper.cc",
-+        "media_galleries/linux/mtp_device_task_helper.h",
-+        "media_galleries/linux/mtp_device_task_helper_map_service.cc",
-+        "media_galleries/linux/mtp_device_task_helper_map_service.h",
-+        "media_galleries/linux/mtp_read_file_worker.cc",
-+        "media_galleries/linux/mtp_read_file_worker.h",
-+        "media_galleries/linux/snapshot_file_details.cc",
-+        "media_galleries/linux/snapshot_file_details.h",
-+      ]
-+    }
-   }
- 
-   if (!is_chrome_branded) {
-@@ -857,7 +873,7 @@
+@@ -3439,7 +3439,7 @@ split_static_library("browser") {
      }
    }
  
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      if (use_aura) {
-       configs += [ "//build/config/linux/dbus" ]
-       deps += [
-@@ -871,7 +887,7 @@
-     }
-   }
- 
--  if (is_linux || is_win) {
-+  if (is_linux || is_bsd || is_win) {
-     sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources,
-                            ".",
-                            "//chrome")
+       deps += [ "//build/linux:fontconfig" ]
+       if (use_dbus) {
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 12f514466f5f..56447c01a575 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2016-05-11 19:02:13 UTC
+--- chrome/browser/about_flags.cc.orig	2016-12-01 23:02:06 UTC
 +++ chrome/browser/about_flags.cc
-@@ -673,7 +673,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -766,7 +766,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
                                 switches::kDisableSmoothScrolling)},
@@ -9,10 +9,10 @@
      {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
       IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
       // Uses the system preference on Mac (a different implementation).
-@@ -1729,7 +1729,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1771,7 +1771,7 @@ const FeatureEntry kFeatureEntries[] = {
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
-      SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
- #endif
+      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,
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
new file mode 100644
index 000000000000..0ca24c7a64d1
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig	2016-12-16 03:22:03.040835000 +0000
++++ chrome/browser/extensions/api/omnibox/omnibox_api.cc	2016-12-16 03:22:24.317714000 +0000
+@@ -45,7 +45,7 @@
+ // Pref key for omnibox.setDefaultSuggestion.
+ const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ static const int kOmniboxIconPaddingLeft = 2;
+ static const int kOmniboxIconPaddingRight = 2;
+ #elif defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
new file mode 100644
index 000000000000..1b54ff589e6a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2016-12-16 03:24:27.367808000 +0000
++++ chrome/browser/extensions/bookmark_app_helper.cc	2016-12-16 03:24:51.798418000 +0000
+@@ -707,7 +707,7 @@
+ #if !defined(OS_MACOSX)
+ #if !defined(USE_ASH)
+   web_app::ShortcutLocations creation_locations;
+-#if defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   creation_locations.on_desktop = true;
+ #else
+   creation_locations.on_desktop = false;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index e335be09d74a..519d8ad9f08b 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2016-05-11 19:02:14 UTC
-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -64,7 +64,7 @@
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2016-12-01 23:02:07.000000000 +0000
++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc	2016-12-16 19:35:19.489404000 +0000
+@@ -62,7 +62,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"
@@ -9,12 +9,12 @@
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -105,7 +105,7 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -103,7 +103,7 @@
  #if defined(OS_CHROMEOS)
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();
 -#elif defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
++#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD)
    extensions::InputImeAPI::GetFactoryInstance();
  #endif
    extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 7fa06d755e9e..a7b286bbcfaa 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2016-05-11 19:02:14 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2016-12-01 23:02:07 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -645,7 +645,7 @@ void ExternalProviderImpl::CreateExterna
-                                  Manifest::EXTERNAL_PREF_DOWNLOAD,
-                                  oem_extension_creation_flags)));
+@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
+         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(
-         linked_ptr<ExternalProviderInterface>(
-@@ -687,7 +687,7 @@ void ExternalProviderImpl::CreateExterna
-                 bundled_extension_creation_flags)));
+     provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+         service,
+@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna
+         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(
-         linked_ptr<ExternalProviderInterface>(
-             new ExternalProviderImpl(
+     provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+         service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
+                                         ExternalPrefLoader::NONE, nullptr),
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index c3b4dc3ea749..9c3d3bb422fd 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,5 +1,5 @@
---- chrome/browser/media/webrtc_log_uploader.cc.orig	2016-05-11 19:02:14 UTC
-+++ chrome/browser/media/webrtc_log_uploader.cc
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2016-12-01 23:02:07 UTC
++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
 @@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc
new file mode 100644
index 000000000000..4fd287394549
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_net_async__dns__field__trial.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/net/async_dns_field_trial.cc.orig	2016-12-16 03:12:55.927001000 +0000
++++ chrome/browser/net/async_dns_field_trial.cc	2016-12-16 03:13:16.445410000 +0000
+@@ -61,7 +61,7 @@
+ }  // 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/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc
new file mode 100644
index 000000000000..742da2829704
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_renderer_context_menu_render__view__context__menu.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2016-12-18 00:37:45.100012000 +0100
++++ chrome/browser/renderer_context_menu/render_view_context_menu.cc	2016-12-18 00:42:54.851203000 +0100
+@@ -1325,7 +1325,7 @@
+ // '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.
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
+                                   IDS_CONTENT_CONTEXT_UNDO);
+   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
+@@ -1361,7 +1361,7 @@
+   if (!use_spelling)
+     return;
+ 
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
+                                   IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
+ #else
+@@ -1602,7 +1602,7 @@
+     case IDC_CHECK_SPELLING_WHILE_TYPING:
+       return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck);
+ 
+-#if !defined(OS_MACOSX) && defined(OS_POSIX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX)
+     // TODO(suzhe): this should not be enabled for password fields.
+     case IDC_INPUT_METHODS_MENU:
+       return true;
diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
index 830324d9f897..641e92e0f6ae 100644
--- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
@@ -1,11 +1,11 @@
---- chrome/browser/ui/BUILD.gn.orig	2016-08-03 22:02:13.000000000 +0300
-+++ chrome/browser/ui/BUILD.gn	2016-09-03 00:04:02.109457000 +0300
-@@ -503,7 +503,7 @@
-       "//ui/events:dom_keycode_converter",
-     ]
+--- chrome/browser/ui/BUILD.gn.orig	2016-12-01 23:02:08 UTC
++++ chrome/browser/ui/BUILD.gn
+@@ -3024,7 +3024,7 @@ split_static_library("ui") {
+       ]
+     }
    }
 -  if (is_linux) {  # Both desktop Linux and ChromeOS.
 +  if (is_linux || is_bsd) {  # Both desktop Linux and ChromeOS.
-     sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
-                            ".",
-                            "//chrome")
+     sources += [
+       "certificate_dialogs.cc",
+       "certificate_dialogs.h",
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
index cce7a1ed0ab8..e3299f9eb6a2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2016-10-06 04:02:13.000000000 +0300
-+++ chrome/browser/ui/browser_view_prefs.cc	2016-10-13 05:59:52.802478000 +0300
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2016-12-01 23:02:08 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"
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "ui/base/x/x11_util.h"  // nogncheck
  #endif
  
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ void RegisterBrowserViewLocalPrefs(PrefR
  
  void RegisterBrowserViewProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index f0aed62065ba..7febf49fda9a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2016-05-11 19:02:16 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2016-12-01 23:02:08 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -88,7 +88,7 @@
+@@ -91,7 +91,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
- #include "ui/events/devices/x11/touch_factory_x11.h"
+ #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni
deleted file mode 100644
index 8b8c3f8a7288..000000000000
--- a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/extensions/api/schemas.gni.orig	2016-10-06 04:02:14.000000000 +0300
-+++ chrome/common/extensions/api/schemas.gni	2016-10-13 06:16:40.629706000 +0300
-@@ -19,7 +19,7 @@
- }
- if (is_chromeos) {
-   schema_sources += gypi_values.chromeos_schema_files
--} else if (is_linux || is_win) {
-+} else if (is_linux || is_win || is_bsd) {
-   schema_sources += gypi_values.input_ime_schema_file
- }
- if (enable_service_discovery) {
diff --git a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
new file mode 100644
index 000000000000..88b8a88e5a52
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
@@ -0,0 +1,14 @@
+--- chrome/common/extensions/chrome_extensions_client.cc.orig	2016-12-16 03:27:01.063936000 +0000
++++ chrome/common/extensions/chrome_extensions_client.cc	2016-12-16 03:29:25.710522000 +0000
+@@ -103,7 +103,10 @@
+ static base::LazyInstance<ChromeExtensionsClient> g_client =
+     LAZY_INSTANCE_INITIALIZER;
+ 
+-ChromeExtensionsClient::ChromeExtensionsClient() {}
++ChromeExtensionsClient::ChromeExtensionsClient()
++    : chrome_api_permissions_(ChromeAPIPermissions()),
++      extensions_api_permissions_(ExtensionsAPIPermissions()) {
++}
+ 
+ ChromeExtensionsClient::~ChromeExtensionsClient() {
+ }
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index fd4cd55c63f0..048fc19e40f1 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,15 +1,15 @@
---- chrome/common/pref_names.h.orig	2016-10-06 04:02:14.000000000 +0300
-+++ chrome/common/pref_names.h	2016-10-14 07:01:22.105649000 +0300
-@@ -315,7 +315,7 @@
+--- chrome/common/pref_names.h.orig	2016-12-01 23:02:09 UTC
++++ chrome/common/pref_names.h
+@@ -312,7 +312,7 @@ extern const char kForceGoogleSafeSearch
+ extern const char kForceYouTubeRestrict[];
+ extern const char kForceSessionSync[];
  extern const char kAllowedDomainsForApps[];
- extern const char kLastClearBrowsingDataTime[];
- extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -347,7 +347,7 @@
+@@ -345,7 +345,7 @@ extern const char kDefaultBrowserSetting
  #if defined(OS_MACOSX)
  extern const char kShowUpdatePromotionInfoBar[];
  #endif
@@ -18,7 +18,7 @@
  extern const char kUseCustomChromeFrame[];
  #endif
  extern const char kBackShortcutBubbleShownCount[];
-@@ -496,7 +496,7 @@
+@@ -493,7 +493,7 @@ extern const char kAppWindowPlacement[];
  extern const char kDownloadDefaultDirectory[];
  extern const char kDownloadExtensionsToOpen[];
  extern const char kDownloadDirUpgraded[];
diff --git a/www/chromium/files/patch-chrome_common_variations_BUILD.gn b/www/chromium/files/patch-chrome_common_variations_BUILD.gn
deleted file mode 100644
index 8df4f5074ef7..000000000000
--- a/www/chromium/files/patch-chrome_common_variations_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/variations/BUILD.gn.orig	2016-08-03 22:02:14.000000000 +0300
-+++ chrome/common/variations/BUILD.gn	2016-09-03 23:17:02.937969000 +0300
-@@ -12,7 +12,7 @@
-   if (is_mac) {
-     source = "//testing/variations/fieldtrial_testing_config_mac.json"
-   }
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     source = "//testing/variations/fieldtrial_testing_config_linux.json"
-   }
-   if (is_chromeos) {
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index bbcf57000c0f..8485d1a2f86e 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig	2016-10-06 04:02:14.000000000 +0300
-+++ chrome/test/BUILD.gn	2016-10-13 06:28:37.584668000 +0300
-@@ -179,7 +179,7 @@
+--- chrome/test/BUILD.gn.orig	2016-12-01 23:02:09 UTC
++++ chrome/test/BUILD.gn
+@@ -179,7 +179,7 @@ static_library("test_support") {
      ]
    }
  
@@ -9,7 +9,7 @@
      public_deps += [ "//crypto:platform" ]
    }
    if (is_mac) {
-@@ -383,7 +383,7 @@
+@@ -449,7 +449,7 @@ if (!is_android) {
        "$root_out_dir/test_page.css.mock-http-headers",
        "$root_out_dir/ui_test.pak",
      ]
@@ -18,8 +18,8 @@
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -391,7 +391,7 @@
-         "$root_out_dir/locales/fr.pak",
+@@ -458,7 +458,7 @@ if (!is_android) {
+         "$root_out_dir/resources.pak",
        ]
      }
 -    if (is_linux) {
@@ -27,16 +27,16 @@
        data += [ "$root_out_dir/libppapi_tests.so" ]
      }
  
-@@ -462,7 +462,7 @@
-                 ".",
-                 "//chrome")
+@@ -559,7 +559,7 @@ if (!is_android) {
+           "base/interactive_test_utils_views.cc",
+         ]
        }
 -      if (is_linux) {
 +      if (is_linux || is_bsd) {
          if (!is_chromeos) {
            # Desktop linux.
            sources -= [
-@@ -1097,14 +1097,14 @@
+@@ -1992,7 +1992,7 @@ 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" ]
@@ -45,15 +45,16 @@
          sources += [
            "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc",
            "../browser/ui/views/ime/ime_window_browsertest.cc",
-         ]
+@@ -2003,7 +2003,7 @@ test("browser_tests") {
+         data += [ "//testing/buildbot/filters/browser-side-navigation.linux.browser_tests.filter" ]
        }
  
 -      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" ]
-       }
-@@ -1116,7 +1116,7 @@
+         data += [ "//testing/buildbot/filters/site-per-process.browser_tests.filter" ]
+@@ -2016,7 +2016,7 @@ test("browser_tests") {
          configs +=
              [ "//build/config/win:default_large_module_incremental_linking" ]
        }
@@ -62,7 +63,7 @@
          data_deps += [ "//components/nacl/loader:nacl_helper" ]
  
          if (enable_nacl_nonsfi) {
-@@ -1176,7 +1176,7 @@
+@@ -2124,7 +2124,7 @@ test("browser_tests") {
        }
      }
  
@@ -71,7 +72,7 @@
        # Set rpath to find the CDM adapter even in a non-component build.
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
      }
-@@ -1226,7 +1226,7 @@
+@@ -2347,7 +2347,7 @@ test("browser_tests") {
        if (toolkit_views) {
          sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
        }
@@ -80,25 +81,16 @@
          sources +=
              [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
        }
-@@ -1385,7 +1385,7 @@
-       ]
-       deps += [ "//components/wifi:test_support" ]
-     }
--    if (is_linux || is_win) {
-+    if (is_linux || is_bsd || is_win) {
-       sources += rebase_path(
-               chrome_tests_gypi_values.chrome_browser_tests_non_mac_desktop_sources,
-               ".",
-@@ -1400,7 +1400,7 @@
+@@ -2541,7 +2541,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 += rebase_path(
-               chrome_tests_gypi_values.chrome_browser_tests_non_mobile_non_cros_sources,
-               ".",
-@@ -1519,7 +1519,7 @@
+       sources += [
+         # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
+         "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
+@@ -2729,7 +2729,7 @@ if (!is_android) {
        "$root_out_dir/pyproto/",
      ]
  
@@ -107,8 +99,8 @@
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -1768,7 +1768,7 @@
-       "$root_out_dir/locales/en-US.pak",
+@@ -3377,7 +3377,7 @@ test("unit_tests") {
+       "$root_out_dir/resources.pak",
      ]
    }
 -  if (is_linux || is_win) {
@@ -116,16 +108,16 @@
      data += [ "$root_out_dir/chrome_200_percent.pak" ]
    }
  
-@@ -1974,7 +1974,7 @@
+@@ -4060,7 +4060,7 @@ test("unit_tests") {
        "//ui/wm",
      ]
    }
 -  if (!is_chromeos && is_linux) {
 +  if (!is_chromeos && (is_linux || is_bsd)) {
-     sources += rebase_path(
-             chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources,
-             ".",
-@@ -1991,7 +1991,7 @@
+     sources += [
+       "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
+       "../browser/shell_integration_linux_unittest.cc",
+@@ -4080,7 +4080,7 @@ test("unit_tests") {
    if (use_gio) {
      deps += [ "//build/linux/libgio" ]
    }
@@ -134,12 +126,12 @@
      deps += [ "//chrome/browser/ui/libgtk2ui" ]
    }
  
-@@ -2119,18 +2119,18 @@
+@@ -4357,18 +4357,18 @@ test("unit_tests") {
        "//components/os_crypt:gnome_keyring_direct",
      ]
    }
--  if (is_linux && !is_chromeos) {
-+  if ((is_linux || is_bsd) && !is_chromeos) {
+-  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" ]
@@ -152,11 +144,11 @@
      }
    }
 -  if (is_linux && is_chrome_branded && current_cpu == "x86") {
-+  if ((is_linux || is_bsd) && is_chrome_branded && current_cpu == "x86") {
++  if ((is_linux || is_bsd)  && is_chrome_branded && current_cpu == "x86") {
      ldflags = [ "-Wl,--strip-debug" ]
    }
    if (is_mac) {
-@@ -2365,7 +2365,7 @@
+@@ -4869,7 +4869,7 @@ if (safe_browsing_mode == 1 && is_mac) {
    }
  }
  
@@ -165,12 +157,12 @@
    # TODO(609855): Make this compile on Android and run on the bots.
    test("chrome_app_unittests") {
      sources = [
-@@ -2391,7 +2391,7 @@
+@@ -4895,7 +4895,7 @@ if (!is_android) {
    }
  }
  
 -if (!is_android && !is_ios && !is_chromecast) {
 +if (!is_android && !is_ios && !is_chromecast && !is_bsd) {
    test("performance_browser_tests") {
-     sources =
-         rebase_path(chrome_tests_gypi_values.performance_browser_tests_sources,
+     sources = [
+       "../app/chrome_version.rc.version",
diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn
index 3dbddf0c0679..9509a36bf05d 100644
--- a/www/chromium/files/patch-components_BUILD.gn
+++ b/www/chromium/files/patch-components_BUILD.gn
@@ -1,13 +1,13 @@
---- components/BUILD.gn.orig	2016-08-03 22:02:15.000000000 +0300
-+++ components/BUILD.gn	2016-09-13 13:15:29.852531000 +0300
-@@ -167,8 +167,8 @@
-       "//components/autofill/content/renderer:unit_tests",
-       "//components/cast_certificate:unit_tests",
+--- components/BUILD.gn.orig	2016-12-01 23:02:10 UTC
++++ components/BUILD.gn
+@@ -174,8 +174,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_use_measurement/content:unit_tests",
-       "//components/devtools_http_handler:unit_tests",
+       "//components/display_compositor:unit_tests",
diff --git a/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc b/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
deleted file mode 100644
index 8ed24fbfb737..000000000000
--- a/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- components/autofill/core/browser/form_structure.cc.orig	2016-05-11 19:02:18 UTC
-+++ components/autofill/core/browser/form_structure.cc
-@@ -34,7 +34,11 @@
- #include "components/autofill/core/common/form_field_data_predictions.h"
- #include "components/rappor/rappor_service.h"
- #include "components/rappor/rappor_utils.h"
--#include "third_party/re2/src/re2/re2.h"
-+#if defined(OS_BSD)
-+#  include <re2/re2.h>
-+#else
-+#  include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace autofill {
- namespace {
diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn
index 6a8add9bade2..5abc2d922897 100644
--- a/www/chromium/files/patch-components_metrics_BUILD.gn
+++ b/www/chromium/files/patch-components_metrics_BUILD.gn
@@ -1,10 +1,10 @@
---- components/metrics/BUILD.gn.orig	2016-10-06 04:02:16.000000000 +0300
-+++ components/metrics/BUILD.gn	2016-10-16 20:52:28.476935000 +0300
-@@ -107,6 +107,13 @@
+--- components/metrics/BUILD.gn.orig	2016-12-12 20:38:32 UTC
++++ components/metrics/BUILD.gn
+@@ -107,6 +107,13 @@ static_library("metrics") {
    if (is_win) {
      sources -= [ "machine_id_provider_stub.cc" ]
    }
-+
++  
 +  if (is_bsd) {
 +    sources -= [
 +      "system_memory_stats_recorder_linux.cc"
@@ -14,16 +14,16 @@
  }
  
  if (!is_ios) {
-@@ -266,7 +273,7 @@
+@@ -282,7 +289,7 @@ static_library("test_support") {
    ]
  }
  
 -if (is_linux) {
 +if (is_linux || is_bsd) {
-   # GYP version: components/metrics.gypi:metrics_serialization
    static_library("serialization") {
      sources = [
-@@ -321,7 +328,7 @@
+       "serialization/metric_sample.cc",
+@@ -341,7 +348,7 @@ source_set("unit_tests") {
      "//ui/gfx/geometry",
    ]
  
diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
index 482f377b75ca..1a2fd13a18d1 100644
--- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,13 +1,11 @@
---- components/storage_monitor/BUILD.gn.orig	2016-08-03 22:02:16.000000000 +0300
-+++ components/storage_monitor/BUILD.gn	2016-09-27 19:34:46.322065000 +0300
-@@ -64,6 +64,23 @@
+--- components/storage_monitor/BUILD.gn.orig	2016-12-01 23:02:12 UTC
++++ components/storage_monitor/BUILD.gn
+@@ -65,6 +65,21 @@ static_library("storage_monitor") {
      ]
    }
  
 +  if (is_bsd) {
 +    sources -= [
-+      "media_transfer_protocol_device_observer_linux.cc",
-+      "media_transfer_protocol_device_observer_linux.h",
 +      "mtab_watcher_linux.cc",
 +      "mtab_watcher_linux.h",
 +      "storage_monitor_linux.cc",
@@ -24,17 +22,3 @@
    if (use_udev) {
      deps += [ "//device/udev_linux" ]
    } else if (is_linux) {
-@@ -119,6 +136,13 @@
-     ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "test_media_transfer_protocol_manager_linux.cc",
-+      "test_media_transfer_protocol_manager_linux.h",
-+    ]
-+  }
-+
-   if (is_win) {
-     deps = [
-       "//testing/gtest",
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
index ebf18f6198ea..2c9a459f3900 100644
--- a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
@@ -1,4 +1,4 @@
---- components/storage_monitor/storage_monitor.cc.orig	2016-05-11 19:02:19 UTC
+--- components/storage_monitor/storage_monitor.cc.orig	2016-12-01 23:02:12 UTC
 +++ components/storage_monitor/storage_monitor.cc
 @@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
  
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 963931ba651f..4e74de61ca85 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,15 +1,28 @@
---- content/browser/BUILD.gn.orig	2016-10-06 04:02:18.000000000 +0300
-+++ content/browser/BUILD.gn	2016-10-13 10:50:30.206508000 +0300
-@@ -196,7 +196,7 @@
-       "//third_party/webrtc/media:rtc_media",
-       "//third_party/webrtc/modules/desktop_capture:primitives",
+--- content/browser/BUILD.gn.orig	2016-12-01 23:02:12.000000000 +0000
++++ content/browser/BUILD.gn	2016-12-14 14:34:21.739126000 +0000
+@@ -1399,6 +1399,12 @@
      ]
+   }
+ 
++  if (is_bsd) {
++    sources -= [
++      "download/quarantine_linux.cc",
++    ]
++  }
++
+   if (!is_win) {
+     sources += [
+       "file_descriptor_info_impl.cc",
+@@ -1462,7 +1468,7 @@
+     if (!is_ios) {
+       defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
+     }
 -    if (is_linux || is_mac || is_win) {
 +    if (is_linux || is_bsd || is_mac || is_win) {
        sources += [
          "media/capture/desktop_capture_device.cc",
          "media/capture/desktop_capture_device.h",
-@@ -288,7 +288,7 @@
+@@ -1629,7 +1635,7 @@
      }
    }
  
@@ -18,7 +31,7 @@
      deps += [ "//build/linux:fontconfig" ]
    }
  
-@@ -368,6 +368,19 @@
+@@ -1782,6 +1788,17 @@
        "//chromeos",
        "//chromeos:power_manager_proto",
      ]
@@ -32,13 +45,11 @@
 +        "../zygote/zygote_linux.cc",
 +        "../zygote/zygote_linux.h",
 +        "../zygote/zygote_main_linux.cc",
-+        "download/file_metadata_linux.cc",
-+        "download/file_metadata_linux.h",
 +    ]
    }
  
    if (use_aura) {
-@@ -450,7 +463,7 @@
+@@ -1899,11 +1916,11 @@
      deps += [ "//third_party/flac" ]
    }
  
@@ -47,10 +58,6 @@
      deps += [ "//dbus" ]
    }
  
-@@ -461,7 +474,7 @@
-     ]
-   }
- 
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      deps += [ "//third_party/boringssl" ]
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index a1281200bb34..574c2f933338 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,17 @@
---- content/browser/browser_main_loop.cc.orig	2016-07-20 22:03:24.000000000 +0300
-+++ content/browser/browser_main_loop.cc	2016-08-18 02:39:59.331387000 +0300
-@@ -203,7 +203,7 @@
+--- content/browser/browser_main_loop.cc.orig	2016-12-15 13:00:14.708308000 +0000
++++ content/browser/browser_main_loop.cc	2016-12-15 13:05:18.516426000 +0000
+@@ -196,6 +196,10 @@
+ #include "gpu/vulkan/vulkan_implementation.h"
+ #endif
+ 
++#if defined(OS_BSD)
++#include "content/common/child_process_sandbox_support_impl_linux.h"
++#endif
++
+ // One of the linux specific headers defines this as a macro.
+ #ifdef DestroyAll
+ #undef DestroyAll
+@@ -204,7 +208,7 @@
  namespace content {
  namespace {
  
@@ -8,22 +19,21 @@
 +#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");
-   base::FilePath sandbox_binary;
-@@ -467,7 +467,7 @@
+   if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
+@@ -475,10 +479,15 @@
+ void BrowserMainLoop::EarlyInitialization() {
    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
-   TRACK_SCOPED_REGION("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_);
-@@ -507,7 +507,7 @@
-   // We use quite a few file descriptors for our IPC, and the default limit on
-   // the Mac is low (256), so bump it up.
-   base::SetFdLimit(1024);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   // Same for Linux. The default various per distro, but it is 1024 on Fedora.
-   // Low soft limits combined with liberal use of file descriptors means power
-   // users can easily hit this limit with many open tabs. Bump up the limit to
++#elif defined(OS_BSD)
++  RenderSandboxHostLinux::GetInstance()->Init();
++  base::FileHandleMappingVector fds_to_map;
++  const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
++  fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD()));
+ #endif
+ 
+ #if defined(USE_X11)
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc
index e3cd58cfbb92..63e9da6bc853 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher.cc
+++ b/www/chromium/files/patch-content_browser_child__process__launcher.cc
@@ -1,15 +1,24 @@
---- content/browser/child_process_launcher.cc.orig	2016-05-11 19:02:20 UTC
+--- content/browser/child_process_launcher.cc.orig	2016-12-12 21:01:52 UTC
 +++ content/browser/child_process_launcher.cc
-@@ -229,7 +229,7 @@ void LaunchOnLauncherThread(const Notify
+@@ -258,7 +258,7 @@ void LaunchOnLauncherThread(const Notify
    // We need to close the client end of the IPC channel to reliably detect
    // child termination.
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   ZygoteHandle* zygote_handle = delegate->GetZygote();
-   // If |zygote_handle| is null, a zygote should not be used.
-   if (zygote_handle) {
-@@ -333,7 +333,7 @@ void TerminateOnLauncherThread(ZygoteHan
+   ZygoteHandle* zygote_handle =
+       !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
+           ? delegate->GetZygote()
+@@ -276,7 +276,7 @@ void LaunchOnLauncherThread(const Notify
+     process = base::Process(handle);
+   } else
+   // Fall through to the normal posix case below when we're not zygoting.
+-#endif  // !defined(OS_MACOSX)
++#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
+   {
+     // Convert FD mapping to FileHandleMappingVector
+     base::FileHandleMappingVector fds_to_map =
+@@ -367,7 +367,7 @@ void TerminateOnLauncherThread(ZygoteHan
    process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -18,7 +27,7 @@
    if (zygote) {
      // If the renderer was created via a zygote, we have to proxy the reaping
      // through the zygote process.
-@@ -435,7 +435,7 @@ void ChildProcessLauncher::Launch(
+@@ -488,7 +488,7 @@ void ChildProcessLauncher::Launch(
  
  void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
    DCHECK(CalledOnValidThread());
@@ -27,9 +36,9 @@
    if (zygote_) {
      termination_status_ = zygote_->GetTerminationStatus(
          process_.Handle(), known_dead, &exit_code_);
-@@ -505,7 +505,7 @@ void ChildProcessLauncher::Notify(Zygote
-   starting_ = false;
-   process_ = std::move(process);
+@@ -569,7 +569,7 @@ void ChildProcessLauncher::Notify(Zygote
+                                     mojo_child_token_, process_error_callback_);
+   }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_browser_download_base__file.cc b/www/chromium/files/patch-content_browser_download_base__file.cc
index 6ff17e7504de..c18e4b6980c8 100644
--- a/www/chromium/files/patch-content_browser_download_base__file.cc
+++ b/www/chromium/files/patch-content_browser_download_base__file.cc
@@ -1,12 +1,20 @@
---- content/browser/download/base_file.cc.orig	2016-05-25 15:01:01.000000000 -0400
-+++ content/browser/download/base_file.cc	2016-05-27 10:51:20.693194000 -0400
-@@ -186,7 +186,8 @@
+--- content/browser/download/base_file.cc.orig	2016-12-12 21:09:50 UTC
++++ content/browser/download/base_file.cc
+@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt
+   return reason;
  }
  
- // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
--#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)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ namespace {
+ 
+@@ -456,7 +456,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/chromium/files/patch-content_browser_download_base__file__linux.cc b/www/chromium/files/patch-content_browser_download_base__file__linux.cc
deleted file mode 100644
index d5430d3826cb..000000000000
--- a/www/chromium/files/patch-content_browser_download_base__file__linux.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- content/browser/download/base_file_linux.cc.orig	2016-05-24 22:54:15.000000000 -0400
-+++ content/browser/download/base_file_linux.cc	2016-05-27 10:52:35.163174000 -0400
-@@ -16,7 +16,9 @@
-   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
-   DCHECK(!detached_);
- 
-+#if !defined(OS_BSD)
-   AddOriginMetadataToFile(full_path_, source_url, referrer_url);
-+#endif
-   return DOWNLOAD_INTERRUPT_REASON_NONE;
- }
- 
diff --git a/www/chromium/files/patch-content_browser_memory__memory__monitor.cc b/www/chromium/files/patch-content_browser_memory__memory__monitor.cc
new file mode 100644
index 000000000000..2dff03e6dcf0
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_memory__memory__monitor.cc
@@ -0,0 +1,17 @@
+--- content/browser/memory/memory_monitor.cc.orig	2016-12-01 23:02:12.000000000 +0000
++++ content/browser/memory/memory_monitor.cc	2016-12-14 18:20:00.515155000 +0000
+@@ -8,6 +8,7 @@
+ 
+ namespace content {
+ 
++#if !defined(OS_FREEBSD)
+ // static
+ MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() {
+   return base::Singleton<
+@@ -21,5 +22,6 @@
+     base::SystemMemoryInfoKB* mem_info) {
+   base::GetSystemMemoryInfo(mem_info);
+ }
++#endif // !defined(OS_FREEBSD)
+ 
+ }  // namespace content
diff --git a/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc b/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc
new file mode 100644
index 000000000000..91d697a9baeb
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_memory__memory__monitor__linux.cc
@@ -0,0 +1,19 @@
+--- content/browser/memory/memory_monitor_linux.cc.orig	2016-12-01 23:02:12.000000000 +0000
++++ content/browser/memory/memory_monitor_linux.cc	2016-12-14 18:23:30.803202000 +0000
+@@ -11,6 +11,7 @@
+ 
+ namespace {
+ 
++#if !defined(OS_FREEBSD)
+ // The number of bits to shift to convert KiB to MiB.
+ const int kShiftKiBtoMiB = 10;
+ 
+@@ -48,5 +49,8 @@
+ std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
+   return MemoryMonitorLinux::Create(MemoryMonitorDelegate::GetInstance());
+ }
++#endif // !defined(OS_FREEBSD)
++
++}
+ 
+ }  // namespace content
diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc
deleted file mode 100644
index f9df58fd0d43..000000000000
--- a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__device__client.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/renderer_host/media/video_capture_device_client.cc.orig	2016-07-20 22:03:24.000000000 +0300
-+++ content/browser/renderer_host/media/video_capture_device_client.cc	2016-08-18 02:29:10.788160000 +0300
-@@ -181,7 +181,7 @@
-       // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
-       // Windows RGB24 defines blue at lowest byte,
-       // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       origin_colorspace = libyuv::FOURCC_RAW;
- #elif defined(OS_WIN)
-       origin_colorspace = libyuv::FOURCC_24BG;
diff --git a/www/chromium/files/patch-content_browser_time__zone__monitor.cc b/www/chromium/files/patch-content_browser_time__zone__monitor.cc
deleted file mode 100644
index bfd52ebfc30d..000000000000
--- a/www/chromium/files/patch-content_browser_time__zone__monitor.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/time_zone_monitor.cc.orig	2016-05-11 19:02:21 UTC
-+++ content/browser/time_zone_monitor.cc
-@@ -29,7 +29,7 @@ void TimeZoneMonitor::NotifyRenderers() 
-   scoped_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
- #else
-   icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // We get here multiple times on Linux per a single tz change, but
-   // want to update the ICU default zone and notify renderer only once.
-   scoped_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc b/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
deleted file mode 100644
index 6d05341da7b6..000000000000
--- a/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- content/browser/time_zone_monitor_linux.cc.orig	2016-05-11 19:02:21 UTC
-+++ content/browser/time_zone_monitor_linux.cc
-@@ -53,6 +53,9 @@ class TimeZoneMonitorLinuxImpl
-       : base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl>(),
-         file_path_watchers_(),
-         owner_(owner) {
-+  }
-+
-+  void StartWatching() {
-     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-     BrowserThread::PostTask(
-         BrowserThread::FILE,
-@@ -149,6 +152,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin
-   // changed.
-   if (!getenv("TZ")) {
-     impl_ = new TimeZoneMonitorLinuxImpl(this);
-+    if (impl_.get()) {
-+      impl_->StartWatching();
-+    }
-   }
- }
- 
diff --git a/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc b/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc
new file mode 100644
index 000000000000..fb760085bd73
--- /dev/null
+++ b/www/chromium/files/patch-content_gpu__in__process__gpu__thread.cc
@@ -0,0 +1,11 @@
+--- content/gpu/in_process_gpu_thread.cc.orig	2016-12-18 18:45:05.278739000 +0000
++++ content/gpu/in_process_gpu_thread.cc	2016-12-18 18:45:21.876600000 +0000
+@@ -53,8 +53,6 @@
+   gpu::GPUInfo gpu_info;
+   if (!gl::init::InitializeGLOneOff())
+     VLOG(1) << "gl::init::InitializeGLOneOff failed";
+-  else
+-    gpu::CollectContextGraphicsInfo(&gpu_info);
+ 
+   // The process object takes ownership of the thread object, so do not
+   // save and delete the pointer.
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 375788043118..41b4eefaa8b0 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,45 +1,29 @@
---- content/gpu/gpu_main.cc.orig	2016-07-20 22:03:24.000000000 +0300
-+++ content/gpu/gpu_main.cc	2016-08-10 15:59:24.697490000 +0300
-@@ -102,7 +102,7 @@
-                                const base::CommandLine& command_line);
- bool WarmUpSandbox(const base::CommandLine& command_line);
-
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
- #endif
-
-@@ -192,13 +192,13 @@
-   // Use a UI message loop because ANGLE and the desktop GL platform can
-   // create child windows to render to.
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
--#elif defined(OS_LINUX) && defined(USE_X11)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
-   // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
-   // and https://crbug.com/326995.
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
-   std::unique_ptr<ui::PlatformEventSource> event_source =
-       ui::PlatformEventSource::CreateDefault();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
- #elif defined(OS_MACOSX)
-   // This is necessary for CoreAnimation layers hosted in the GPU process to be
-@@ -309,7 +309,7 @@
-       // and we already registered them through SetGpuInfo() above.
-       base::TimeTicks before_collect_context_graphics_info =
-           base::TimeTicks::Now();
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-       if (!CollectGraphicsInfo(gpu_info))
-         dead_on_arrival = true;
-
-@@ -491,7 +491,7 @@
-   return true;
- }
-
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
-   TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
-
+--- content/gpu/gpu_main.cc.orig	2016-12-01 23:02:13.000000000 +0000
++++ content/gpu/gpu_main.cc	2016-12-13 17:52:18.210016000 +0000
+@@ -92,7 +92,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*);
+@@ -145,7 +145,7 @@
+ 
+   bool EnsureSandboxInitialized(
+       gpu::GpuWatchdogThread* watchdog_thread) override {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) && !defined(OS_BSD)
+     return StartSandboxLinux(watchdog_thread);
+ #elif defined(OS_WIN)
+     return StartSandboxWindows(sandbox_info_);
+@@ -292,7 +292,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");
+ 
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 6b9b941e091d..24704ade8bfe 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,24 +1,24 @@
---- content/test/BUILD.gn.orig	2016-10-06 04:02:19.000000000 +0300
-+++ content/test/BUILD.gn	2016-10-27 21:01:00.854720000 +0300
-@@ -377,7 +377,7 @@
-                         ".",
-                         "//content")
+--- content/test/BUILD.gn.orig	2016-12-01 23:02:13 UTC
++++ content/test/BUILD.gn
+@@ -661,7 +661,7 @@ test("content_browsertests") {
+     "../test/webui_resource_browsertest.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/",
-@@ -615,7 +615,7 @@
-                         ".",
-                         "//content")
+@@ -1349,7 +1349,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/",
-@@ -738,7 +738,7 @@
+@@ -1534,7 +1534,7 @@ test("content_unittests") {
        "//ui/shell_dialogs:shell_dialogs",
      ]
  
@@ -27,8 +27,8 @@
        sources +=
            [ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
        deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-@@ -772,7 +772,7 @@
-                     "//content")
+@@ -1570,7 +1570,7 @@ test("content_unittests") {
+     ]
    }
  
 -  if (is_linux) {
@@ -36,14 +36,3 @@
      if (use_dbus) {
        deps += [ "//dbus:test_support" ]
      }
-@@ -855,6 +855,10 @@
-     sources -= [ "../common/plugin_list_unittest.cc" ]
-   }
- 
-+  if (is_bsd) {
-+    sources -= [ "../browser/download/file_metadata_unittest_linux.cc"]
-+  }
-+
-   if (use_ozone) {
-     deps += [ "//ui/ozone" ]
-   } else {
diff --git a/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc
index 790d463cbf77..f38653e18902 100644
--- a/www/chromium/files/patch-device_geolocation_location__arbitrator__impl.cc
+++ b/www/chromium/files/patch-device_geolocation_location__arbitrator.cc
@@ -1,9 +1,9 @@
---- device/geolocation/location_arbitrator_impl.cc.orig	2016-10-06 04:02:19.000000000 +0300
-+++ device/geolocation/location_arbitrator_impl.cc	2016-10-14 20:31:25.130350000 +0300
-@@ -167,7 +167,7 @@
+--- device/geolocation/location_arbitrator.cc.orig	2016-12-12 22:00:04 UTC
++++ device/geolocation/location_arbitrator.cc
+@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr
  
  std::unique_ptr<LocationProvider>
- LocationArbitratorImpl::NewSystemLocationProvider() {
+ 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)
    return nullptr;
diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc
new file mode 100644
index 000000000000..68b592ee80ba
--- /dev/null
+++ b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor.cc
@@ -0,0 +1,11 @@
+--- device/time_zone_monitor/time_zone_monitor.cc.orig	2016-12-12 21:25:46 UTC
++++ 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());
+ #else
+   icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // We get here multiple times on Linux per a single tz change, but
+   // want to update the ICU default zone and notify renderer only once.
+   std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc
new file mode 100644
index 000000000000..8a7af2e15490
--- /dev/null
+++ b/www/chromium/files/patch-device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -0,0 +1,22 @@
+--- device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2016-12-12 21:26:07 UTC
++++ device/time_zone_monitor/time_zone_monitor_linux.cc
+@@ -58,6 +58,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,
+@@ -152,6 +155,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin
+   // changed.
+   if (!getenv("TZ")) {
+     impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner);
++    if (impl_.get()) {
++      impl_->StartWatching();
++    }
+   }
+ }
+ 
diff --git a/www/chromium/files/patch-extensions_browser_BUILD.gn b/www/chromium/files/patch-extensions_browser_BUILD.gn
deleted file mode 100644
index 2d6f3e75bb67..000000000000
--- a/www/chromium/files/patch-extensions_browser_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/BUILD.gn.orig	2016-10-06 04:02:19.000000000 +0300
-+++ extensions/browser/BUILD.gn	2016-10-13 07:31:49.246712000 +0300
-@@ -85,7 +85,7 @@
-               "//extensions")
-       sources += nonchromeos_sources
- 
--      if (is_linux) {
-+      if (is_linux || is_bsd) {
-         if (use_dbus) {
-           deps += [ "//dbus" ]
-         }
diff --git a/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc
new file mode 100644
index 000000000000..d20a1b8ae4a0
--- /dev/null
+++ b/www/chromium/files/patch-extensions_browser_api_networking_private_networking__private__event__router__factory.cc
@@ -0,0 +1,17 @@
+--- extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig	2016-12-16 19:26:17.392697000 +0000
++++ extensions/browser/api/networking_private/networking_private_event_router_factory.cc	2016-12-16 19:29:29.232668000 +0000
+@@ -13,6 +13,7 @@
+ 
+ namespace extensions {
+ 
++#if !defined(OS_BSD)
+ // static
+ NetworkingPrivateEventRouter*
+ NetworkingPrivateEventRouterFactory::GetForProfile(
+@@ -57,5 +58,6 @@
+ bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const {
+   return true;
+ }
++#endif
+ 
+ }  // namespace extensions
diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
index 642b0d1235f4..ad48f8fde7a3 100644
--- a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
+++ b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
@@ -1,6 +1,6 @@
---- gpu/ipc/service/BUILD.gn.orig	2016-08-03 22:02:19.000000000 +0300
-+++ gpu/ipc/service/BUILD.gn	2016-10-10 14:57:36.952170000 +0300
-@@ -92,11 +92,12 @@
+--- gpu/ipc/service/BUILD.gn.orig	2016-12-13 11:53:02 UTC
++++ gpu/ipc/service/BUILD.gn
+@@ -102,11 +102,12 @@ target(link_target_type, "ipc_service_so
      ]
      libs += [ "android" ]
    }
diff --git a/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc
new file mode 100644
index 000000000000..6c0ed6afeb04
--- /dev/null
+++ b/www/chromium/files/patch-gpu_ipc_service__gpu__init.cc
@@ -0,0 +1,38 @@
+--- gpu/ipc/service/gpu_init.cc.orig	2016-12-13 14:02:18.031408000 +0000
++++ gpu/ipc/service/gpu_init.cc	2016-12-13 15:15:22.748312000 +0000
+@@ -75,7 +75,7 @@
+   }
+ }
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
+   TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
+ 
+@@ -94,7 +94,7 @@
+       break;
+   }
+ }
+-#endif  // defined(OS_MACOSX)
++#endif  // defined(OS_MACOSX) && defined(OS_BSD)
+ 
+ #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ bool CanAccessNvidiaDeviceFile() {
+@@ -189,7 +189,7 @@
+   // 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;
+@@ -206,7 +206,7 @@
+     gpu::ApplyGpuDriverBugWorkarounds(
+         gpu_info_, const_cast<base::CommandLine*>(&command_line));
+   }
+-#endif  // !defined(OS_MACOSX)
++#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+   base::TimeDelta collect_context_time =
+       base::TimeTicks::Now() - before_collect_context_graphics_info;
diff --git a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
index a39587bcb130..3fe5bff6cab5 100644
--- a/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
+++ b/www/chromium/files/patch-gpu_tools_compositor__model__bench_BUILD.gn
@@ -1,11 +1,11 @@
---- gpu/tools/compositor_model_bench/BUILD.gn.orig	2016-10-06 04:02:20.000000000 +0300
-+++ gpu/tools/compositor_model_bench/BUILD.gn	2016-10-13 07:33:53.916483000 +0300
+--- gpu/tools/compositor_model_bench/BUILD.gn.orig	2016-12-12 22:09:19 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) {
-   # GYP version: //gpu/tools/tools.gyp:compositor_model_bench
    executable("compositor_model_bench") {
      sources = [
+       "compositor_model_bench.cc",
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
new file mode 100644
index 000000000000..9f44af6b64a3
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -0,0 +1,11 @@
+--- media/capture/video/video_capture_device_client.cc.orig	2016-12-12 21:21:34 UTC
++++ media/capture/video/video_capture_device_client.cc
+@@ -184,7 +184,7 @@ void VideoCaptureDeviceClient::OnIncomin
+ // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
+ // Windows RGB24 defines blue at lowest byte,
+ // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       origin_colorspace = libyuv::FOURCC_RAW;
+ #elif defined(OS_WIN)
+       origin_colorspace = libyuv::FOURCC_24BG;
diff --git a/www/chromium/files/patch-mojo_BUILD.gn b/www/chromium/files/patch-mojo_BUILD.gn
index e107c0b031cc..8688d7d4e64b 100644
--- a/www/chromium/files/patch-mojo_BUILD.gn
+++ b/www/chromium/files/patch-mojo_BUILD.gn
@@ -1,11 +1,11 @@
---- mojo/BUILD.gn.orig	2016-10-06 04:02:21.000000000 +0300
-+++ mojo/BUILD.gn	2016-10-13 07:50:28.562419000 +0300
-@@ -12,7 +12,7 @@
+--- mojo/BUILD.gn.orig	2016-12-12 22:10:20 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")) {
-     # TODO(GYP): Figure out if this needs to be supported. Right now
-     # it won't work on x86 official builds because it needs stuff in the
-     # sysroot that doesn't exist.
+     deps += [ "//mojo/public" ]
+   }
+ 
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
index 7bb196ec9e9c..60a9ee24b5d1 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -1,4 +1,4 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig	2016-05-11 19:02:24 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2016-12-12 22:12:11 UTC
 +++ net/dns/dns_config_service_posix_unittest.cc
 @@ -2,8 +2,6 @@
  // Use of this source code is governed by a BSD-style license that can be
@@ -6,6 +6,6 @@
  
 -#include <resolv.h>
 -
+ #include <memory>
+ 
  #include "base/cancelable_callback.h"
- #include "base/files/file_util.h"
- #include "base/sys_byteorder.h"
diff --git a/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc b/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc
new file mode 100644
index 000000000000..6ef1bb95ac5d
--- /dev/null
+++ b/www/chromium/files/patch-net_tools_get_server_time_get__server__time.cc
@@ -0,0 +1,20 @@
+--- net/tools/get_server_time/get_server_time.cc.orig	2016-12-16 03:15:59.232489000 +0000
++++ net/tools/get_server_time/get_server_time.cc	2016-12-16 03:16:40.661382000 +0000
+@@ -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 @@
+ 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/chromium/files/patch-net_udp_udp__socket__posix.cc b/www/chromium/files/patch-net_udp_udp__socket__posix.cc
new file mode 100644
index 000000000000..00100f7bd3b4
--- /dev/null
+++ b/www/chromium/files/patch-net_udp_udp__socket__posix.cc
@@ -0,0 +1,29 @@
+--- net/udp/udp_socket_posix.cc.orig	2016-12-16 03:54:19.436860000 +0000
++++ net/udp/udp_socket_posix.cc	2016-12-16 03:55:18.231119000 +0000
+@@ -51,7 +51,7 @@
+ const int kPortStart = 1024;
+ const int kPortEnd = 65535;
+ 
+-#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) {
+@@ -679,7 +679,7 @@
+   if (multicast_interface_ != 0) {
+     switch (addr_family_) {
+       case AF_INET: {
+-#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);
+@@ -754,7 +754,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);
diff --git a/www/chromium/files/patch-net_url_request_url__request__context__builder.cc b/www/chromium/files/patch-net_url_request_url__request__context__builder.cc
new file mode 100644
index 000000000000..f4c7d4564aaa
--- /dev/null
+++ b/www/chromium/files/patch-net_url_request_url__request__context__builder.cc
@@ -0,0 +1,11 @@
+--- net/url_request/url_request_context_builder.cc.orig	2016-12-16 03:18:23.560330000 +0000
++++ net/url_request/url_request_context_builder.cc	2016-12-16 03:19:00.302261000 +0000
+@@ -326,7 +326,7 @@
+   if (!proxy_service_) {
+     // TODO(willchan): Switch to using this code when
+     // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
+-#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(),
diff --git a/www/chromium/files/patch-services_ui_BUILD.gn b/www/chromium/files/patch-services_ui_BUILD.gn
new file mode 100644
index 000000000000..f5ce5e4004a4
--- /dev/null
+++ b/www/chromium/files/patch-services_ui_BUILD.gn
@@ -0,0 +1,18 @@
+--- services/ui/BUILD.gn.orig	2016-12-09 05:04:22.000000000 +0000
++++ services/ui/BUILD.gn	2016-12-19 19:02:41.332230000 +0000
+@@ -13,7 +13,6 @@
+   testonly = true
+   deps = [
+     ":ui",
+-    "//services/ui/ime/test_ime_driver",
+     "//services/ui/test_wm",
+   ]
+ }
+@@ -38,7 +37,6 @@
+ 
+   data_deps = [
+     ":manifest",
+-    "//services/ui/ime/test_ime_driver",
+   ]
+ 
+   resources = [
diff --git a/www/chromium/files/patch-services_ui_ime_BUILD.gn b/www/chromium/files/patch-services_ui_ime_BUILD.gn
new file mode 100644
index 000000000000..cdc304adf77b
--- /dev/null
+++ b/www/chromium/files/patch-services_ui_ime_BUILD.gn
@@ -0,0 +1,10 @@
+--- services/ui/ime/BUILD.gn.orig	2016-12-19 15:26:06.098748000 +0000
++++ services/ui/ime/BUILD.gn	2016-12-19 15:26:20.556851000 +0000
+@@ -49,7 +49,6 @@
+     ":test_manifest",
+     ":lib",
+     "//services/ui",
+-    "//services/ui/ime/test_ime_driver",
+   ]
+ }
+ 
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn
deleted file mode 100644
index ef053b3f5408..000000000000
--- a/www/chromium/files/patch-third__party_WebKit_Source_core_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/core/BUILD.gn.orig	2016-08-03 22:02:34.000000000 +0300
-+++ third_party/WebKit/Source/core/BUILD.gn	2016-09-29 17:55:09.476348000 +0300
-@@ -249,7 +249,7 @@
-     ]
-   }
- 
--  if (!is_linux) {
-+  if (!(is_linux || is_bsd)) {
-     sources -= [
-       "layout/LayoutThemeLinux.cpp",
-       "layout/LayoutThemeLinux.h",
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
new file mode 100644
index 000000000000..c5d5c71589e5
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2016-12-15 15:07:51.031899000 +0000
++++ third_party/WebKit/Source/core/layout/BUILD.gn	2016-12-15 15:08:04.975660000 +0000
+@@ -341,7 +341,7 @@
+     sources += [ "LayoutThemeFontProviderDefault.cpp" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux || is_bsd) {
+     sources += [
+       "LayoutThemeLinux.cpp",
+       "LayoutThemeLinux.h",
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
index 6775d378a057..cc16fbc726f4 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
@@ -1,18 +1,14 @@
---- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2016-05-27 10:30:48.384014000 -0400
-+++ third_party/WebKit/Source/platform/fonts/FontCache.cpp	2016-05-27 10:31:19.845787000 -0400
-@@ -59,13 +59,13 @@
+--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2016-12-13 00:43:16 UTC
++++ third_party/WebKit/Source/platform/fonts/FontCache.cpp
+@@ -61,9 +61,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)
+ FontCache::FontCache() : m_purgePreventCount(0), m_fontManager(nullptr) {}
+-#endif  // !OS(WIN) && !OS(LINUX)
++#endif  // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD)
  
- typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCacheKeyTraits> FontPlatformDataCache;
- typedef HashMap<FallbackListCompositeKey, OwnPtr<ShapeCache>, FallbackListCompositeKeyHash, FallbackListCompositeKeyTraits> FallbackListShaperCache;
+ typedef HashMap<unsigned,
+                 std::unique_ptr<FontPlatformData>,
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
index 43e546f7c444..d954bb977b11 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
@@ -1,11 +1,11 @@
---- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2016-05-27 10:32:12.763971000 -0400
-+++ third_party/WebKit/Source/platform/fonts/FontCache.h	2016-05-27 10:32:30.876177000 -0400
-@@ -174,7 +174,7 @@
-     // Implemented on skia platforms.
-     PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
+--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2016-12-13 00:42:58 UTC
++++ third_party/WebKit/Source/platform/fonts/FontCache.h
+@@ -217,7 +217,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&, FontFallbackPriority);
- #endif
- 
+   static AtomicString getFamilyNameForCharacter(SkFontMgr*,
+                                                 UChar32,
+                                                 const FontDescription&,
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
index c0f70f399448..38aa09f0db8c 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
@@ -1,47 +1,47 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2016-07-20 22:03:41.000000000 +0300
-+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp	2016-08-12 10:17:15.872857000 +0300
-@@ -93,7 +93,7 @@
-     , m_syntheticBold(source.m_syntheticBold)
-     , m_syntheticItalic(source.m_syntheticItalic)
-     , m_orientation(source.m_orientation)
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2016-12-13 00:46:20 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)
+       m_style(source.m_style),
  #endif
-     , m_harfBuzzFace(nullptr)
-@@ -115,7 +115,7 @@
-     , m_syntheticBold(src.m_syntheticBold)
-     , m_syntheticItalic(src.m_syntheticItalic)
-     , m_orientation(src.m_orientation)
+       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->style()))
- #endif
-     , m_harfBuzzFace(nullptr)
-@@ -142,7 +142,7 @@
-     , m_syntheticBold(syntheticBold)
-     , m_syntheticItalic(syntheticItalic)
-     , m_orientation(orientation)
+       m_style(FontRenderStyle::querySystem(m_family,
+                                            m_textSize,
+                                            m_typeface->style())),
+@@ -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->style()))
- #endif
-     , m_isHashTableDeletedValue(false)
-@@ -188,7 +188,7 @@
-     m_syntheticItalic = other.m_syntheticItalic;
-     m_harfBuzzFace = nullptr;
-     m_orientation = other.m_orientation;
++#if OS(LINUX) || OS(ANDROID) | OS(BSD)
+       m_style(FontRenderStyle::querySystem(m_family,
+                                            m_textSize,
+                                            m_typeface->style())),
+@@ -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;
++#if OS(LINUX) || OS(ANDROID) | OS(BSD)
+   m_style = other.m_style;
  #endif
-
-@@ -216,7 +216,7 @@
-         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
-         && m_syntheticBold == a.m_syntheticBold
-         && m_syntheticItalic == a.m_syntheticItalic
+ 
+@@ -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
+          && m_style == a.m_style
  #endif
-         && m_orientation == a.m_orientation;
+          && m_orientation == a.m_orientation;
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
index 61ffc211b09a..543c2e75ed2a 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
@@ -1,32 +1,32 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2016-08-05 04:20:03.099630000 +0300
-+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h	2016-08-05 04:18:22.356719000 +0300
-@@ -46,9 +46,9 @@
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2016-12-13 00:46:30 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)
+-#endif  // OS(LINUX) || OS(ANDROID)
++#endif  // OS(LINUX) || OS(ANDROID) || OS(BSD)
  
  #if OS(MACOSX)
  OBJC_CLASS NSFont;
-@@ -126,7 +126,7 @@
-     PassRefPtr<OpenTypeVerticalData> verticalData() const;
-     PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
+@@ -150,7 +150,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; }
- #endif
-@@ -152,7 +152,7 @@
-     bool m_syntheticItalic;
-     FontOrientation m_orientation;
- private:
+   // The returned styles are all actual styles without
+   // FontRenderStyle::NoPreference.
+   const FontRenderStyle& getFontRenderStyle() const { return m_style; }
+@@ -178,7 +178,7 @@ class PLATFORM_EXPORT FontPlatformData {
+   FontOrientation m_orientation;
+ 
+  private:
 -#if OS(LINUX) || OS(ANDROID)
 +#if OS(LINUX) || OS(ANDROID) || OS(BSD)
-     FontRenderStyle m_style;
+   FontRenderStyle m_style;
  #endif
  
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
index e5cf447a419d..b36dc333116d 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp
@@ -1,29 +1,29 @@
---- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig	2016-07-20 22:03:41.000000000 +0300
-+++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp	2016-08-12 10:20:18.427009000 +0300
-@@ -49,7 +49,7 @@
+--- third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig	2016-12-13 00:50:37 UTC
++++ third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp
+@@ -51,7 +51,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
+ static const size_t maxVDMXTableSize = 1024 * 1024;  // 1 MB
  #endif
-@@ -102,7 +102,7 @@
-     int vdmxAscent = 0, vdmxDescent = 0;
-     bool isVDMXValid = false;
-
+@@ -105,7 +105,7 @@ void SimpleFontData::platformInit() {
+   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).
-@@ -135,7 +135,7 @@
-     } else {
-         ascent = SkScalarRoundToInt(-metrics.fAscent);
-         descent = SkScalarRoundToInt(metrics.fDescent);
+   // 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).
+@@ -139,7 +139,7 @@ void SimpleFontData::platformInit() {
+   } else {
+     ascent = SkScalarRoundToInt(-metrics.fAscent);
+     descent = SkScalarRoundToInt(metrics.fDescent);
 -#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 ascent when possible.
+     // 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 ascent when
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
index 0227d80833d2..1a163489cc4c 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
@@ -1,6 +1,6 @@
---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-07-20 22:03:41.000000000 +0300
-+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp	2016-08-01 04:30:26.468814000 +0300
-@@ -60,7 +60,7 @@
+--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-12-13 00:51:35 UTC
++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
+@@ -63,7 +63,7 @@ static sk_sp<SkTypeface> typefaceForFont
  
  namespace blink {
  
@@ -9,12 +9,12 @@
  // Android special locale for retrieving the color emoji font
  // based on the proposed changes in UTR #51 for introducing
  // an Emoji script code:
-@@ -183,7 +183,7 @@
-     }
+@@ -229,7 +229,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 Manager.
+   // 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/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp
index ce430a5d1e3a..bc03254d5b51 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp
@@ -1,8 +1,6 @@
-https://chromium.googlesource.com/chromium/src.git/+/e60b571faa3f14dd9119a6792dccf12f8bf80192%5E%21/
-
---- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig	2016-08-03 19:02:36 UTC
+--- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig	2016-12-13 00:53:03 UTC
 +++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
-@@ -27,6 +27,9 @@
+@@ -28,6 +28,9 @@
  #include "wtf/StdLibExtras.h"
  #include "wtf/text/CharacterNames.h"
  
@@ -11,10 +9,10 @@ https://chromium.googlesource.com/chromium/src.git/+/e60b571faa3f14dd9119a6792dc
 +
  namespace blink {
  
- unsigned numGraphemeClusters(const String& string)
-@@ -123,13 +126,18 @@ static const unsigned char asciiLineBrea
-     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
+ unsigned numGraphemeClusters(const String& string) {
+@@ -129,6 +132,11 @@ static const unsigned char asciiLineBrea
  };
+ // clang-format on
  
 +#if U_ICU_VERSION_MAJOR_NUM >= 58
 +#define BA_LB_COUNT (U_LB_COUNT - 3)
@@ -24,41 +22,32 @@ https://chromium.googlesource.com/chromium/src.git/+/e60b571faa3f14dd9119a6792dc
  // Line breaking table for CSS word-break: break-all. This table differs from
  // asciiLineBreakTable in:
  // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
- //   Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
+@@ -136,7 +144,7 @@ static const unsigned char asciiLineBrea
  // - 1 indicates additional break opportunities. 0 indicates to fallback to
  //   normal line break, not "prohibit break."
+ // clang-format off
 -static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
 +static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
      // XX AI AL B2 BA BB BK CB    CL CM CR EX GL HY ID IN    IS LF NS NU OP PO PR QU    SA SG SP SY ZW NL WJ H2    H3 JL JT JV CP CJ HL RI
      { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
      { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
-@@ -179,10 +187,10 @@ static const unsigned char breakAllLineB
- #undef AL
- 
- static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
--static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
+@@ -190,7 +198,7 @@ static_assert(WTF_ARRAY_LENGTH(asciiLine
+                   asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar +
+                       1,
+               "asciiLineBreakTable should be consistent");
+-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT,
 +static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT,
-+              "breakAllLineBreakClassTable should be consistent");
+               "breakAllLineBreakClassTable should be consistent");
  
--static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
--{
-+static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) {
-     // Don't allow line breaking between '-' and a digit if the '-' may mean a minus sign in the context,
-     // while allow breaking in 'ABCD-1234' and '1234-5678' which may be in long URLs.
-     if (ch == '-' && isASCIIDigit(nextCh))
-@@ -210,10 +218,11 @@ static inline ULineBreak lineBreakProper
+ static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) {
+@@ -226,8 +234,8 @@ static inline ULineBreak lineBreakProper
  
- static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
- {
--    if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
--        const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
--        return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
--    }
+ static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak,
+                                             ULineBreak lineBreak) {
+-  if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 &&
+-      lastLineBreak < U_LB_COUNT) {
 +  if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 &&
 +      lastLineBreak < BA_LB_COUNT) {
-+    const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
-+    return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
-+  }
-     return false;
- }
- 
+     const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
+     return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
+   }
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
index 771cb56c9888..28b2f69150fc 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp
@@ -1,11 +1,11 @@
---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2016-07-20 22:03:42.000000000 +0300
-+++ third_party/WebKit/Source/web/PopupMenuImpl.cpp	2016-08-12 10:26:08.695632000 +0300
-@@ -155,7 +155,7 @@
-         , m_buffer(buffer)
-     {
-         DCHECK(m_buffer);
+--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2016-12-13 00:40:36 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
+     // 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/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
index 07583e5fec70..34a3e293fac7 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Assertions.cpp
@@ -1,29 +1,29 @@
---- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-07-20 22:03:42.000000000 +0300
-+++ third_party/WebKit/Source/wtf/Assertions.cpp	2016-08-12 11:13:22.515917000 +0300
-@@ -59,7 +59,7 @@
+--- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-12-13 00:15:09 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>
-@@ -159,7 +159,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
+@@ -164,7 +164,7 @@ void WTFReportAssertionFailure(const cha
+ }
+ 
+ void WTFGetBacktrace(void** stack, int* size) {
 -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
 +#if OS(MACOSX) || ((OS(LINUX) || OS(BSD)) && !defined(__UCLIBC__))
-     *size = backtrace(stack, *size);
+   *size = backtrace(stack, *size);
  #elif OS(WIN)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
-@@ -210,7 +210,7 @@
-     : m_name(0)
-     , m_cxaDemangled(0)
- {
+   // The CaptureStackBackTrace function is available in XP, but it is not
+@@ -215,7 +215,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;
+   Dl_info info;
+   if (!dladdr(addr, &info) || !info.dli_sname)
+     return;
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
index 6220da37556f..1316811ffd7b 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_Atomics.h
@@ -1,11 +1,11 @@
---- third_party/WebKit/Source/wtf/Atomics.h.orig	2016-07-20 22:03:42.000000000 +0300
-+++ third_party/WebKit/Source/wtf/Atomics.h	2016-08-12 13:10:55.631853000 +0300
-@@ -137,7 +137,7 @@
+--- third_party/WebKit/Source/wtf/Atomics.h.orig	2016-12-13 00:13:22 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);
+ ALWAYS_INLINE void releaseStore(volatile int* ptr, int value) {
+   __tsan_atomic32_store(ptr, value, __tsan_memory_order_release);
+ }
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
new file mode 100644
index 000000000000..481e94241ae3
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/wtf/BUILD.gn.orig	2016-12-14 18:31:06.308889000 +0000
++++ third_party/WebKit/Source/wtf/BUILD.gn	2016-12-14 18:32:07.771435000 +0000
+@@ -286,6 +286,10 @@
+     libs = [ "dl" ]
+   }
+ 
++  if (is_bsd) {
++    libs = [ "execinfo" ]
++  }
++
+   if (is_mac) {
+     libs = [
+       "CoreFoundation.framework",
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
index db652cd46cfe..ef31c9b288a5 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
@@ -1,17 +1,23 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2016-03-25 13:05:01 UTC
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2016-12-13 00:09:55 UTC
 +++ third_party/WebKit/Source/wtf/ByteSwap.h
-@@ -52,9 +52,15 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t 
+@@ -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); }
+ 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); }
+ 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); }
+ ALWAYS_INLINE uint16_t bswap16(uint16_t x) {
+   return __builtin_bswap16(x);
+ }
 +#endif
  
  #endif
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
index e2bc16e6a717..fc1f8ed4a8ab 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ContainerAnnotations.h
@@ -1,11 +1,11 @@
---- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig	2016-07-20 22:03:42.000000000 +0300
-+++ third_party/WebKit/Source/wtf/ContainerAnnotations.h	2016-08-12 11:30:35.829840000 +0300
+--- third_party/WebKit/Source/wtf/ContainerAnnotations.h.orig	2016-12-13 00:24:56 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) { \
+ #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)                       \
+   if (buffer) {                                                              \
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
index b7a3c9972d47..4ac31925c1a4 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
@@ -1,14 +1,14 @@
---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2016-07-20 22:03:42.000000000 +0300
-+++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp	2016-08-12 11:08:14.275410000 +0300
-@@ -51,11 +51,15 @@
+--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2016-12-13 00:19:49 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>
@@ -17,13 +17,13 @@
 +#if OS(LINUX) || OS(ANDROID) || OS(BSD)
  #include <unistd.h>
  #endif
-
-@@ -97,6 +101,8 @@
-     return pthread_mach_thread_np(pthread_self());
+ 
+@@ -91,6 +95,8 @@ ThreadIdentifier currentThread() {
+   return pthread_mach_thread_np(pthread_self());
  #elif OS(LINUX)
-     return syscall(__NR_gettid);
+   return syscall(__NR_gettid);
 +#elif OS(BSD)
-+    return pthread_getthreadid_np();
++  return pthread_getthreadid_np();
  #elif OS(ANDROID)
-     return gettid();
+   return gettid();
  #else
diff --git a/www/chromium/files/patch-third__party_cython_rules.gni b/www/chromium/files/patch-third__party_cython_rules.gni
deleted file mode 100644
index b005160ded2b..000000000000
--- a/www/chromium/files/patch-third__party_cython_rules.gni
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/cython/rules.gni.orig	2016-08-03 22:02:38.000000000 +0300
-+++ third_party/cython/rules.gni	2016-09-03 01:42:35.847781000 +0300
-@@ -6,7 +6,7 @@
- 
- template("python_binary_source_set") {
-   # Only available on linux for now.
--  assert(is_linux)
-+  assert(is_linux || is_bsd)
-   assert(defined(invoker.cython_sources) || defined(invoker.sources))
- 
-   config_name = target_name + "_python_config"
-@@ -81,7 +81,7 @@
- 
- template("python_binary_module") {
-   # Only available on linux for now.
--  assert(is_linux)
-+  assert(is_linux || is_bsd)
- 
-   has_sources = defined(invoker.cython_sources) || defined(invoker.sources)
- 
-@@ -92,7 +92,7 @@
-   sources_target_name = target_name + "_cython_sources"
-   shared_library_name = target_name + "_shared_library"
- 
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     shared_library_prefix = "lib"
-     shared_library_suffix = ".so"
-     python_module_suffix = ".so"
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
deleted file mode 100644
index e77bf709f5fb..000000000000
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2016-05-11 19:03:23 UTC
-+++ third_party/ffmpeg/chromium/scripts/generate_gyp.py
-@@ -43,6 +43,8 @@ import sys
- COPYRIGHT = """# Copyright %d 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.
-+#
-+# modified: cmt@burggraben.net
- 
- # NOTE: this file is autogenerated by ffmpeg/chromium/scripts/generate_gyp.py
- 
-@@ -372,6 +374,8 @@ class SourceSet(object):
- 
-       if condition.PLATFORM == '*':
-         platform_condition = None
-+      elif condition.PLATFORM == 'linux':
-+        platform_condition = '(OS == "%s" or os_bsd == 1)' % condition.PLATFORM
-       else:
-         platform_condition = 'OS == "%s"' % condition.PLATFORM
- 
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
index 415267aa5f4f..6212fefc94d4 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
@@ -1,5 +1,5 @@
---- third_party/pdfium/core/fxcrt/include/fx_system.h.orig	2016-05-27 12:08:17.275494000 -0400
-+++ third_party/pdfium/core/fxcrt/include/fx_system.h	2016-05-27 12:08:33.590631000 -0400
+--- third_party/pdfium/core/fxcrt/fx_system.h.orig	2016-12-13 00:26:52 UTC
++++ third_party/pdfium/core/fxcrt/fx_system.h
 @@ -40,7 +40,7 @@
  #elif defined(_WIN64)
  #define _FX_OS_ _FX_WIN64_DESKTOP_
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
index c06774497d2f..efa9d983ab99 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_BUILD.gn
@@ -1,16 +1,6 @@
---- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2016-08-03 22:04:03.000000000 +0300
-+++ third_party/webrtc/modules/video_coding/BUILD.gn	2016-09-25 02:37:44.041881000 +0300
-@@ -135,9 +135,6 @@
-     "codecs/h264/include/h264.h",
-   ]
- 
--  configs += [ "../..:common_config" ]
--  public_configs = [ "../..:common_inherited_config" ]
--
-   if (is_clang) {
-     # Suppress warnings from Chrome's Clang plugins.
-     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-@@ -145,9 +142,7 @@
+--- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2016-12-13 00:29:05 UTC
++++ third_party/webrtc/modules/video_coding/BUILD.gn
+@@ -140,9 +140,7 @@ rtc_static_library("webrtc_h264") {
    }
  
    defines = []
@@ -19,9 +9,9 @@
 -  ]
 +  deps = []
  
-   if (rtc_use_h264) {
-     defines += [ "WEBRTC_USE_H264" ]
-@@ -161,11 +156,15 @@
+   if (is_ios) {
+     sources += [ "codecs/h264/h264_objc.mm" ]
+@@ -161,9 +159,9 @@ rtc_static_library("webrtc_h264") {
        "codecs/h264/h264_encoder_impl.h",
      ]
      deps += [
@@ -31,10 +21,4 @@
 +      "../../common_video",
      ]
    }
-+  deps += ["../../system_wrappers"]
-+  configs += [ "../..:common_config" ]
-+  public_configs = [ "../..:common_inherited_config" ]
-+
  }
- 
- # TODO(tkchin): Source set for webrtc_h264_video_toolbox. Currently not
diff --git a/www/chromium/files/patch-tools_gn_gn__unittests.isolate b/www/chromium/files/patch-tools_gn_gn__unittests.isolate
deleted file mode 100644
index 73db746f1191..000000000000
--- a/www/chromium/files/patch-tools_gn_gn__unittests.isolate
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/gn/gn_unittests.isolate.orig	2016-08-03 22:02:40.000000000 +0300
-+++ tools/gn/gn_unittests.isolate	2016-09-02 20:40:26.667487000 +0300
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
- {
-   'conditions': [
--    ['OS=="linux" or OS=="mac" or OS=="win"', {
-+    ['OS=="linux" or OS=="bsd" or OS=="mac" or OS=="win"', {
-       'variables': {
-         'command': [
-           '<(PRODUCT_DIR)/gn_unittests<(EXECUTABLE_SUFFIX)',
diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
new file mode 100644
index 000000000000..d15e8130b56e
--- /dev/null
+++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
@@ -0,0 +1,11 @@
+--- tools/variations/fieldtrial_to_struct.py.orig	2016-12-13 00:00:14 UTC
++++ tools/variations/fieldtrial_to_struct.py
+@@ -113,7 +113,7 @@ def main(arguments):
+   if not opts.platform:
+     parser.error('You must specify a --platform.')
+ 
+-  supported_platforms = ['android', 'chromeos', 'ios', 'linux', 'mac', 'win']
++  supported_platforms = ['android', 'chromeos', 'ios', 'linux', '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/chromium/files/patch-ui_app__list_app__list__menu.cc b/www/chromium/files/patch-ui_app__list_app__list__menu.cc
deleted file mode 100644
index 1a67519d5df8..000000000000
--- a/www/chromium/files/patch-ui_app__list_app__list__menu.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/app_list/app_list_menu.cc.orig	2016-10-06 04:02:44.000000000 +0300
-+++ ui/app_list/app_list_menu.cc	2016-10-13 09:13:00.191033000 +0300
-@@ -30,7 +30,7 @@
-   // only 1 user.
-   if (users_.size() > 1) {
-     for (size_t i = 0; i < users_.size(); ++i) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-       menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name);
-       int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
-       menu_model_.SetSublabel(menu_index, users_[i].email);
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index c37f4a7b28ac..2a75e91997b8 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,15 +1,15 @@
---- ui/gl/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
-+++ ui/gl/BUILD.gn	2016-09-03 00:16:34.776838000 +0300
-@@ -5,7 +5,7 @@
- import("//build/config/ui.gni")
- import("//testing/test.gni")
+--- ui/gl/BUILD.gn.orig	2016-12-12 22:13:27 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
+ use_glx = use_x11 || ozone_platform_x11
  
  if (is_android) {
-@@ -163,7 +163,7 @@
+@@ -170,7 +170,7 @@ component("gl") {
        "gl_surface_egl.h",
      ]
    }
diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn
index 3ff9c820886e..b8db1e47002b 100644
--- a/www/chromium/files/patch-ui_views_BUILD.gn
+++ b/www/chromium/files/patch-ui_views_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/views/BUILD.gn.orig	2016-08-03 22:02:41.000000000 +0300
-+++ ui/views/BUILD.gn	2016-09-03 00:17:57.369360000 +0300
-@@ -60,7 +60,7 @@
+--- ui/views/BUILD.gn.orig	2016-12-12 22:16:29 UTC
++++ ui/views/BUILD.gn
+@@ -424,7 +424,7 @@ component("views") {
    if (use_x11 && !is_chromeos) {
      deps += [ "//ui/display/util" ]
    }
@@ -9,12 +9,12 @@
      sources -= [ "window/window_button_order_provider.cc" ]
      deps += [ "//ui/shell_dialogs" ]
    } else {
-@@ -128,7 +128,7 @@
-       } else if (use_ozone) {
-         sources += gypi_values.views_desktop_aura_ozone_sources
+@@ -614,7 +614,7 @@ component("views") {
+           "widget/desktop_aura/desktop_window_tree_host_ozone.cc",
+         ]
        }
 -      if (is_linux) {
 +      if (is_linux || is_bsd) {
-         sources += gypi_values.views_desktop_aura_linux_sources
-       }
-     }
+         sources += [
+           "style/platform_style_linux.cc",
+           "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc",
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index 1ea8c8651e22..d992152ea87d 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig	2016-10-06 04:02:45.000000000 +0300
-+++ ui/views/controls/textfield/textfield.cc	2016-10-13 09:32:03.632280000 +0300
-@@ -51,7 +51,7 @@
+--- ui/views/controls/textfield/textfield.cc.orig	2016-12-12 22:18:59 UTC
++++ ui/views/controls/textfield/textfield.cc
+@@ -52,7 +52,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"
-@@ -156,14 +156,14 @@
+@@ -157,14 +157,14 @@ ui::TextEditCommand GetCommandForKeyEven
      case ui::VKEY_BACK:
        if (!control)
          return ui::TextEditCommand::DELETE_BACKWARD;
@@ -26,7 +26,7 @@
        // Only erase by line break on Linux and ChromeOS.
        if (shift && control)
          return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -596,7 +596,7 @@
+@@ -596,7 +596,7 @@ bool Textfield::OnMousePressed(const ui:
        OnAfterUserAction();
      }
  
@@ -35,7 +35,7 @@
      if (event.IsOnlyMiddleMouseButton()) {
        if (GetRenderText()->IsPointInSelection(event.location())) {
          OnBeforeUserAction();
-@@ -665,7 +665,7 @@
+@@ -666,7 +666,7 @@ bool Textfield::OnKeyPressed(const ui::K
    if (!textfield)
      return handled;
  
@@ -44,7 +44,7 @@
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -805,7 +805,7 @@
+@@ -809,7 +809,7 @@ void Textfield::AboutToRequestFocusFromT
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -53,7 +53,7 @@
    // Skip any accelerator handling that conflicts with custom keybindings.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
        ui::GetTextEditKeyBindingsDelegate();
-@@ -1065,7 +1065,7 @@
+@@ -1073,7 +1073,7 @@ void Textfield::WriteDragDataForView(Vie
    std::unique_ptr<gfx::Canvas> canvas(
        GetCanvasForDragImage(GetWidget(), label.size()));
    label.SetEnabledColor(GetTextColor());
@@ -62,12 +62,12 @@
    // Desktop Linux Aura does not yet support transparency in drag images.
    canvas->DrawColor(GetBackgroundColor());
  #endif
-@@ -2004,7 +2004,7 @@
+@@ -2024,7 +2024,7 @@ void Textfield::CreateTouchSelectionCont
  }
  
  void Textfield::UpdateSelectionClipboard() const {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (performing_user_action_ && HasSelection()) {
+   if (performing_user_action_ && HasSelection() &&
+       text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) {
      ui::ScopedClipboardWriter(
-         ui::CLIPBOARD_TYPE_SELECTION).WriteText(GetSelectedText());
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
new file mode 100644
index 000000000000..cf12eb5fedbb
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -0,0 +1,11 @@
+--- ui/views/corewm/tooltip_aura.cc.orig	2016-12-16 15:15:24.020369000 +0000
++++ ui/views/corewm/tooltip_aura.cc	2016-12-16 15:16:03.296431000 +0000
+@@ -34,7 +34,7 @@
+ 
+ // TODO(varkha): Update if native widget can be transparent on Linux.
+ bool CanUseTranslucentTooltipWidget() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   return false;
+ #else
+   return true;
diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js
index 1ce1cd0e04b0..5ac75395ba24 100644
--- a/www/chromium/files/patch-ui_webui_resources_js_icon.js
+++ b/www/chromium/files/patch-ui_webui_resources_js_icon.js
@@ -1,11 +1,11 @@
---- ui/webui/resources/js/icon.js.orig	2016-08-04 10:04:19.233504000 -0400
-+++ ui/webui/resources/js/icon.js	2016-08-04 10:04:37.016751000 -0400
-@@ -9,7 +9,7 @@
-    */
-   function getSupportedScaleFactors() {
-     var supportedScaleFactors = [];
+--- ui/webui/resources/js/icon.js.orig	2016-12-12 22:24:45 UTC
++++ ui/webui/resources/js/icon.js
+@@ -14,7 +14,7 @@ cr.define('cr.icon', function() {
+       // supports SCALE_FACTOR_100P on all non-iOS platforms.
+       supportedScaleFactors.push(1);
+     }
 -    if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
 +    if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) {
-       // All desktop platforms support zooming which also updates the
-       // renderer's device scale factors (a.k.a devicePixelRatio), and
-       // these platforms has high DPI assets for 2.0x. Use 1x and 2x in
+       // All desktop platforms support zooming which also updates the renderer's
+       // device scale factors (a.k.a devicePixelRatio), and these platforms have
+       // high DPI assets for 2x.  Let the renderer pick the closest image for
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index abcb1ecacd9f..df35456dac14 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,15 @@
---- v8/BUILD.gn.orig	2016-10-06 04:05:41.000000000 +0300
-+++ v8/BUILD.gn	2016-10-14 04:33:56.674783000 +0300
-@@ -2096,6 +2096,12 @@
+--- v8/BUILD.gn.orig	2016-12-01 23:03:17.000000000 +0000
++++ v8/BUILD.gn	2016-12-16 15:25:09.616617000 +0000
+@@ -2226,7 +2226,7 @@
+     sources += [ "src/base/platform/platform-posix.cc" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     sources += [
+       "src/base/debug/stack_trace_posix.cc",
+       "src/base/platform/platform-linux.cc",
+@@ -2236,6 +2236,12 @@
        "dl",
        "rt",
      ]
@@ -13,7 +22,7 @@
    } else if (is_android) {
      if (current_toolchain == host_toolchain) {
        libs = [
-@@ -2227,6 +2233,7 @@
+@@ -2388,6 +2394,7 @@
      sources = [
        "src/snapshot/mksnapshot.cc",
      ]
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 00a6b3fa6848..77f3dc8088cd 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -23,7 +23,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/locales/es.pak
 %%DATADIR%%/locales/et.pak
 %%DATADIR%%/locales/fa.pak
-%%DATADIR%%/locales/fake-bidi.pak
 %%DATADIR%%/locales/fi.pak
 %%DATADIR%%/locales/fil.pak
 %%DATADIR%%/locales/fr.pak
@@ -186,12 +185,12 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
-%%DATADIR%%/resources/inspector/es_tree/es_tree_module.js
 %%DATADIR%%/resources/inspector/formatter_worker.js
 %%DATADIR%%/resources/inspector/gonzales/gonzales_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker.js
 %%DATADIR%%/resources/inspector/inspector.html
 %%DATADIR%%/resources/inspector/inspector.js
+%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
 %%DATADIR%%/resources/inspector/layers/layers_module.js
 %%DATADIR%%/resources/inspector/network/network_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
@@ -199,11 +198,14 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/sass/sass_module.js
 %%DATADIR%%/resources/inspector/screencast/screencast_module.js
 %%DATADIR%%/resources/inspector/security/security_module.js
+%%DATADIR%%/resources/inspector/services/services_module.js
 %%DATADIR%%/resources/inspector/settings/settings_module.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/temp_storage_shared_worker.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