MFH: r436365

www/chromium: update to 57.0.2987.110 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html Approved by: ports-secteam (junovitch)
author: Carlos J. Puga Medina <cpm@FreeBSD.org> 2017-03-18 00:57:10 +0000
committer: Carlos J. Puga Medina <cpm@FreeBSD.org> 2017-03-18 00:57:10 +0000
commit: f1653e7a0b6b00b774cb588300d6a03c7d6cadd5 (patch)
tree: 1ea4104f3d224ae4b3b51354d76b2c93ceac01ac
parent: dcf57b80221cf973bfa51d9bfc31cf3ed8f9c3d7 (diff)
download: ports-f1653e7a0b6b00b774cb588300d6a03c7d6cadd5.tar.gz
ports-f1653e7a0b6b00b774cb588300d6a03c7d6cadd5.zip
254 files changed, 1188 insertions, 1247 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 3ea2ff2b235b..38e28de2345e 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	56.0.2924.87
-PORTREVISION=	2
+PORTVERSION=	57.0.2987.110
 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
@@ -85,6 +84,7 @@ GN_ARGS+=	is_clang=true \
 		enable_one_click_signin=true \
 		enable_remoting=false \
 		enable_webrtc=false \
+		fieldtrial_testing_like_official_build=true \
 		toolkit_views=true \
 		use_allocator="none" \
 		use_aura=true \
@@ -201,10 +201,9 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-10
 .endif
 
-.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} < 1200000)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-new
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-old
+# Work around base r261801
+.if ${OSVERSION} < 1100508
+GN_ARGS+=	extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"
 .endif
 .endif
 
@@ -248,6 +247,10 @@ test regression-test: build
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1
+.for t in font_service ui
+	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \
+		${STAGEDIR}${DATADIR}
+.endfor
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
@@ -255,8 +258,8 @@ do-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
-.for p in chrome_100_percent chrome_200_percent keyboard_resources resources \
-	mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \
+.for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \
+	resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \
 	views_mus_resources
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \
 		${STAGEDIR}${DATADIR}
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index fda4e173c6e5..5f48da8ed836 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1486036781
-SHA256 (chromium-56.0.2924.87.tar.xz) = 9aac081ffccaae6497068100477a4e6ac7086bd15ad3c3cd009b9a760b7a53e0
-SIZE (chromium-56.0.2924.87.tar.xz) = 514429808
-SHA256 (chromium-56.0.2924.87-testdata.tar.xz) = 2dea413379e4eccd351bb50cede549e9a8c4fbd897f6a8b03442c7a9b57d6b55
-SIZE (chromium-56.0.2924.87-testdata.tar.xz) = 123553884
+TIMESTAMP = 1489743061
+SHA256 (chromium-57.0.2987.110.tar.xz) = 6a03a290b313c5d8bb89891bfc816c61c798e6c96eaa62fb254d77ce9c2b89e4
+SIZE (chromium-57.0.2987.110.tar.xz) = 525293172
+SHA256 (chromium-57.0.2987.110-testdata.tar.xz) = 8f8b768190da7cea9365816443b0b98811cf7da939eed0752092d30b2d51752e
+SIZE (chromium-57.0.2987.110-testdata.tar.xz) = 124084508
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 378e4ea57314..c5f7f8f802c1 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -27,17 +27,6 @@
    if (*ptr == kFinalTlsValue)
      return;  // We've been called enough times.
    ASSERT_LT(kFinalTlsValue, *ptr);
---- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200
-+++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200
-@@ -425,7 +425,7 @@
-   }
-   // We must NOT do any allocations during this callback.
-   // Using the simple linked lists avoids all allocations.
--  DCHECK_EQ(this->next_retired_worker_, reinterpret_cast<ThreadData*>(NULL));
-+  DCHECK_EQ(this->next_retired_worker_, static_cast<ThreadData*>(NULL));
-   this->next_retired_worker_ = first_retired_worker_;
-   first_retired_worker_ = this;
- }
 --- base/tracked_objects_unittest.cc.orig   2015-08-22 15:01:51.000000000 -0400
 +++ base/tracked_objects_unittest.cc    2015-09-03 09:20:53.370191000 -0400
 @@ -58,9 +58,9 @@
@@ -63,26 +52,6 @@
 
      EXPECT_CALL(callback_, OnError(_))
          .Times(2);
---- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
-+++ third_party/hunspell/src/hunspell/affentry.hxx  2015-07-21 18:48:02.034251000 -0400
-@@ -27,7 +27,7 @@
-   struct hentry *      checkword(const char * word, int len, char in_compound,
-                             const FLAG needflag = FLAG_NULL);
-
--  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
-+  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0);
-
-   char *      check_morph(const char * word, int len, char in_compound,
-                             const FLAG needflag = FLAG_NULL);
-@@ -90,7 +90,7 @@
- //                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
-                     const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
-
--  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
-+  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0);
-
-   char *      check_twosfx_morph(const char * word, int len, int optflags,
-                  PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
 --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc	2015-04-15 00:31:48.000000000 +0200
 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc	2015-04-18 22:05:41.000000000 +0200
 @@ -439,7 +439,7 @@
@@ -130,14 +99,13 @@
                      CMapFormat::kFormat4, cmap_id) {
  }
 
---- third_party/webrtc/base/taskrunner.cc	2015-04-15 00:32:17.000000000 +0200
-+++ third_party/webrtc/base/taskrunner.cc	2015-04-18 22:10:53.000000000 +0200
-@@ -102,7 +102,7 @@
+--- third_party/webrtc/base/taskrunner.cc.orig	2017-03-09 21:05:29.000000000 +0100
++++ third_party/webrtc/base/taskrunner.cc	2017-03-10 13:19:54.203141000 +0100
+@@ -96,7 +96,7 @@
    std::vector<Task *>::iterator it;
    it = std::remove(tasks_.begin(),
                     tasks_.end(),
 -                   reinterpret_cast<Task *>(NULL));
 +                   static_cast<Task *>(NULL));
-
+ 
    tasks_.erase(it, tasks_.end());
-
diff --git a/www/chromium/files/extra-patch-libc++-new b/www/chromium/files/extra-patch-libc++-new
deleted file mode 100644
index a62e8543187d..000000000000
--- a/www/chromium/files/extra-patch-libc++-new
+++ /dev/null
@@ -1,14 +0,0 @@
---- services/ui/ws/BUILD.gn.orig	2016-12-09 17:47:26.343517000 +0000
-+++ services/ui/ws/BUILD.gn	2016-12-09 17:48:45.323876000 +0000
-@@ -103,6 +103,11 @@
-     "window_tree_host_factory.h",
-   ]
- 
-+  # Work around base r261801
-+  if (is_bsd) {
-+    defines = ["_LIBCPP_ABI_UNSTABLE=1"]
-+  }
-+
-   deps = [
-     # TODO(sad): Temporary, until the GPU process is split out of ws.
-     "//services/ui/gpu",
diff --git a/www/chromium/files/extra-patch-libc++-old b/www/chromium/files/extra-patch-libc++-old
deleted file mode 100644
index 2c00e5d85679..000000000000
--- a/www/chromium/files/extra-patch-libc++-old
+++ /dev/null
@@ -1,14 +0,0 @@
---- services/ui/ws/BUILD.gn.orig	2016-12-09 17:47:26.343517000 +0000
-+++ services/ui/ws/BUILD.gn	2016-12-09 17:50:06.387679000 +0000
-@@ -103,6 +103,11 @@
-     "window_tree_host_factory.h",
-   ]
- 
-+  # Work around base r261801
-+  if (is_bsd) {
-+    defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"]
-+  }
-+
-   deps = [
-     # TODO(sad): Temporary, until the GPU process is split out of ws.
-     "//services/ui/gpu",
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 0110971200be..f16e1e84a814 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2017-01-26 00:49:06 UTC
+--- BUILD.gn.orig	2017-03-09 20:04:26 UTC
 +++ BUILD.gn
-@@ -217,7 +217,7 @@ group("both_gn_and_gyp") {
+@@ -221,7 +221,7 @@ group("both_gn_and_gyp") {
      ]
    }
  
@@ -9,7 +9,7 @@
      deps += [
        "//chrome",
        "//chrome/test:browser_tests",
-@@ -277,7 +277,7 @@ group("both_gn_and_gyp") {
+@@ -281,7 +281,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 += [
-@@ -320,7 +320,7 @@ group("both_gn_and_gyp") {
+@@ -325,7 +325,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" ]
    }
  
-@@ -488,7 +488,7 @@ group("both_gn_and_gyp") {
+@@ -495,7 +495,7 @@ group("both_gn_and_gyp") {
      ]
    }
  
@@ -36,7 +36,7 @@
      # The following are definitely linux-only.
      deps += [
        "//chrome:manpage",
-@@ -515,9 +515,16 @@ group("both_gn_and_gyp") {
+@@ -518,9 +518,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",
-@@ -588,7 +595,7 @@ group("both_gn_and_gyp") {
+@@ -592,7 +599,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" ]
  
-@@ -698,7 +705,7 @@ group("both_gn_and_gyp") {
+@@ -700,7 +707,7 @@ group("both_gn_and_gyp") {
        deps +=
            [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
      }
@@ -72,7 +72,7 @@
      deps += [ "//breakpad:symupload($host_toolchain)" ]
    }
  
-@@ -743,7 +750,7 @@ group("gn_only") {
+@@ -745,7 +752,7 @@ group("gn_only") {
      deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
    }
  
@@ -80,8 +80,8 @@
 +  if (is_win || is_linux || is_bsd) {
      deps += [
        "//mash:all",
-       "//media/mojo/services:media_mojo_shell_unittests",
-@@ -763,7 +770,7 @@ group("gn_only") {
+       "//media/mojo/services:media_service_unittests",
+@@ -771,7 +778,7 @@ group("gn_only") {
      }
    }
  
@@ -90,8 +90,8 @@
      # TODO(GYP): Figure out if any of these should be in gn_all
      # and figure out how cross-platform they are
      deps += [
-@@ -816,7 +823,7 @@ group("gn_only") {
-     ]
+@@ -826,7 +833,7 @@ group("gn_only") {
+     }
  
      if (target_cpu == "x86" || target_cpu == "x64") {
 -      if (!is_android) {
@@ -99,7 +99,7 @@
          deps += [ "//chrome/test:load_library_perf_tests" ]
        }
        deps += [
-@@ -824,7 +831,7 @@ group("gn_only") {
+@@ -834,7 +841,7 @@ group("gn_only") {
          "//third_party/libjpeg_turbo:simd_asm",
        ]
      }
@@ -108,7 +108,7 @@
        deps += [ "//v8:v8_shell" ]
      }
    }
-@@ -834,7 +841,7 @@ group("gn_only") {
+@@ -844,7 +851,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",
-@@ -877,7 +884,7 @@ group("gn_only") {
+@@ -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 = [
-@@ -903,7 +910,7 @@ group("gn_visibility") {
+@@ -902,7 +909,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") {
-@@ -949,7 +956,7 @@ if (!is_ios) {
+@@ -948,7 +955,7 @@ if (!is_ios) {
        data_deps += [ "//content/shell:content_shell_crash_service" ]
      }
  
@@ -144,7 +144,7 @@
        data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
      }
  
-@@ -957,7 +964,7 @@ if (!is_ios) {
+@@ -956,7 +963,7 @@ if (!is_ios) {
        data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -153,7 +153,7 @@
        data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -979,7 +986,7 @@ group("chromium_swarm_tests") {
+@@ -978,7 +985,7 @@ group("chromium_swarm_tests") {
  group("chromium_builder_perf") {
    testonly = true
  
@@ -162,7 +162,7 @@
      data_deps = [
        "//cc:cc_perftests",
        "//chrome/test:load_library_perf_tests",
-@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") {
+@@ -1008,7 +1015,7 @@ group("chromium_builder_perf") {
          "//chrome/installer/mini_installer:mini_installer",
          "//chrome/test:angle_perftests",
        ]
diff --git a/www/chromium/files/patch-ash_shell.cc b/www/chromium/files/patch-ash_shell.cc
deleted file mode 100644
index 1f5835af023d..000000000000
--- a/www/chromium/files/patch-ash_shell.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ash/shell.cc.orig	2017-01-26 00:49:07 UTC
-+++ ash/shell.cc
-@@ -579,7 +579,7 @@ void Shell::Init(const ShellInitParams& 
- 
-   immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>();
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   NOTREACHED() << "linux desktop does not support ash.";
- #endif
- 
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index e1b2c0d7292f..eedcb50be54c 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- base/BUILD.gn.orig	2017-03-09 20:04:26 UTC
 +++ base/BUILD.gn
-@@ -1076,6 +1076,35 @@ component("base") {
+@@ -1116,6 +1116,35 @@ component("base") {
      public_deps += [ "//base/allocator:unified_allocator_shim" ]
    }
  
@@ -36,7 +36,7 @@
    # Allow more direct string conversions on platforms with native utf8
    # strings
    if (is_mac || is_ios || is_chromeos || is_chromecast) {
-@@ -1347,7 +1376,7 @@ component("base") {
+@@ -1416,7 +1445,7 @@ component("base") {
    }
  
    # Linux.
@@ -45,7 +45,7 @@
      if (is_asan || is_lsan || is_msan || is_tsan) {
        # For llvm-sanitizer.
        data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-@@ -1372,7 +1401,7 @@ component("base") {
+@@ -1441,7 +1470,7 @@ component("base") {
        "//base/third_party/xdg_user_dirs",
      ]
    } else {
@@ -54,7 +54,7 @@
      sources -= [
        "nix/mime_util_xdg.cc",
        "nix/mime_util_xdg.h",
-@@ -1388,6 +1417,13 @@ component("base") {
+@@ -1457,6 +1486,13 @@ component("base") {
      }
    }
  
@@ -68,7 +68,7 @@
    # iOS
    if (is_ios) {
      set_sources_assignment_filter([])
-@@ -2154,6 +2190,12 @@ test("base_unittests") {
+@@ -2245,6 +2281,12 @@ test("base_unittests") {
      set_sources_assignment_filter(sources_assignment_filter)
    }
  
diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
index 1ebf6eeb5d40..d5e9bc70f71c 100644
--- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
@@ -1,4 +1,4 @@
---- base/allocator/allocator_shim_unittest.cc.orig	2017-01-26 00:49:07 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig	2017-03-09 20:04:26 UTC
 +++ base/allocator/allocator_shim_unittest.cc
 @@ -4,7 +4,6 @@
  
@@ -8,7 +8,7 @@
  #include <stdlib.h>
  #include <string.h>
  
-@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -196,11 +195,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
    ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u);
  
  #if !defined(OS_WIN)
@@ -22,7 +22,7 @@
  
    void* posix_memalign_ptr = nullptr;
    int res = posix_memalign(&posix_memalign_ptr, 256, 59);
-@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -217,12 +218,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS
    ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
    ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
  
@@ -37,7 +37,7 @@
  #endif  // OS_WIN
  
    char* realloc_ptr = static_cast<char*>(realloc(nullptr, 71));
-@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -243,8 +246,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
    ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
  
  #if !defined(OS_WIN)
@@ -48,7 +48,7 @@
  
    free(posix_memalign_ptr);
    ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u);
-@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -252,8 +257,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS
    free(valloc_ptr);
    ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u);
  
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index 9c0360484132..7e2f27d820b0 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,15 @@
---- base/debug/stack_trace_posix.cc.orig	2017-01-26 00:49:07 UTC
+--- base/debug/stack_trace_posix.cc.orig	2017-03-09 20:04:26 UTC
 +++ base/debug/stack_trace_posix.cc
-@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper {
+@@ -33,7 +33,7 @@
+ #include <AvailabilityMacros.h>
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/debug/proc_maps_linux.h"
+ #endif
+ 
+@@ -574,6 +574,10 @@ class SandboxSymbolizeHelper {
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -11,7 +20,7 @@
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -586,6 +590,7 @@ class SandboxSymbolizeHelper {
+@@ -589,6 +593,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index ca8414ecf548..8f98ccd44d1a 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig	2017-01-26 00:49:07 UTC
+--- base/process/process_metrics.h.orig	2017-03-09 20:04:26 UTC
 +++ base/process/process_metrics.h
 @@ -22,6 +22,12 @@
  #include "base/values.h"
@@ -13,7 +13,7 @@
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
  #include "base/process/port_provider_mac.h"
-@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
+@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
  BASE_EXPORT int ParseProcStatCPU(const std::string& input);
diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn
index 3404b541653a..7ba56ddd7a0c 100644
--- a/www/chromium/files/patch-base_test_BUILD.gn
+++ b/www/chromium/files/patch-base_test_BUILD.gn
@@ -1,6 +1,6 @@
---- base/test/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- base/test/BUILD.gn.orig	2017-03-09 20:04:26 UTC
 +++ base/test/BUILD.gn
-@@ -303,7 +303,7 @@ static_library("run_all_base_unittests")
+@@ -312,7 +312,7 @@ static_library("run_all_base_unittests")
    ]
  }
  
diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
index f06b4b301550..9dbbc6d232be 100644
--- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig	2017-01-26 00:49:07 UTC
+--- base/test/launcher/test_launcher.cc.orig	2017-03-09 20:04:26 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -59,6 +59,10 @@
+@@ -60,6 +60,10 @@
  #include "base/win/windows_version.h"
  #endif
  
diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
index 7654c0f9374c..fd49b2938b19 100644
--- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
+++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
@@ -1,12 +1,12 @@
---- base/third_party/libevent/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- base/third_party/libevent/BUILD.gn.orig	2017-03-09 20:04:26 UTC
 +++ base/third_party/libevent/BUILD.gn
-@@ -29,6 +29,9 @@ static_library("libevent") {
-   } else if (is_linux) {
-     sources += [ "epoll.c" ]
+@@ -50,6 +50,9 @@ static_library("libevent") {
+       "linux/event-config.h",
+     ]
      include_dirs = [ "linux" ]
 +  } else if (is_bsd) {
 +    sources += [ "kqueue.c" ]
 +    include_dirs = [ "freebsd" ]
    } else if (is_android) {
-     sources += [ "epoll.c" ]
-     include_dirs = [ "android" ]
+     sources += [
+       "android/config.h",
diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn
index 3eb8fe325882..c8ddb0eca37d 100644
--- a/www/chromium/files/patch-build_config_BUILD.gn
+++ b/www/chromium/files/patch-build_config_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- build/config/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/BUILD.gn
-@@ -224,7 +224,7 @@ config("debug") {
+@@ -196,7 +196,7 @@ config("debug") {
        # builds, and we have to tell it to turn it off.
        defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
      }
@@ -9,7 +9,16 @@
      # Enable libstdc++ debugging facilities to help catch problems early, see
      # http://crbug.com/65151 .
      # TODO(phajdan.jr): Should we enable this for all of POSIX?
-@@ -338,7 +338,7 @@ config("executable_config") {
+@@ -279,7 +279,7 @@ config("default_libs") {
+       "CoreText.framework",
+       "Foundation.framework",
+     ]
+-  } else if (is_linux) {
++  } else if (is_linux && !is_bsd) {
+     libs = [
+       "dl",
+       "rt",
+@@ -310,7 +310,7 @@ config("executable_config") {
      ]
    } else if (is_ios) {
      configs += [ "//build/config/ios:ios_dynamic_flags" ]
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
index 2f6a4380eebf..d870ac270eb2 100644
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,7 +1,7 @@
---- build/config/BUILDCONFIG.gn.orig	2017-01-26 00:49:07 UTC
+--- build/config/BUILDCONFIG.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/BUILDCONFIG.gn
-@@ -134,12 +134,13 @@ declare_args() {
-   is_debug = !is_official_build
+@@ -131,12 +131,13 @@ declare_args() {
+   is_official_build = false
  
    # Whether we're a traditional desktop unix.
 -  is_desktop_linux = current_os == "linux"
@@ -16,7 +16,7 @@
  
    # Allows the path to a custom target toolchain to be injected as a single
    # argument, and set as the default toolchain.
-@@ -183,8 +184,8 @@ if (host_toolchain == "") {
+@@ -185,8 +186,8 @@ if (host_toolchain == "") {
    # TODO(dpranke): Add some sort of assert here that verifies that
    # no toolchain omitted host_toolchain from its toolchain_args().
  
@@ -27,7 +27,7 @@
        # TODO(dpranke) - is_clang normally applies only to the target
        # build, and there is no way to indicate that you want to override
        # it for both the target build *and* the host build. Do we need to
-@@ -220,7 +221,7 @@ if (target_os == "android") {
+@@ -222,7 +223,7 @@ if (target_os == "android") {
    } else {
      _default_toolchain = "//build/toolchain/android:android_$target_cpu"
    }
@@ -36,7 +36,7 @@
    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
    if (is_clang) {
      _default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -340,8 +341,17 @@ if (current_os == "win" || current_os ==
+@@ -342,8 +343,17 @@ if (current_os == "win" || current_os ==
    is_nacl = false
    is_posix = true
    is_win = false
@@ -55,7 +55,7 @@
  # =============================================================================
  # SOURCES FILTERS
  # =============================================================================
-@@ -410,7 +420,7 @@ if (!is_ios) {
+@@ -412,7 +422,7 @@ if (!is_ios) {
  if (!is_mac && !is_ios) {
    sources_assignment_filter += [ "*.mm" ]
  }
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 49daa294ccb4..897e05c43106 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	2017-01-26 00:49:07 UTC
+--- build/config/compiler/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -150,7 +150,7 @@ config("compiler") {
+@@ -155,7 +155,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" ]
-@@ -277,7 +277,7 @@ config("compiler") {
+@@ -282,7 +282,7 @@ config("compiler") {
  
    # Linux/Android common flags setup.
    # ---------------------------------
@@ -18,7 +18,7 @@
      cflags += [
        "-fPIC",
        "-pipe",  # Use pipes for communicating between sub-processes. Faster.
-@@ -401,14 +401,14 @@ config("compiler") {
+@@ -409,14 +409,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,7 +35,7 @@
      # 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,
-@@ -458,7 +458,7 @@ config("compiler") {
+@@ -469,7 +469,7 @@ config("compiler") {
        ]
  
        # Apply a lower LTO optimization level as the default is too slow.
@@ -44,7 +44,7 @@
          if (use_lld) {
            ldflags += [ "-Wl,--lto-O1" ]
          } else {
-@@ -478,7 +478,7 @@ config("compiler") {
+@@ -489,7 +489,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).
@@ -53,7 +53,7 @@
        ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
      }
    }
-@@ -742,7 +742,7 @@ config("compiler_codegen") {
+@@ -757,7 +757,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",
-@@ -788,7 +788,7 @@ config("runtime_library") {
+@@ -811,7 +811,7 @@ config("runtime_library") {
    # smaller.
    if (is_win) {
      configs += [ "//build/config/win:runtime_library" ]
@@ -71,16 +71,16 @@
      configs += [ "//build/config/linux:runtime_library" ]
    } else if (is_ios) {
      configs += [ "//build/config/ios:runtime_library" ]
-@@ -1038,7 +1038,7 @@ config("default_warnings") {
+@@ -1076,7 +1076,7 @@ config("default_warnings") {
          "-Wno-nonportable-include-path",
  
          # TODO(hans): https://crbug.com/637306
 -        "-Wno-address-of-packed-member",
 +        # "-Wno-address-of-packed-member",
        ]
-     }
-   }
-@@ -1070,7 +1070,7 @@ config("chromium_code") {
+       if (llvm_force_head_revision) {
+         cflags += [
+@@ -1119,7 +1119,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
-@@ -1128,7 +1128,7 @@ config("no_chromium_code") {
+@@ -1178,7 +1178,7 @@ config("no_chromium_code") {
      ]
    }
  
diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni
index 6d3eaf6a0557..5da4cd24a8cb 100644
--- a/www/chromium/files/patch-build_config_features.gni
+++ b/www/chromium/files/patch-build_config_features.gni
@@ -1,6 +1,6 @@
---- build/config/features.gni.orig	2017-01-26 00:49:07 UTC
+--- build/config/features.gni.orig	2017-03-09 20:04:27 UTC
 +++ build/config/features.gni
-@@ -67,13 +67,13 @@ declare_args() {
+@@ -57,13 +57,13 @@ declare_args() {
    # libudev usage. This currently only affects the content layer.
    use_udev = is_linux && !is_chromecast
  
diff --git a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn
index b1f7693a964e..811a678f87aa 100644
--- a/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn
+++ b/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/linux/gtk2/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- build/config/linux/gtk2/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/linux/gtk2/BUILD.gn
 @@ -4,7 +4,7 @@
  
@@ -7,5 +7,5 @@
 -assert(is_linux, "This file should only be referenced on Linux")
 +assert(is_linux || is_bsd, "This file should only be referenced on Linux")
  
- # Depend on //build/config/linux/gtk2 to use GTKv2.
- #
+ # Depend on //build/config/linux/gtk2 to use GTKv2. Depend on
+ # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags.
diff --git a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn
index b7f133279f24..df669cf814a4 100644
--- a/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn
+++ b/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/linux/gtk3/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- build/config/linux/gtk3/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/linux/gtk3/BUILD.gn
 @@ -4,7 +4,7 @@
  
@@ -7,5 +7,5 @@
 -assert(is_linux, "This file should only be referenced on Linux")
 +assert(is_linux || is_bsd, "This file should only be referenced on Linux")
  
- # Depend on //build/config/linux/gtk3 to use GTKv3.
- #
+ # Depend on //build/config/linux/gtk3 to use GTKv3. Depend on
+ # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags.
diff --git a/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn b/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn
new file mode 100644
index 000000000000..722dcf6cea5c
--- /dev/null
+++ b/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn
@@ -0,0 +1,11 @@
+--- build/config/linux/gtk/BUILD.gn.orig	2017-03-09 20:04:27 UTC
++++ build/config/linux/gtk/BUILD.gn
+@@ -5,7 +5,7 @@
+ import("//build/config/linux/gtk/gtk.gni")
+ import("//build/config/linux/pkg_config.gni")
+ 
+-assert(is_linux, "This file should only be referenced on Linux")
++assert(is_linux || is_bsd, "This file should only be referenced on Linux")
+ 
+ # The target in this file will automatically reference GTK2 or GTK3 depending
+ # on the state of the build flag. Some builds reference both 2 and 3, and some
diff --git a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn
index d67a5f3089aa..448378244b45 100644
--- a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn
+++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn
@@ -1,20 +1,20 @@
---- build/config/sanitizers/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- build/config/sanitizers/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ build/config/sanitizers/BUILD.gn
-@@ -405,7 +405,7 @@ config("lsan_flags") {
+@@ -420,7 +420,7 @@ config("lsan_flags") {
  
  config("msan_flags") {
    if (is_msan) {
 -    assert(is_linux, "msan only supported on linux x86_64")
 +    assert(is_linux || is_bsd, "msan only supported on linux x86_64")
-     msan_blacklist_path =
-         rebase_path("//tools/msan/blacklist.txt", root_build_dir)
-     cflags = [
-@@ -418,7 +418,7 @@ config("msan_flags") {
+     if (!defined(msan_blacklist_path)) {
+       msan_blacklist_path =
+           rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+@@ -435,7 +435,7 @@ config("msan_flags") {
  
  config("tsan_flags") {
    if (is_tsan) {
 -    assert(is_linux, "tsan only supported on linux x86_64")
 +    assert(is_linux || is_bsd, "tsan only supported on linux x86_64")
-     tsan_blacklist_path =
-         rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
-     cflags = [
+     if (!defined(tsan_blacklist_path)) {
+       tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
diff --git a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
index 06d9149331ec..87b670525193 100644
--- a/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
+++ b/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni
@@ -1,14 +1,13 @@
---- build/config/sanitizers/sanitizers.gni.orig	2017-01-26 00:49:07 UTC
+--- build/config/sanitizers/sanitizers.gni.orig	2017-03-09 20:04:27 UTC
 +++ build/config/sanitizers/sanitizers.gni
-@@ -54,8 +54,9 @@ declare_args() {
+@@ -54,8 +54,8 @@ declare_args() {
    # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
    #
    # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds.
 -  is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" &&
--           is_chrome_branded && is_official_build && allow_posix_link_time_opt
+-           is_official_build && allow_posix_link_time_opt
 +  is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos &&
-+           target_cpu == "x64" && is_chrome_branded && is_official_build &&
-+           allow_posix_link_time_opt
++           target_cpu == "x64" && is_official_build && allow_posix_link_time_opt
  
    # Enable checks for bad casts: derived cast and unrelated cast.
    # TODO(krasin): remove this, when we're ready to add these checks by default.
diff --git a/www/chromium/files/patch-build_config_ui.gni b/www/chromium/files/patch-build_config_ui.gni
index a7e3bf4f379a..aff42ac39a10 100644
--- a/www/chromium/files/patch-build_config_ui.gni
+++ b/www/chromium/files/patch-build_config_ui.gni
@@ -1,24 +1,19 @@
---- build/config/ui.gni.orig	2017-01-26 00:49:07 UTC
+--- build/config/ui.gni.orig	2017-03-09 20:04:27 UTC
 +++ build/config/ui.gni
-@@ -31,7 +31,7 @@ declare_args() {
+@@ -31,10 +31,10 @@ declare_args() {
  
    # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
    # of a replacement for GDI or GTK.
 -  use_aura = is_win || is_linux
 +  use_aura = is_win || is_linux || is_bsd
  
-   # True means the UI is built using the "views" framework.
-   toolkit_views =
-@@ -47,7 +47,7 @@ declare_args() {
-   use_xkbcommon = false
- 
    # Whether we should use glib, a low level C utility library.
 -  use_glib = is_linux
 +  use_glib = is_linux || is_bsd
  
    # Indicates if Wayland display server support is enabled.
    enable_wayland_server = is_chromeos
-@@ -62,17 +62,17 @@ declare_args() {
+@@ -55,17 +55,17 @@ declare_args() {
  
  # Use GPU accelerated cross process image transport by default on linux builds
  # with the Aura window manager.
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index 77d1dbf18ace..4a8bcfaf4ef7 100644
--- a/www/chromium/files/patch-cc_trees_property__tree.cc
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -1,6 +1,6 @@
---- cc/trees/property_tree.cc.orig	2017-01-26 00:49:07 UTC
+--- cc/trees/property_tree.cc.orig	2017-03-09 20:04:27 UTC
 +++ cc/trees/property_tree.cc
-@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
+@@ -1196,13 +1196,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
  
    gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
  
diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn
index 34382e278d88..15a0bc3f87dd 100644
--- a/www/chromium/files/patch-chrome_BUILD.gn
+++ b/www/chromium/files/patch-chrome_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/BUILD.gn.orig	2017-01-26 00:49:07 UTC
+--- chrome/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ chrome/BUILD.gn
-@@ -132,7 +132,7 @@ if (!is_android && !is_mac) {
+@@ -143,7 +143,7 @@ if (!is_android && !is_mac) {
      data = [
        "$root_out_dir/resources.pak",
      ]
@@ -9,7 +9,7 @@
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/locales/en-US.pak",
-@@ -212,7 +212,7 @@ if (!is_android && !is_mac) {
+@@ -222,7 +222,7 @@ if (!is_android && !is_mac) {
        sources += [ "app/chrome_exe_main_aura.cc" ]
      }
  
@@ -18,7 +18,7 @@
        sources += [
          "app/chrome_dll_resource.h",
          "app/chrome_main.cc",
-@@ -1539,7 +1539,7 @@ if (enable_resource_whitelist_generation
+@@ -1521,7 +1521,7 @@ if (enable_resource_whitelist_generation
    }
  }
  
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 1cf98ee6ba75..a618134e2e19 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2017-02-02 02:02:48 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -86,7 +86,7 @@
+@@ -89,7 +89,7 @@
  #include "chrome/app/chrome_crash_reporter_client.h"
  #endif
  
@@ -50,7 +50,7 @@
  void SIGTERMProfilingShutdown(int signal) {
    Profiling::Stop();
    struct sigaction sigact;
-@@ -366,7 +366,7 @@ void InitializeUserDataDir() {
+@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -59,7 +59,7 @@
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -560,7 +560,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -68,7 +68,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -610,7 +610,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -77,7 +77,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -722,7 +722,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -86,7 +86,7 @@
    crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
  #endif
  
-@@ -852,7 +852,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart
    chrome::InitializePDF();
  #endif
  
@@ -95,7 +95,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -870,7 +870,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -898,7 +898,7 @@ void ChromeMainDelegate::PreSandboxStart
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -104,7 +104,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -980,7 +980,7 @@ bool ChromeMainDelegate::DelaySandboxIni
+@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxIni
  #endif
    return process_type == switches::kRelauncherProcess;
  }
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index 5bbd201dd296..fcaf7c127301 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/chromium_strings.grd.orig	2017-01-26 00:49:07 UTC
+--- chrome/app/chromium_strings.grd.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in
+@@ -887,7 +887,7 @@ Signing in anyway will merge Chromium in
        </message>
  
        <!-- ProcessSingleton -->
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index 13b31107923e..569270b1350d 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/generated_resources.grd.orig	2017-01-26 00:49:07 UTC
+--- chrome/app/generated_resources.grd.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/generated_resources.grd
-@@ -6939,7 +6939,7 @@ Keep your key file in a safe place. You 
+@@ -6868,7 +6868,7 @@ Keep your key file in a safe place. You 
        <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
            Right-to-left
        </message>
@@ -9,7 +9,7 @@
          <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
            Enable Input IME API
          </message>
-@@ -10334,7 +10334,7 @@ I don't think this site should be blocke
+@@ -10122,7 +10122,7 @@ I don't think this site should be blocke
        <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
          Appearance
        </message>
@@ -18,7 +18,7 @@
          <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
            Themes
          </message>
-@@ -10342,7 +10342,7 @@ I don't think this site should be blocke
+@@ -10130,7 +10130,7 @@ I don't think this site should be blocke
        <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
          Reset to default theme
        </message>
@@ -27,7 +27,7 @@
          <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
            Use GTK+ theme
          </message>
-@@ -11663,7 +11663,7 @@ Tell us what happened exactly before you
+@@ -11455,7 +11455,7 @@ Tell us what happened exactly before you
          Set as default
        </message>
  
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index 01d18fbaa2f2..68c9d34c7dd3 100644
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,6 +1,6 @@
---- chrome/app/google_chrome_strings.grd.orig	2017-02-02 02:02:48 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -940,7 +940,7 @@ Signing in anyway will merge Chrome info
+@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome info
        </message>
  
        <!-- ProcessSingleton -->
diff --git a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
index aeb5d9c1e1cf..74b467c8fcdf 100644
--- a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
+++ b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
@@ -1,11 +1,11 @@
---- chrome/app/mash/mash_runner.cc.orig	2017-02-02 02:02:48 UTC
+--- chrome/app/mash/mash_runner.cc.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/mash/mash_runner.cc
-@@ -207,7 +207,7 @@ int MashMain() {
+@@ -249,7 +249,7 @@ int MashMain() {
+   // TODO(sky): wire this up correctly.
    service_manager::InitializeLogging();
  
-   std::unique_ptr<base::MessageLoop> message_loop;
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    base::AtExitManager exit_manager;
  #endif
-   if (!IsChild())
+ 
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 263de66ffc74..23c04b62bfa5 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig	2017-02-02 02:02:48 UTC
+--- chrome/app/settings_strings.grdp.orig	2017-03-09 20:04:27 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -178,7 +178,7 @@
+@@ -225,7 +225,7 @@
    <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser.">
      Themes
    </message>
@@ -9,7 +9,7 @@
      <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
        GTK+
      </message>
-@@ -192,7 +192,7 @@
+@@ -239,7 +239,7 @@
        Use Classic
      </message>
    </if>
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index e69e780b086c..2377b1cfcc2e 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	2017-01-26 00:49:08 UTC
+--- chrome/browser/BUILD.gn.orig	2017-03-09 20:04:27 UTC
 +++ chrome/browser/BUILD.gn
-@@ -2142,7 +2142,7 @@ split_static_library("browser") {
+@@ -2177,7 +2177,7 @@ split_static_library("browser") {
      deps += [ "//device/udev_linux" ]
    }
  
@@ -9,7 +9,7 @@
      deps += [ "//third_party/speech-dispatcher" ]
    }
  
-@@ -3507,7 +3507,7 @@ split_static_library("browser") {
+@@ -3559,7 +3559,7 @@ split_static_library("browser") {
      }
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 944f1b9e28f0..69ae51a0da20 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	2017-02-02 02:02:48 UTC
+--- chrome/browser/about_flags.cc.orig	2017-03-09 20:04:27 UTC
 +++ chrome/browser/about_flags.cc
-@@ -776,7 +776,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -820,7 +820,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
                                 switches::kDisableSmoothScrolling)},
@@ -9,7 +9,7 @@
      {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
       IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
       // Uses the system preference on Mac (a different implementation).
-@@ -1291,11 +1291,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1345,11 +1345,11 @@ const FeatureEntry kFeatureEntries[] = {
       ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
                                 switches::kDisableTranslateNewUX)},
  #endif  // OS_MACOSX
@@ -23,7 +23,7 @@
      {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
       IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
       FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
-@@ -1769,7 +1769,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1778,7 +1778,7 @@ const FeatureEntry kFeatureEntries[] = {
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
  #endif  // ENABLE_EXTENSIONS
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index 34970c588ab0..c89c536bd4bb 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2017-03-09 20:04:27 UTC
 +++ chrome/browser/browser_process_impl.cc
-@@ -165,7 +165,7 @@
+@@ -170,7 +170,7 @@
  #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/memory/tab_manager.h"
  #endif
  
-@@ -771,7 +771,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
+@@ -783,7 +783,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
  
  memory::TabManager* BrowserProcessImpl::GetTabManager() {
    DCHECK(CalledOnValidThread());
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index 2342050a2cba..4d09299fffaf 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.h.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/browser_process_impl.h.orig	2017-03-09 20:04:27 UTC
 +++ chrome/browser/browser_process_impl.h
-@@ -340,7 +340,7 @@ class BrowserProcessImpl : public Browse
+@@ -341,7 +341,7 @@ class BrowserProcessImpl : public Browse
  
    std::unique_ptr<ChromeDeviceClient> device_client_;
  
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index 0c77275970e1..b522c6c9cb6c 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,6 +1,6 @@
---- chrome/browser/browser_resources.grd.orig	2017-02-02 02:02:48 UTC
+--- chrome/browser/browser_resources.grd.orig	2017-03-09 20:04:27 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -372,7 +372,7 @@
+@@ -384,7 +384,7 @@
          <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
          <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
        </if>
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index f6e3225952ef..a29a6f412a1e 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,7 +1,7 @@
---- chrome/browser/chrome_browser_main.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -181,7 +181,7 @@
- #include "chrome/browser/feedback/feedback_profile_observer.h"
+@@ -180,7 +180,7 @@
+ #include "chrome/browser/lifetime/application_lifetime.h"
  #endif  // defined(OS_ANDROID)
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
  #include "chrome/browser/first_run/upgrade_util_linux.h"
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
  
-@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr
+@@ -1173,11 +1173,11 @@ int ChromeBrowserMainParts::PreCreateThr
    }
  #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 1e5739b93ace..ace3fd54184e 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -224,7 +224,7 @@
+@@ -242,7 +242,7 @@
  #include "chrome/browser/ui/browser_dialogs.h"
  #include "chromeos/chromeos_switches.h"
  #include "components/user_manager/user_manager.h"
@@ -9,8 +9,8 @@
  #include "chrome/browser/chrome_browser_main_linux.h"
  #elif defined(OS_ANDROID)
  #include "chrome/browser/chrome_browser_main_android.h"
-@@ -236,7 +236,7 @@
- #include "chrome/browser/chrome_browser_main_posix.h"
+@@ -258,7 +258,7 @@
+ #include "chrome/browser/payments/payment_request_factory.h"
  #endif
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -18,7 +18,7 @@
  #include "base/debug/leak_annotations.h"
  #include "components/crash/content/app/breakpad_linux.h"
  #include "components/crash/content/browser/crash_handler_host_linux.h"
-@@ -261,7 +261,7 @@
+@@ -281,7 +281,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
  #endif
  
@@ -27,7 +27,7 @@
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #endif
  
-@@ -555,7 +555,7 @@ bool CertMatchesFilter(const net::X509Ce
+@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Ce
    return false;
  }
  
@@ -36,7 +36,7 @@
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -883,7 +883,7 @@ content::BrowserMainParts* ChromeContent
+@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent
    main_parts = new ChromeBrowserMainPartsMac(parameters);
  #elif defined(OS_CHROMEOS)
    main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
@@ -45,7 +45,7 @@
    main_parts = new ChromeBrowserMainPartsLinux(parameters);
  #elif defined(OS_ANDROID)
    main_parts = new ChromeBrowserMainPartsAndroid(parameters);
-@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent
+@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContent
    // Construct additional browser parts. Stages are called in the order in
    // which they are added.
  #if defined(TOOLKIT_VIEWS)
@@ -53,8 +53,8 @@
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
    main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
  #else
-   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1531,7 +1531,7 @@ void ChromeContentBrowserClient::AppendE
+   ChromeBrowserMainExtraPartsViews* extra_parts_views =
+@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendE
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -63,12 +63,21 @@
    if (breakpad::IsCrashReporterEnabled()) {
      std::string switch_value;
      std::unique_ptr<metrics::ClientInfo> client_info =
-@@ -2834,7 +2834,7 @@ void ChromeContentBrowserClient::GetAddi
-   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
-   DCHECK(!app_data_path.empty());
+@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::GetAddi
+   }
  }
--#elif defined(OS_POSIX) && !defined(OS_MACOSX)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
+@@ -2837,7 +2837,7 @@ void ChromeContentBrowserClient::GetAddi
+   }
+ #endif  // defined(OS_ANDROID)
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ #if defined(OS_WIN)
+ base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 38fd5f73cbeb..e6703571bbcb 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,11 +1,17 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -271,7 +271,7 @@ class ChromeContentBrowserClient : publi
-       int child_process_id,
-       content::FileDescriptorInfo* mappings,
-       std::map<int, base::MemoryMappedFile::Region>* regions) override;
--#elif defined(OS_POSIX) && !defined(OS_MACOSX)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+@@ -259,12 +259,12 @@ class ChromeContentBrowserClient : publi
+       content::RenderFrameHost* render_frame_host,
+       blink::WebPageVisibilityState* visibility_state) override;
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
        const base::CommandLine& command_line,
        int child_process_id,
+       content::FileDescriptorInfo* mappings) override;
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #if defined(OS_WIN)
+   bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override;
+   base::string16 GetAppContainerSidForSandboxType(
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 68948a635a04..8d0344a95593 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -778,7 +778,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo
          target_info->is_filetype_handled_safely)
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  
@@ -9,7 +9,7 @@
      if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
        DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
  #endif
-@@ -793,7 +793,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDo
  
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
      const base::FilePath& path) {
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
index 5f622bf39afd..f323903fbd9b 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/download/download_commands.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/download/download_commands.cc
-@@ -217,7 +217,7 @@ bool DownloadCommands::IsCommandChecked(
+@@ -218,7 +218,7 @@ bool DownloadCommands::IsCommandChecked(
        return download_item_->GetOpenWhenComplete() ||
               download_crx_util::IsExtensionDownload(*download_item_);
      case ALWAYS_OPEN_TYPE:
@@ -9,7 +9,7 @@
        if (CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
              download_item_->GetBrowserContext());
-@@ -261,7 +261,7 @@ void DownloadCommands::ExecuteCommand(Co
+@@ -262,7 +262,7 @@ void DownloadCommands::ExecuteCommand(Co
        bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
            download_item_->GetBrowserContext());
@@ -18,7 +18,7 @@
        if (CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          DownloadItemModel(download_item_)
-@@ -374,7 +374,7 @@ Browser* DownloadCommands::GetBrowser() 
+@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser() 
    return browser_displayer.browser();
  }
  
@@ -27,7 +27,7 @@
  bool DownloadCommands::IsDownloadPdf() const {
    base::FilePath path = download_item_->GetTargetFilePath();
    return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -391,7 +391,7 @@ bool DownloadCommands::CanOpenPdfInSyste
+@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSyste
    return IsDownloadPdf() &&
           (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                            : true);
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index 9788b073e178..e7659720c78d 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/download/download_prefs.cc
 @@ -56,7 +56,7 @@ namespace {
  // Consider downloads 'dangerous' if they go to the home directory on Linux and
@@ -16,9 +16,9 @@
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
    should_open_pdf_in_system_reader_ =
-       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) ||
-       prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
-@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs
+       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
+ #endif
+@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs
                                   default_download_path);
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
@@ -27,7 +27,7 @@
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  }
-@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage
+@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage
  }
  
  bool DownloadPrefs::IsAutoOpenUsed() const {
@@ -36,7 +36,7 @@
    if (ShouldOpenPdfInSystemReader())
      return true;
  #endif
-@@ -306,7 +306,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
+@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
      return false;
    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
    extension.erase(0, 1);
@@ -45,16 +45,16 @@
    if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
      return true;
  #endif
-@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased
+@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased
    SaveAutoOpenState();
  }
  
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
-   should_open_pdf_in_system_reader_ = should_open ||
-      profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
-@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC
+   if (should_open_pdf_in_system_reader_ == should_open)
+     return;
+@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
  #endif
  
  void DownloadPrefs::ResetAutoOpen() {
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index fba63d672875..1a4535549e4a 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_prefs.h.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/download/download_prefs.h.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/download/download_prefs.h
-@@ -80,7 +80,7 @@ class DownloadPrefs {
+@@ -78,7 +78,7 @@ class DownloadPrefs {
    // Disables auto-open based on file extension.
    void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
  
@@ -9,12 +9,12 @@
    // Store the user preference to disk. If |should_open| is true, also disable
    // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
    void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -115,7 +115,7 @@ class DownloadPrefs {
+@@ -109,7 +109,7 @@ class DownloadPrefs {
                     AutoOpenCompareFunctor> AutoOpenSet;
    AutoOpenSet auto_open_;
  
 -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
    bool should_open_pdf_in_system_reader_;
-   bool disable_adobe_version_check_for_tests_;
  #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index d0da69e3bfeb..120cc149c1e1 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1024,7 +1024,7 @@ static_library("extensions") {
+@@ -1034,7 +1034,7 @@ static_library("extensions") {
      sources -= [ "global_shortcut_listener_ozone.cc" ]
    }
  
@@ -9,7 +9,7 @@
      deps += [ "//build/linux:fontconfig" ]
  
      if (use_dbus) {
-@@ -1115,6 +1115,12 @@ static_library("extensions") {
+@@ -1127,6 +1127,12 @@ static_library("extensions") {
      defines += [ "ENABLE_HOTWORDING" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
index 6cc102962007..985ad9d9bf72 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/messaging/message_service.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/extensions/api/messaging/message_service.cc
-@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message
+@@ -106,7 +106,7 @@ MessageService::PolicyPermission Message
  
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
@@ -9,7 +9,7 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative
+@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNative
    if (!source)
      return;
  
@@ -18,7 +18,7 @@
    content::WebContents* web_contents =
        content::WebContents::FromRenderFrameHost(source);
    ExtensionWebContentsObserver* extension_web_contents_observer =
-@@ -477,12 +477,12 @@ void MessageService::OpenChannelToNative
+@@ -447,12 +447,12 @@ void MessageService::OpenChannelToNative
    channel->opener->IncrementLazyKeepaliveCount();
  
    AddChannel(std::move(channel), receiver_port_id);
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
deleted file mode 100644
index 621f5c1f0d19..000000000000
--- a/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig	2017-01-26 00:49:08 UTC
-+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc
-@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] =
- // 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
index 4f94566b704c..a1464d305488 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/extensions/bookmark_app_helper.cc
-@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallati
+@@ -716,7 +716,7 @@ void BookmarkAppHelper::FinishInstallati
  #if !defined(OS_MACOSX)
  #if !defined(USE_ASH)
    web_app::ShortcutLocations creation_locations;
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 523d4a627f27..9eb4d7bf3b3d 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	2017-01-26 00:49:08 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,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,7 +9,7 @@
  #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
  #endif
  
-@@ -110,7 +110,7 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -111,7 +111,7 @@ void EnsureBrowserContextKeyedServiceFac
  #if defined(OS_CHROMEOS)
    extensions::InputImeAPI::GetFactoryInstance();
    extensions::InputMethodAPI::GetFactoryInstance();
diff --git a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
index eb4e46402a3c..144a08fe66a6 100644
--- a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
+++ b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/interstitials/chrome_controller_client.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/interstitials/chrome_controller_client.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/interstitials/chrome_controller_client.cc
-@@ -49,7 +49,7 @@ void LaunchDateAndTimeSettingsOnFileThre
+@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre
  #if defined(OS_ANDROID)
    chrome::android::OpenDateAndTimeSettings();
  
@@ -9,7 +9,7 @@
    struct ClockCommand {
      const char* const pathname;
      const char* const argument;
-@@ -136,7 +136,7 @@ void ChromeControllerClient::set_interst
+@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControlle
  
  bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
  #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index 158227131ae1..55f04e8a4dbc 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -343,6 +343,8 @@ void WebRtcLogUploader::SetupMultipart(
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";
diff --git a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
index a29e783a2e8f..cda191efe1de 100644
--- a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/notifications/message_center_notification_manager.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/notifications/message_center_notification_manager.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/notifications/message_center_notification_manager.cc
-@@ -67,7 +67,7 @@ MessageCenterNotificationManager::Messag
+@@ -66,7 +66,7 @@ MessageCenterNotificationManager::Messag
        base::MakeUnique<FullscreenNotificationBlocker>(message_center));
  
  #if defined(OS_WIN) || defined(OS_MACOSX) \
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 39d62b33db29..93d46b98a22f 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,7 +1,7 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
 @@ -57,7 +57,11 @@
- #include "content/public/browser/web_contents.h"
+ #include "content/public/common/origin_util.h"
  #include "google_apis/gaia/gaia_urls.h"
  #include "net/base/url_util.h"
 +#if defined(OS_BSD)
@@ -10,5 +10,5 @@
  #include "third_party/re2/src/re2/re2.h"
 +#endif
  
- #if BUILDFLAG(ANDROID_JAVA_UI)
+ #if defined(OS_ANDROID)
  #include "chrome/browser/android/tab_android.h"
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
index fe789ab3abd4..effd627100d3 100644
--- a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -175,6 +175,8 @@ class PolicyTestCase {
+@@ -180,6 +180,8 @@ class PolicyTestCase {
      const std::string os("chromeos");
  #elif defined(OS_LINUX)
      const std::string os("linux");
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
index 7cc595c72224..4e8ebd47c2e4 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1367,7 +1367,7 @@ void RenderViewContextMenu::AppendEditab
+@@ -1389,7 +1389,7 @@ void RenderViewContextMenu::AppendEditab
  // 'Undo' and 'Redo' for text input with no suggestions and no text selected.
  // We make an exception for OS X as context clicking will select the closest
  // word. In this case both items are always shown.
@@ -9,7 +9,7 @@
    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO,
                                    IDS_CONTENT_CONTEXT_UNDO);
    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO,
-@@ -1403,7 +1403,7 @@ void RenderViewContextMenu::AppendLangua
+@@ -1427,7 +1427,7 @@ void RenderViewContextMenu::AppendLangua
    if (!use_spelling)
      return;
  
@@ -18,7 +18,7 @@
    menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS,
                                    IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS);
  #else
-@@ -1645,7 +1645,7 @@ bool RenderViewContextMenu::IsCommandIdE
+@@ -1665,7 +1665,7 @@ bool RenderViewContextMenu::IsCommandIdE
      case IDC_CHECK_SPELLING_WHILE_TYPING:
        return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck);
  
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index 3457f65053d8..0ecb4fe6cfe8 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/renderer_preferences_util.cc
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
  #include "third_party/WebKit/public/public_features.h"
  #include "third_party/skia/include/core/SkColor.h"
  
@@ -9,7 +9,7 @@
  #include "ui/gfx/font_render_params.h"
  #endif
  
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
  #include "ui/base/cocoa/defaults_utils.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "ui/views/linux_ui/linux_ui.h"
-@@ -133,7 +133,7 @@ void UpdateFromSystemSettings(content::R
+@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::R
      prefs->caret_blink_interval = interval.InSecondsF();
  #endif
  
@@ -27,7 +27,7 @@
    views::LinuxUI* linux_ui = views::LinuxUI::instance();
    if (linux_ui) {
      if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(content::R
+@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::R
    }
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
index aa7090a7a33f..d82e3a8b5a5e 100644
--- a/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
+++ b/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
@@ -1,19 +1,19 @@
---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2017-03-09 20:04:28 UTC
 +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
-@@ -50,6 +50,7 @@ def PlatformTypes():
-     "android": config_pb2.DownloadFileType.PLATFORM_ANDROID,
-     "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS,
-     "linux": config_pb2.DownloadFileType.PLATFORM_LINUX,
-+    "bsd": config_pb2.DownloadFileType.PLATFORM_LINUX,
-     "mac": config_pb2.DownloadFileType.PLATFORM_MAC,
-     "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS,
+@@ -31,6 +31,7 @@ def PlatformTypes():
+     "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID,
+     "chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS,
+     "linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX,
++    "bsd": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX,
+     "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC,
+     "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS,
    }
-@@ -201,7 +202,7 @@ def main():
-                     'Outfile must have a %d for version and %s for platform.')
-   parser.add_option('-t', '--type',
-                     help='The platform type. One of android, chromeos, ' +
--                    'linux, mac, win')
-+                    'linux, bsd, mac, win')
-   parser.add_option('-i', '--infile',
-                     help='The ASCII DownloadFileType-proto file to read.')
-   parser.add_option('-d', '--outdir',
+@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(Bin
+                       'Outfile must have a %d for version and %s for platform.')
+     parser.add_option('-t', '--type',
+                       help='The platform type. One of android, chromeos, ' +
+-                      'linux, mac, win')
++                      'linux, bsd, mac, win')
+ 
+   def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command):
+     if opts.type is not None:
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index 8bf4a9fb6692..64d3636b8e13 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -578,7 +578,7 @@ void ChromeSyncClient::RegisterDesktopDa
+@@ -592,7 +592,7 @@ void ChromeSyncClient::RegisterDesktopDa
    }
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index 0cc452a8c747..1ba6821b01e5 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,9 +1,9 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig	2017-02-02 02:02:49 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -25,9 +25,9 @@ const int kBackgroundRefreshTypesMask =
-     REFRESH_TYPE_CPU |
-     REFRESH_TYPE_MEMORY |
-     REFRESH_TYPE_IDLE_WAKEUPS |
+@@ -28,9 +28,9 @@ const int kBackgroundRefreshTypesMask =
+ #if defined(OS_WIN)
+     REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
+ #endif  // defined(OS_WIN)
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
      REFRESH_TYPE_FD_COUNT |
@@ -12,7 +12,7 @@
      REFRESH_TYPE_PRIORITY;
  
  #if defined(OS_WIN)
-@@ -88,9 +88,9 @@ TaskGroup::TaskGroup(
+@@ -92,9 +92,9 @@ TaskGroup::TaskGroup(
        nacl_debug_stub_port_(-1),
  #endif  // !defined(DISABLE_NACL)
        idle_wakeups_per_second_(-1),
@@ -24,7 +24,7 @@
        gpu_memory_has_duplicates_(false),
        is_backgrounded_(false),
        weak_ptr_factory_(this) {
-@@ -103,10 +103,10 @@ TaskGroup::TaskGroup(
+@@ -107,10 +107,10 @@ TaskGroup::TaskGroup(
                                        weak_ptr_factory_.GetWeakPtr()),
                             base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
                                        weak_ptr_factory_.GetWeakPtr()),
@@ -37,7 +37,7 @@
                             base::Bind(&TaskGroup::OnProcessPriorityDone,
                                        weak_ptr_factory_.GetWeakPtr())));
    worker_thread_sampler_.swap(sampler);
-@@ -282,14 +282,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone
+@@ -313,14 +313,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone
    OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS);
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 8ddc9ce747e2..3199a81e83a1 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig	2017-02-02 02:02:49 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/task_manager/sampling/task_group.h
-@@ -91,9 +91,9 @@ class TaskGroup {
+@@ -96,9 +96,9 @@ class TaskGroup {
    int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
  #endif  // !defined(DISABLE_NACL)
  
@@ -12,7 +12,7 @@
  
    int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
  
-@@ -112,9 +112,9 @@ class TaskGroup {
+@@ -121,9 +121,9 @@ class TaskGroup {
  
    void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second);
  
@@ -24,7 +24,7 @@
  
    void OnProcessPriorityDone(bool is_backgrounded);
  
-@@ -159,10 +159,10 @@ class TaskGroup {
+@@ -171,10 +171,10 @@ class TaskGroup {
    int nacl_debug_stub_port_;
  #endif  // !defined(DISABLE_NACL)
    int idle_wakeups_per_second_;
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
index 9c111327858b..38a0037fbb13 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2017-02-02 02:02:49 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -160,11 +160,11 @@ void TaskManagerImpl::GetUSERHandles(Tas
+@@ -184,11 +184,11 @@ void TaskManagerImpl::GetUSERHandles(Tas
  }
  
  int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
index 697430176946..b95a6ad9c1aa 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
@@ -1,16 +1,16 @@
---- chrome/browser/task_manager/task_manager_observer.h.orig	2017-02-02 02:02:49 UTC
+--- chrome/browser/task_manager/task_manager_observer.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/task_manager/task_manager_observer.h
-@@ -40,11 +40,11 @@ enum RefreshType {
+@@ -42,11 +42,11 @@ enum RefreshType {
    // or backgrounded.
-   REFRESH_TYPE_PRIORITY          = 1 << 11,
+   REFRESH_TYPE_PRIORITY          = 1 << 13,
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    // For observers interested in getting the number of open file descriptors of
    // processes.
-   REFRESH_TYPE_FD_COUNT          = 1 << 12,
+   REFRESH_TYPE_FD_COUNT          = 1 << 14,
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
-   REFRESH_TYPE_MEMORY            = REFRESH_TYPE_PHYSICAL_MEMORY |
-                                    REFRESH_TYPE_MEMORY_DETAILS,
+   REFRESH_TYPE_MEMORY_STATE      = 1 << 15,
+ 
diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
index 8475295ffbb6..10ee98b8f7c6 100644
--- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/tracing/crash_service_uploader.cc
-@@ -156,6 +156,8 @@ void TraceCrashServiceUploader::DoUpload
+@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUpload
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";
diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
index 8f51c867d601..5b82055f3772 100644
--- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/ui/BUILD.gn.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/BUILD.gn.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/BUILD.gn
-@@ -3090,7 +3090,7 @@ split_static_library("ui") {
+@@ -3122,7 +3122,7 @@ split_static_library("ui") {
        ]
      }
    }
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index ac11cfa57ac0..36103e85c753 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -81,7 +81,7 @@
+@@ -80,7 +80,7 @@
  #include "chrome/browser/ui/browser_commands_chromeos.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -203,7 +203,7 @@ bool BrowserCommandController::IsReserve
+@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve
    if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
      return true;
  
@@ -18,7 +18,7 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -406,7 +406,7 @@ void BrowserCommandController::ExecuteCo
+@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo
        break;
  #endif
  
@@ -27,7 +27,7 @@
      case IDC_USE_SYSTEM_TITLE_BAR: {
        PrefService* prefs = browser_->profile()->GetPrefs();
        prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -766,7 +766,7 @@ void BrowserCommandController::InitComma
+@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
    command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
index 7770b56aa15d..7bb04cf42fc6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/input_method/input_method_engine_base.cc
-@@ -37,7 +37,7 @@
+@@ -35,7 +35,7 @@
+ #include "ui/base/ime/chromeos/ime_keymap.h"
  #elif defined(OS_WIN)
- #include "ui/events/keycodes/dom/keycode_converter.h"
  #include "ui/events/keycodes/keyboard_codes_win.h"
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/events/keycodes/dom/keycode_converter.h"
  #include "ui/events/keycodes/keyboard_codes_posix.h"
  #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn
index 8ca6e760cba7..086b271e2c36 100644
--- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn
@@ -1,4 +1,4 @@
---- chrome/browser/ui/libgtkui/BUILD.gn.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/libgtkui/BUILD.gn.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/libgtkui/BUILD.gn
 @@ -2,7 +2,7 @@
  # Use of this source code is governed by a BSD-style license that can be
@@ -8,4 +8,4 @@
 +assert(is_linux || is_bsd, "This file should only be referenced on Linux")
  
  import("//build/config/features.gni")
- import("//build/config/ui.gni")
+ import("//build/config/linux/gtk/gtk.gni")
diff --git a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
index 1ff86de9c886..e33d1ccc851d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog(
    // Since we only generate PDF, only show printers that support PDF.
    // TODO(thestig) Add more capabilities to support?
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 802bc7fefa8a..cc8675d45e1c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser
+@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser
      // This flag gives extensions more powers.
      extensions::switches::kExtensionsOnChromeURLs,
  
diff --git a/www/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 0c046328076b..32e805c31aef 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,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
 @@ -95,7 +95,7 @@
  #include "components/user_manager/user_manager.h"
@@ -9,7 +9,7 @@
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
  
-@@ -651,9 +651,11 @@ bool StartupBrowserCreator::ProcessCmdLi
+@@ -657,9 +657,11 @@ bool StartupBrowserCreator::ProcessCmdLi
    }
  #endif  // OS_CHROMEOS
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
index fd808150aab3..ba1cfd3bf09a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/task_manager/task_manager_columns.cc
-@@ -74,10 +74,10 @@ const TableColumnData kColumns[] = {
+@@ -80,10 +80,10 @@ const TableColumnData kColumns[] = {
    { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
      arraysize("idlewakeups") * kCharWidth, -1, true, false, false },
  
@@ -12,4 +12,4 @@
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
    { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
      arraysize("background") * kCharWidth, -1, true, true, false },
- };
+   { IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0,
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 67613f9839a2..c87c278a39b1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -390,13 +390,13 @@ base::string16 TaskManagerTableModel::Ge
+@@ -443,13 +443,13 @@ base::string16 TaskManagerTableModel::Ge
            ? stringifier_->backgrounded_string()
            : stringifier_->foregrounded_string();
  
@@ -14,9 +14,9 @@
 -#endif  // defined(OS_LINUX)
 +#endif  // defined(OS_LINUX) || defined(OS_BSD)
  
-     default:
-       NOTREACHED();
-@@ -540,7 +540,7 @@ int TaskManagerTableModel::CompareValues
+     case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: {
+       return stringifier_->GetMemoryStateText(
+@@ -607,7 +607,7 @@ int TaskManagerTableModel::CompareValues
        return BooleanCompare(is_proc1_bg, is_proc2_bg);
      }
  
@@ -25,7 +25,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -548,7 +548,7 @@ int TaskManagerTableModel::CompareValues
+@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues
            observed_task_manager()->GetOpenFdCount(tasks_[row2]);
        return ValueCompare(proc1_fd_count, proc2_fd_count);
      }
@@ -34,8 +34,8 @@
  
      default:
        NOTREACHED();
-@@ -699,11 +699,11 @@ void TaskManagerTableModel::UpdateRefres
-       type = REFRESH_TYPE_PRIORITY;
+@@ -778,11 +778,11 @@ void TaskManagerTableModel::UpdateRefres
+       type = REFRESH_TYPE_MEMORY_STATE;
        break;
  
 -#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index cee1981457a4..1835449dc177 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
-@@ -72,7 +72,7 @@ const AcceleratorMapping kAcceleratorMap
-   { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
+@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap
+   { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE },
    { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB },
    { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB },
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,7 +9,7 @@
    { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
    { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB },
    { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT },
-@@ -100,7 +100,7 @@ const AcceleratorMapping kAcceleratorMap
+@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap
    { ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 },
    { ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 },
    { ui::VKEY_NUMPAD8, kPlatformModifier, IDC_SELECT_TAB_7 },
@@ -18,8 +18,8 @@
    { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
    { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 },
    { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 },
-@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap
-   { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN },
+@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap
+ #endif  // !OS_MACOSX
  
    // Platform-specific key maps.
 -#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc
deleted file mode 100644
index 49f34f3dabaa..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/app_list/linux/app_list_linux.cc.orig	2017-02-02 02:02:50 UTC
-+++ chrome/browser/ui/views/app_list/linux/app_list_linux.cc
-@@ -91,7 +91,7 @@ void AppListLinux::MoveNearCursor(app_li
-   view->SetBubbleArrow(views::BubbleBorder::FLOAT);
- 
-   AppListPositioner::ScreenEdge edge;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // In the Unity desktop environment, special case SCREEN_EDGE_LEFT. It is
-   // always on the left side in Unity, but ShelfLocationInDisplay will not
-   // detect this if the shelf is hidden.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index 010509e8ab67..a4ae6db71580 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
 @@ -19,7 +19,7 @@
  #include "ui/gfx/image/image_skia.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/shell_integration_linux.h"
  #endif
  
-@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnB
+@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB
      const AppWindow::CreateParams& create_params,
      views::Widget::InitParams* init_params,
      views::Widget* widget) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
index 6ff417846137..140e8ddc5ead 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -24,14 +24,14 @@
+@@ -26,14 +26,14 @@
  #include "ui/wm/core/wm_state.h"
  #endif  // defined(USE_AURA)
  
@@ -17,12 +17,21 @@
  
  ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
  }
-@@ -62,7 +62,7 @@ void ChromeBrowserMainExtraPartsViews::P
- }
+@@ -70,7 +70,7 @@ void ChromeBrowserMainExtraPartsViews::P
+     IMEDriver::Register();
+ #endif
  
- void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    // On the Linux desktop, we want to prevent the user from logging in as root,
    // so that we don't destroy the profile. Now that we have some minimal ui
    // initialized, check to see if we're running as root and bail if we are.
+@@ -94,7 +94,7 @@ void ChromeBrowserMainExtraPartsViews::P
+   base::RunLoop().RunUntilIdle();
+ 
+   exit(EXIT_FAILURE);
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ }
+ 
+ void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
index 046bf801e3ed..a6aaa0cfc3ab 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.cc
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
  #include "ui/views/widget/native_widget_aura.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/views/linux_ui/linux_ui.h"
  #endif
  
-@@ -308,7 +308,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
+@@ -329,7 +329,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
    return GetSmallAppIcon();
  }
  
@@ -18,7 +18,7 @@
  gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
    return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
-@@ -447,7 +447,7 @@ void ChromeViewsDelegate::OnBeforeWidget
+@@ -468,7 +468,7 @@ void ChromeViewsDelegate::OnBeforeWidget
  #endif
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index 11b749117893..298c7df09a7e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1913,7 +1913,7 @@ void BrowserView::OnThemeChanged() {
+@@ -179,7 +179,7 @@
+ #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
  #endif
- #if defined(OS_WIN)
-     ui::NativeThemeWin::instance()->NotifyObservers();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-     ui::NativeThemeAura::instance()->NotifyObservers();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
  #endif
-   }
+ 
+ using base::TimeDelta;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 462f7bc75cb0..876dda106d61 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -270,7 +270,7 @@ void TabDragController::Init(
+@@ -251,7 +251,7 @@ void TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -9,16 +9,16 @@
    can_release_capture_ = false;
  #endif
    start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -620,7 +620,7 @@ TabDragController::DragBrowserToNewTabSt
-     // that to effect the position of any windows.
-     SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
+@@ -597,7 +597,7 @@ TabDragController::DragBrowserToNewTabSt
+     else
+       target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
  
 -#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
 +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -1819,7 +1819,7 @@ TabDragController::Liveness TabDragContr
+@@ -1787,7 +1787,7 @@ TabDragController::Liveness TabDragContr
      if (dragged_window)
        exclude.insert(dragged_window);
    }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index aed71a18422f..a2431f195c87 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -286,7 +286,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -289,7 +289,7 @@ bool IsAboutUI(const GURL& url) {
  #if !defined(OS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
index ed34ee3508da..1c536802136e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/webui/options/browser_options_handler.cc
-@@ -564,13 +564,13 @@ void BrowserOptionsHandler::GetLocalized
+@@ -565,13 +565,13 @@ void BrowserOptionsHandler::GetLocalized
      { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
  #endif  // defined(OS_CHROMEOS)
  
@@ -16,7 +16,7 @@
  
  #if defined(OS_CHROMEOS) && defined(USE_ASH)
      { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
-@@ -813,7 +813,7 @@ void BrowserOptionsHandler::RegisterMess
+@@ -814,7 +814,7 @@ void BrowserOptionsHandler::RegisterMess
        "requestProfilesInfo",
        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                   base::Unretained(this)));
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
index f137b14f401d..79821e71bad9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/webui/options/browser_options_handler.h
-@@ -208,7 +208,7 @@ class BrowserOptionsHandler
+@@ -210,7 +210,7 @@ class BrowserOptionsHandler
  
    void ObserveThemeChanged();
    void ThemesReset(const base::ListValue* args);
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
index ba1b5dd58302..ae346f7bc343 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -266,7 +266,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -287,7 +287,7 @@ void AddAppearanceStrings(content::WebUI
      {"appearancePageTitle", IDS_SETTINGS_APPEARANCE},
      {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM},
      {"themes", IDS_SETTINGS_THEMES},
@@ -9,7 +9,7 @@
      {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
      {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
      {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -286,7 +286,7 @@ void AddAppearanceStrings(content::WebUI
+@@ -307,7 +307,7 @@ void AddAppearanceStrings(content::WebUI
      {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
      {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
  #endif
diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn
index 050e4cc58e07..08e01d64bf5e 100644
--- a/www/chromium/files/patch-chrome_common_BUILD.gn
+++ b/www/chromium/files/patch-chrome_common_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/common/BUILD.gn.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/BUILD.gn.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/BUILD.gn
-@@ -243,6 +243,13 @@ static_library("common") {
+@@ -244,6 +244,13 @@ static_library("common") {
      public_deps += [ "//ppapi/shared_impl" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index caaaf91fa4e1..7268a9fd57fe 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/chrome_paths.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/chrome_paths.cc
 @@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat
          return false;
@@ -9,7 +9,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur))
          return false;
        break;
-@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat
+@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat
        if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
@@ -23,7 +23,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
-@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat
+@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat
  #endif
        break;
  
@@ -32,7 +32,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if defined(OS_MACOSX)
  #if defined(GOOGLE_CHROME_BUILD)
-@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat
+@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat
  #if defined(GOOGLE_CHROME_BUILD)
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/opt/chrome/native-messaging-hosts"));
@@ -42,7 +42,7 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL(
            "/etc/chromium/native-messaging-hosts"));
-@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat
+@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat
          return false;
        cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
        break;
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index 9ccf153c2999..e46f5aecc47b 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.h.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/chrome_paths.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/chrome_paths.h
 @@ -49,7 +49,7 @@ enum {
                                  // to set policies for chrome. This directory
@@ -18,7 +18,7 @@
    DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
                                         // definition manifest files that
                                         // describe extensions which are to be
-@@ -112,7 +112,7 @@ enum {
+@@ -111,7 +111,7 @@ enum {
    DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
                                               // supervised user whitelists are
                                               // installed.
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 8d79e0decf46..d03ab8601415 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/chrome_switches.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -1263,7 +1263,7 @@ const char kAllowNaClSocketAPI[]        
+@@ -1165,7 +1165,7 @@ const char kAllowNaClSocketAPI[]        
  const char kEnableWaylandServer[] = "enable-wayland-server";
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 2e8c921caa67..4bb2259031e3 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/chrome_switches.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/chrome_switches.h
-@@ -385,7 +385,7 @@ extern const char kAllowNaClSocketAPI[];
+@@ -355,7 +355,7 @@ extern const char kAllowNaClSocketAPI[];
  extern const char kEnableWaylandServer[];
  #endif
  
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
index 4a19c349076b..a3e5a5229ee8 100644
--- a/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
+++ b/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc
@@ -1,6 +1,6 @@
---- chrome/common/extensions/chrome_extensions_client.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/common/extensions/chrome_extensions_client.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/extensions/chrome_extensions_client.cc
-@@ -105,7 +105,10 @@ ChromeChannelForHistogram GetChromeChann
+@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann
  static base::LazyInstance<ChromeExtensionsClient> g_client =
      LAZY_INSTANCE_INITIALIZER;
  
diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni
index 7919f707d6c4..c1427d5ac202 100644
--- a/www/chromium/files/patch-chrome_common_features.gni
+++ b/www/chromium/files/patch-chrome_common_features.gni
@@ -1,6 +1,6 @@
---- chrome/common/features.gni.orig	2017-01-26 00:49:10 UTC
+--- chrome/common/features.gni.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/features.gni
-@@ -43,7 +43,7 @@ declare_args() {
+@@ -40,7 +40,7 @@ declare_args() {
    enable_hotwording = is_chrome_branded && is_chromeos
  
    enable_one_click_signin =
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 3bd99079fb4d..62a9e37d5f1f 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig	2017-01-26 00:49:10 UTC
+--- chrome/common/pref_names.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/pref_names.cc
-@@ -964,7 +964,7 @@ const char kForceSessionSync[] = "settin
+@@ -983,7 +983,7 @@ const char kForceSessionSync[] = "settin
  // only using an account that belongs to one of the domains from this pref.
  const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
  
@@ -9,7 +9,7 @@
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
-@@ -1051,7 +1051,7 @@ const char kShowUpdatePromotionInfoBar[]
+@@ -1070,7 +1070,7 @@ const char kShowUpdatePromotionInfoBar[]
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1438,7 +1438,7 @@ const char kDownloadDefaultDirectory[] =
+@@ -1454,7 +1454,7 @@ const char kDownloadDefaultDirectory[] =
  // upgrade a unsafe location to a safe location.
  const char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index decc11c38faa..15107d852417 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig	2017-01-26 00:49:10 UTC
+--- chrome/common/pref_names.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/pref_names.h
-@@ -322,7 +322,7 @@ extern const char kForceGoogleSafeSearch
+@@ -330,7 +330,7 @@ extern const char kForceGoogleSafeSearch
  extern const char kForceYouTubeRestrict[];
  extern const char kForceSessionSync[];
  extern const char kAllowedDomainsForApps[];
@@ -9,7 +9,7 @@
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
-@@ -355,7 +355,7 @@ extern const char kDefaultBrowserSetting
+@@ -363,7 +363,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[];
-@@ -510,7 +510,7 @@ extern const char kAppWindowPlacement[];
+@@ -519,7 +519,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_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc
index 373ff744083e..fa087011bbe8 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.cc.orig	2017-02-02 02:02:50 UTC
+--- chrome/common/url_constants.cc.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/url_constants.cc
-@@ -139,7 +139,7 @@ const char kChromeUIMdCupsSettingsURL[] 
+@@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[] 
  const char kChromeUIMetroFlowURL[] = "chrome://make-metro/";
  #endif
  
@@ -9,7 +9,7 @@
  const char kChromeUITabModalConfirmDialogURL[] =
      "chrome://tab-modal-confirm-dialog/";
  #endif
-@@ -332,7 +332,7 @@ const char kChromeOSAssetPath[] = "/usr/
+@@ -336,7 +336,7 @@ const char kChromeOSAssetPath[] = "/usr/
  const char kChromeUIMetroFlowHost[] = "make-metro";
  #endif
  
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index 710a8e744270..73ae674aeadc 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig	2017-02-02 02:02:50 UTC
+--- chrome/common/url_constants.h.orig	2017-03-09 20:04:29 UTC
 +++ chrome/common/url_constants.h
-@@ -125,7 +125,7 @@ extern const char kChromeUIMdCupsSetting
+@@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting
  extern const char kChromeUIMetroFlowURL[];
  #endif
  
@@ -9,7 +9,7 @@
  extern const char kChromeUITabModalConfirmDialogURL[];
  #endif
  
-@@ -309,7 +309,7 @@ extern const char kChromeOSAssetPath[];
+@@ -313,7 +313,7 @@ extern const char kChromeOSAssetPath[];
  extern const char kChromeUIMetroFlowHost[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 1785a516aecc..617c9599e92e 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	2017-01-26 00:49:10 UTC
+--- chrome/test/BUILD.gn.orig	2017-03-09 20:04:30 UTC
 +++ chrome/test/BUILD.gn
-@@ -186,7 +186,7 @@ static_library("test_support") {
+@@ -193,7 +193,7 @@ static_library("test_support") {
      ]
    }
  
@@ -9,7 +9,7 @@
      public_deps += [ "//crypto:platform" ]
    }
    if (is_mac) {
-@@ -461,7 +461,7 @@ if (!is_android) {
+@@ -451,7 +451,7 @@ if (!is_android) {
        "$root_out_dir/test_page.css.mock-http-headers",
        "$root_out_dir/ui_test.pak",
      ]
@@ -18,7 +18,7 @@
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -470,7 +470,7 @@ if (!is_android) {
+@@ -460,7 +460,7 @@ if (!is_android) {
          "$root_out_dir/resources.pak",
        ]
      }
@@ -28,7 +28,7 @@
      }
  
 @@ -577,7 +577,7 @@ if (!is_android) {
-           "base/interactive_test_utils_views.cc",
+           "../browser/ui/views/payments/payment_request_interactive_uitest_base.h",
          ]
        }
 -      if (is_linux) {
@@ -36,7 +36,7 @@
          if (!is_chromeos) {
            # Desktop linux.
            sources -= [
-@@ -2010,14 +2010,14 @@ test("browser_tests") {
+@@ -2041,14 +2041,14 @@ test("browser_tests") {
          sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
          deps += [ "//chrome/browser/chromeos" ]
          data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
@@ -53,7 +53,7 @@
          sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
          data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
        }
-@@ -2029,7 +2029,7 @@ test("browser_tests") {
+@@ -2060,7 +2060,7 @@ test("browser_tests") {
          configs +=
              [ "//build/config/win:default_large_module_incremental_linking" ]
        }
@@ -62,7 +62,7 @@
          data_deps += [ "//components/nacl/loader:nacl_helper" ]
  
          if (enable_nacl_nonsfi) {
-@@ -2136,7 +2136,7 @@ test("browser_tests") {
+@@ -2170,7 +2170,7 @@ test("browser_tests") {
        }
      }
  
@@ -71,7 +71,7 @@
        # Set rpath to find the CDM adapter even in a non-component build.
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
      }
-@@ -2363,7 +2363,7 @@ test("browser_tests") {
+@@ -2391,7 +2391,7 @@ test("browser_tests") {
        if (toolkit_views) {
          sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
        }
@@ -80,7 +80,7 @@
          sources +=
              [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
        }
-@@ -2558,7 +2558,7 @@ test("browser_tests") {
+@@ -2568,7 +2568,7 @@ test("browser_tests") {
          "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
        ]
      }
@@ -98,7 +98,7 @@
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -3411,7 +3411,7 @@ test("unit_tests") {
+@@ -3439,7 +3439,7 @@ test("unit_tests") {
        "$root_out_dir/resources.pak",
      ]
    }
@@ -106,8 +106,8 @@
 +  if (is_linux || is_bsd || is_win) {
      data += [ "$root_out_dir/chrome_200_percent.pak" ]
    }
- 
-@@ -4111,7 +4111,7 @@ test("unit_tests") {
+   if (is_win) {
+@@ -4177,7 +4177,7 @@ test("unit_tests") {
        "//ui/wm",
      ]
    }
@@ -116,16 +116,16 @@
      sources += [
        "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
        "../browser/shell_integration_linux_unittest.cc",
-@@ -4131,7 +4131,7 @@ test("unit_tests") {
+@@ -4197,7 +4197,7 @@ test("unit_tests") {
    if (use_gio) {
      deps += [ "//build/linux/libgio" ]
    }
 -  if (!is_chromeos && !use_ozone && is_linux) {
 +  if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) {
-     if (use_gtk3) {
-       deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ]
-     } else {
-@@ -4424,18 +4424,18 @@ test("unit_tests") {
+     deps += [ "//chrome/browser/ui/libgtkui" ]
+   }
+ 
+@@ -4456,18 +4456,18 @@ test("unit_tests") {
        "//components/os_crypt:gnome_keyring_direct",
      ]
    }
@@ -147,7 +147,7 @@
      ldflags = [ "-Wl,--strip-debug" ]
    }
    if (is_mac) {
-@@ -4941,7 +4941,7 @@ if (safe_browsing_mode == 1 && is_mac) {
+@@ -4956,7 +4956,7 @@ if (safe_browsing_mode == 1 && is_mac) {
    }
  }
  
@@ -156,7 +156,7 @@
    # TODO(609855): Make this compile on Android and run on the bots.
    test("chrome_app_unittests") {
      sources = [
-@@ -4967,7 +4967,7 @@ if (!is_android) {
+@@ -4982,7 +4982,7 @@ if (!is_android) {
    }
  }
  
diff --git a/www/chromium/files/patch-chromecast_browser_BUILD.gn b/www/chromium/files/patch-chromecast_browser_BUILD.gn
index b45e89c695d2..b8f080f3bd1e 100644
--- a/www/chromium/files/patch-chromecast_browser_BUILD.gn
+++ b/www/chromium/files/patch-chromecast_browser_BUILD.gn
@@ -1,11 +1,11 @@
---- chromecast/browser/BUILD.gn.orig	2017-01-26 00:49:11 UTC
+--- chromecast/browser/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ chromecast/browser/BUILD.gn
-@@ -120,7 +120,7 @@ source_set("browser") {
+@@ -118,7 +118,7 @@ source_set("browser") {
      "//ui/gl",
    ]
  
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      sources += [
-       "cast_memory_pressure_monitor.cc",
-       "cast_memory_pressure_monitor.h",
+       "cast_content_window_linux.cc",
+       "cast_content_window_linux.h",
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index a6645b5ddc40..c36a16989140 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2017-02-02 02:02:51 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2017-03-09 20:04:31 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -269,7 +269,7 @@ void CastContentBrowserClient::AppendExt
+@@ -285,7 +285,7 @@ void CastContentBrowserClient::AppendExt
        command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback);
    }
  
diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn
index dbfa31446961..13c88540990c 100644
--- a/www/chromium/files/patch-components_BUILD.gn
+++ b/www/chromium/files/patch-components_BUILD.gn
@@ -1,6 +1,6 @@
---- components/BUILD.gn.orig	2017-01-26 00:49:11 UTC
+--- components/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ components/BUILD.gn
-@@ -168,8 +168,8 @@ test("components_unittests") {
+@@ -174,8 +174,8 @@ test("components_unittests") {
        "//components/certificate_reporting:unit_tests",
        "//components/certificate_transparency:unit_tests",
        "//components/contextual_search:unit_tests",
diff --git a/www/chromium/files/patch-components_crash_content_app_BUILD.gn b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
index fd8041fc088c..20916a13c9ab 100644
--- a/www/chromium/files/patch-components_crash_content_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/content/app/BUILD.gn.orig	2017-01-26 00:49:11 UTC
+--- components/crash/content/app/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ components/crash/content/app/BUILD.gn
-@@ -145,7 +145,7 @@ source_set("app_non_mac_win") {
+@@ -154,7 +154,7 @@ source_set("app_non_mac_win") {
        "//breakpad:breakpad_handler",
        "//sandbox",
      ]
diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h
index 2a956226585b..5d7a39d4c27e 100644
--- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h
+++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h
@@ -1,6 +1,6 @@
---- components/gcm_driver/gcm_client.h.orig	2017-01-26 00:49:11 UTC
+--- components/gcm_driver/gcm_client.h.orig	2017-03-09 20:04:31 UTC
 +++ components/gcm_driver/gcm_client.h
-@@ -80,6 +80,7 @@ class GCMClient {
+@@ -78,6 +78,7 @@ class GCMClient {
      PLATFORM_CROS,
      PLATFORM_IOS,
      PLATFORM_ANDROID,
diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn
index 39be306d4d57..bad50b3f590f 100644
--- a/www/chromium/files/patch-components_metrics_BUILD.gn
+++ b/www/chromium/files/patch-components_metrics_BUILD.gn
@@ -1,4 +1,4 @@
---- components/metrics/BUILD.gn.orig	2017-01-26 00:49:12 UTC
+--- components/metrics/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ components/metrics/BUILD.gn
 @@ -107,6 +107,13 @@ static_library("metrics") {
    if (is_win) {
@@ -23,7 +23,7 @@
    static_library("serialization") {
      sources = [
        "serialization/metric_sample.cc",
-@@ -341,7 +348,7 @@ source_set("unit_tests") {
+@@ -342,7 +349,7 @@ source_set("unit_tests") {
      "//ui/gfx/geometry",
    ]
  
diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js
index 701a28dd5753..9589a1835496 100644
--- a/www/chromium/files/patch-components_neterror_resources_neterror.js
+++ b/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -1,11 +1,11 @@
---- components/neterror/resources/neterror.js.orig	2017-01-26 00:49:12 UTC
+--- components/neterror/resources/neterror.js.orig	2017-03-09 20:04:31 UTC
 +++ components/neterror/resources/neterror.js
 @@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings
  }
  
  var primaryControlOnLeft = true;
--<if expr="is_macosx or is_ios or is_linux or is_android">
-+<if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
+-// <if expr="is_macosx or is_ios or is_linux or is_android">
++// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
  primaryControlOnLeft = false;
- </if>
+ // </if>
  
diff --git a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn
index 4430da175838..13bb3eff9695 100644
--- a/www/chromium/files/patch-components_plugins_renderer_BUILD.gn
+++ b/www/chromium/files/patch-components_plugins_renderer_BUILD.gn
@@ -1,6 +1,6 @@
---- components/plugins/renderer/BUILD.gn.orig	2017-01-26 00:49:12 UTC
+--- components/plugins/renderer/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ components/plugins/renderer/BUILD.gn
-@@ -19,6 +19,7 @@ static_library("renderer") {
+@@ -20,6 +20,7 @@ static_library("renderer") {
    }
  
    deps = [
@@ -8,7 +8,7 @@
      "//content/public/child",
      "//content/public/common",
      "//content/public/renderer",
-@@ -27,6 +28,5 @@ static_library("renderer") {
+@@ -28,6 +29,5 @@ static_library("renderer") {
      "//third_party/WebKit/public:blink",
      "//third_party/re2",
      "//ui/base",
diff --git a/www/chromium/files/patch-components_policy_BUILD.gn b/www/chromium/files/patch-components_policy_BUILD.gn
index 52ae6f3688b9..8492f292a3fa 100644
--- a/www/chromium/files/patch-components_policy_BUILD.gn
+++ b/www/chromium/files/patch-components_policy_BUILD.gn
@@ -1,6 +1,6 @@
---- components/policy/BUILD.gn.orig	2017-01-26 00:49:12 UTC
+--- components/policy/BUILD.gn.orig	2017-03-09 20:04:31 UTC
 +++ components/policy/BUILD.gn
-@@ -14,6 +14,7 @@ import("//tools/grit/grit_rule.gni")
+@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re
  gen_policy_templates_common = true
  gen_policy_templates_win = is_win
  gen_policy_templates_linux = is_linux
@@ -8,12 +8,12 @@
  gen_policy_templates_android = is_android
  gen_policy_templates_mac = is_mac
  
-@@ -126,7 +127,7 @@ if (enable_configuration_policy) {
-       outputs += policy_templates_android_outputs
-       defines += [ "gen_policy_templates_android" ]
-     }
--    if (gen_policy_templates_linux) {
-+    if (gen_policy_templates_linux || gen_policy_templates_bsd) {
-       outputs += policy_templates_linux_outputs
-       defines += [ "gen_policy_templates_linux" ]
-     }
+@@ -128,7 +129,7 @@ grit("grit_policy_templates") {
+     outputs += policy_templates_android_outputs
+     defines += [ "gen_policy_templates_android" ]
+   }
+-  if (gen_policy_templates_linux) {
++  if (gen_policy_templates_linux || gen_policy_templates_bsd) {
+     outputs += policy_templates_linux_outputs
+     defines += [ "gen_policy_templates_linux" ]
+   }
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index 6a414dce8243..7b070882e700 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig	2017-01-26 00:49:12 UTC
+--- components/policy/resources/policy_templates.json.orig	2017-03-09 20:04:31 UTC
 +++ components/policy/resources/policy_templates.json
-@@ -932,7 +932,7 @@
+@@ -927,7 +927,7 @@
            'name': 'RemoteAccessHostMatchUsername',
            'type': 'main',
            'schema': { 'type': 'boolean' },
@@ -9,7 +9,7 @@
            'features': {
              'dynamic_refresh': True,
              'per_profile': False,
-@@ -2065,7 +2065,7 @@
+@@ -2106,7 +2106,7 @@
            'name': 'GSSAPILibraryName',
            'type': 'string',
            'schema': { 'type': 'string' },
@@ -18,7 +18,7 @@
            'features': {
              'dynamic_refresh': False,
              'per_profile': False,
-@@ -4742,7 +4742,7 @@
+@@ -4782,7 +4782,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -27,7 +27,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -5627,7 +5627,7 @@
+@@ -5671,7 +5671,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -36,7 +36,7 @@
        'features': {
          'can_be_recommended': True,
          'dynamic_refresh': True,
-@@ -6156,7 +6156,7 @@
+@@ -6198,7 +6198,7 @@
        'name': 'FullscreenAllowed',
        'type': 'main',
        'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
index 107ab2fe51f9..5e392e71e501 100644
--- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
+++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
@@ -1,6 +1,6 @@
---- components/policy/tools/generate_policy_source.py.orig	2017-01-26 00:49:12 UTC
+--- components/policy/tools/generate_policy_source.py.orig	2017-03-09 20:04:31 UTC
 +++ components/policy/tools/generate_policy_source.py
-@@ -102,7 +102,7 @@ class PolicyDetails:
+@@ -103,7 +103,7 @@ class PolicyDetails:
        if platform.startswith('chrome.'):
          platform_sub = platform[7:]
          if platform_sub == '*':
diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc
index b5e35312e2e3..9a72e9f333b9 100644
--- a/www/chromium/files/patch-components_update__client_update__query__params.cc
+++ b/www/chromium/files/patch-components_update__client_update__query__params.cc
@@ -1,6 +1,6 @@
---- components/update_client/update_query_params.cc.orig	2017-01-26 00:49:13 UTC
+--- components/update_client/update_query_params.cc.orig	2017-03-09 20:04:32 UTC
 +++ components/update_client/update_query_params.cc
-@@ -31,6 +31,8 @@ const char kOs[] =
+@@ -34,6 +34,8 @@ const char kOs[] =
      "linux";
  #elif defined(OS_OPENBSD)
      "openbsd";
diff --git a/www/chromium/files/patch-components_variations_proto_study.proto b/www/chromium/files/patch-components_variations_proto_study.proto
index 8000e1f9f2ed..29618afb993c 100644
--- a/www/chromium/files/patch-components_variations_proto_study.proto
+++ b/www/chromium/files/patch-components_variations_proto_study.proto
@@ -1,6 +1,6 @@
---- components/variations/proto/study.proto.orig	2017-01-26 00:49:13 UTC
+--- components/variations/proto/study.proto.orig	2017-03-09 20:04:32 UTC
 +++ components/variations/proto/study.proto
-@@ -186,6 +186,7 @@ message Study {
+@@ -188,6 +188,7 @@ message Study {
      PLATFORM_CHROMEOS = 3;
      PLATFORM_ANDROID  = 4;
      PLATFORM_IOS      = 5;
diff --git a/www/chromium/files/patch-content_app_BUILD.gn b/www/chromium/files/patch-content_app_BUILD.gn
index 3567f9216db2..5c6395cfe347 100644
--- a/www/chromium/files/patch-content_app_BUILD.gn
+++ b/www/chromium/files/patch-content_app_BUILD.gn
@@ -1,6 +1,6 @@
---- content/app/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/app/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/app/BUILD.gn
-@@ -68,7 +68,7 @@ template("implement_content_app") {
+@@ -70,7 +70,7 @@ template("implement_content_app") {
      ]
    }
  
diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc
index c04c4f6a6349..36dc4a686b36 100644
--- a/www/chromium/files/patch-content_app_content__main__runner.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner.cc.orig	2017-01-26 00:49:13 UTC
+--- content/app/content_main_runner.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/app/content_main_runner.cc
-@@ -97,10 +97,10 @@
+@@ -98,10 +98,10 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -13,7 +13,7 @@
  #include "content/zygote/zygote_main.h"
  #endif
  
-@@ -290,7 +290,7 @@ struct MainFunction {
+@@ -298,7 +298,7 @@ struct MainFunction {
    int (*function)(const MainFunctionParams&);
  };
  
@@ -22,7 +22,7 @@
  // On platforms that use the zygote, we have a special subset of
  // subprocesses that are launched via the zygote.  This function
  // fills in some process-launching bits around ZygoteMain().
-@@ -342,7 +342,7 @@ int RunZygote(const MainFunctionParams& 
+@@ -350,7 +350,7 @@ int RunZygote(const MainFunctionParams& 
    NOTREACHED() << "Unknown zygote process type: " << process_type;
    return 1;
  }
@@ -31,7 +31,7 @@
  
  static void RegisterMainThreadFactories() {
  #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
-@@ -409,7 +409,7 @@ int RunNamedProcessTypeMain(
+@@ -417,7 +417,7 @@ int RunNamedProcessTypeMain(
      }
    }
  
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 18db96dacbe0..100b96989af9 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/browser/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/BUILD.gn
-@@ -1421,10 +1421,11 @@ source_set("browser") {
+@@ -1444,11 +1444,6 @@ source_set("browser") {
        "memory/memory_monitor_chromeos.cc",
        "memory/memory_monitor_chromeos.h",
      ]
@@ -8,24 +8,20 @@
 -    sources += [
 -      "memory/memory_monitor_linux.cc",
 -      "memory/memory_monitor_linux.h",
-+  }
-+
-+  if (is_bsd) {
-+    sources -= [
-+      "download/quarantine_linux.cc",
-     ]
+-    ]
    }
  
-@@ -1490,7 +1491,7 @@ source_set("browser") {
-     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",
-@@ -1657,7 +1658,7 @@ source_set("browser") {
+   if (!is_win) {
+@@ -1514,7 +1509,7 @@ source_set("browser") {
+ 
+   # Desktop screen capture implementations, conditionally built depending on
+   # the available implementations for each platform.
+-  if (is_linux || is_mac || is_win) {
++  if (is_linux || is_bsd || is_mac || is_win) {
+     defines += [ "ENABLE_SCREEN_CAPTURE=1" ]
+     sources += [
+       "media/capture/cursor_renderer.cc",
+@@ -1703,7 +1698,7 @@ source_set("browser") {
      }
    }
  
@@ -34,7 +30,7 @@
      deps += [ "//build/linux:fontconfig" ]
    }
  
-@@ -1807,6 +1808,17 @@ source_set("browser") {
+@@ -1862,6 +1857,17 @@ source_set("browser") {
        "//chromeos",
        "//chromeos:power_manager_proto",
      ]
@@ -52,8 +48,8 @@
    }
  
    if (enable_mojo_media) {
-@@ -1930,11 +1942,11 @@ source_set("browser") {
-     deps += [ "//third_party/flac" ]
+@@ -1978,11 +1984,11 @@ source_set("browser") {
+     ]
    }
  
 -  if (is_linux && use_dbus) {
@@ -65,4 +61,3 @@
 +  if (is_linux || is_bsd) {
      deps += [ "//third_party/boringssl" ]
    }
- 
diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
index 72cd3111adf3..4d410629fb8c 100644
--- a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
+++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
@@ -1,4 +1,4 @@
---- content/browser/accessibility/browser_accessibility_manager.h.orig	2017-01-26 00:49:13 UTC
+--- content/browser/accessibility/browser_accessibility_manager.h.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/accessibility/browser_accessibility_manager.h
 @@ -34,7 +34,7 @@ class BrowserAccessibilityManager;
  class BrowserAccessibilityManagerAndroid;
@@ -9,7 +9,7 @@
  class BrowserAccessibilityManagerAuraLinux;
  #elif defined(OS_MACOSX)
  class BrowserAccessibilityManagerMac;
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT BrowserAccessibilit
    BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
  #endif
  
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 66adf8f98e26..895e97eb4811 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,6 @@
---- content/browser/browser_main_loop.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/browser_main_loop.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -203,6 +203,10 @@
+@@ -210,6 +210,10 @@
  #include "gpu/vulkan/vulkan_implementation.h"
  #endif
  
@@ -11,7 +11,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -211,7 +215,7 @@
+@@ -218,7 +222,7 @@
  namespace content {
  namespace {
  
@@ -20,7 +20,7 @@
  void SetupSandbox(const base::CommandLine& parsed_command_line) {
    TRACE_EVENT0("startup", "SetupSandbox");
    if (parsed_command_line.HasSwitch(switches::kNoZygote)) {
-@@ -482,10 +486,15 @@ void BrowserMainLoop::Init() {
+@@ -582,10 +586,15 @@ void BrowserMainLoop::Init() {
  void BrowserMainLoop::EarlyInitialization() {
    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
  
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc
deleted file mode 100644
index a47b8f91538e..000000000000
--- a/www/chromium/files/patch-content_browser_child__process__launcher.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- content/browser/child_process_launcher.cc.orig	2017-01-26 00:49:13 UTC
-+++ content/browser/child_process_launcher.cc
-@@ -249,7 +249,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 =
-       !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
-           ? delegate->GetZygote()
-@@ -267,7 +267,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 =
-@@ -358,7 +358,7 @@ void TerminateOnLauncherThread(ZygoteHan
-   process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
-   // On POSIX, we must additionally reap the child.
- #if defined(OS_POSIX)
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   if (zygote) {
-     // If the renderer was created via a zygote, we have to proxy the reaping
-     // through the zygote process.
-@@ -475,7 +475,7 @@ void ChildProcessLauncher::Launch(Sandbo
- 
- void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
-   DCHECK(CalledOnValidThread());
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   if (zygote_) {
-     termination_status_ = zygote_->GetTerminationStatus(
-         process_.Handle(), known_dead, &exit_code_);
-@@ -549,7 +549,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)
-   zygote_ = zygote;
- #endif
-   if (process_.IsValid()) {
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
new file mode 100644
index 000000000000..3f94a81fa1e6
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -0,0 +1,49 @@
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2017-03-09 20:04:32 UTC
++++ content/browser/child_process_launcher_helper_linux.cc
+@@ -95,6 +95,7 @@ ChildProcessLauncherHelper::LaunchProces
+     int* launch_result) {
+   *is_synchronous_launch = true;
+ 
++#if !defined(OS_BSD)
+   ZygoteHandle* zygote_handle =
+       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ?
+       nullptr : delegate_->GetZygote();
+@@ -114,6 +115,7 @@ ChildProcessLauncherHelper::LaunchProces
+     process.zygote = *zygote_handle;
+     return process;
+   }
++#endif
+ 
+   Process process;
+   process.process = base::LaunchProcess(*command_line(), options);
+@@ -133,10 +135,12 @@ base::TerminationStatus ChildProcessLaun
+     const ChildProcessLauncherHelper::Process& process,
+     bool known_dead,
+     int* exit_code) {
++#if !defined(OS_BSD)
+   if (process.zygote) {
+     return process.zygote->GetTerminationStatus(
+         process.process.Handle(), known_dead, exit_code);
+   }
++#endif
+   if (known_dead) {
+     return base::GetKnownDeadTerminationStatus(
+         process.process.Handle(), exit_code);
+@@ -155,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNo
+     ChildProcessLauncherHelper::Process process) {
+   process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
+   // On POSIX, we must additionally reap the child.
++#if !defined(OS_BSD)
+   if (process.zygote) {
+     // If the renderer was created via a zygote, we have to proxy the reaping
+     // through the zygote process.
+     process.zygote->EnsureProcessTerminated(process.process.Handle());
+   } else {
++#endif
+     base::EnsureProcessTerminated(std::move(process.process));
++#if !defined(OS_BSD)
+   }
++#endif
+ }
+ 
+ // static
diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
index 465303ad489e..428af3ad46ac 100644
--- a/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
+++ b/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc
@@ -1,6 +1,6 @@
---- content/browser/devtools/protocol/color_picker.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/devtools/protocol/color_picker.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/devtools/protocol/color_picker.cc
-@@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() {
+@@ -150,7 +150,7 @@ void ColorPicker::UpdateCursor() {
    // magnified projection only with centered hotspot.
    // Mac Retina requires cursor to be > 120px in order to render smoothly.
  
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 b6f55d137865..bd25da77c4f4 100644
--- a/www/chromium/files/patch-content_browser_download_base__file.cc
+++ b/www/chromium/files/patch-content_browser_download_base__file.cc
@@ -1,6 +1,6 @@
---- content/browser/download/base_file.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/download/base_file.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/download/base_file.cc
-@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt
+@@ -370,7 +370,7 @@ DownloadInterruptReason BaseFile::LogInt
    return reason;
  }
  
@@ -9,7 +9,7 @@
  
  namespace {
  
-@@ -456,7 +456,7 @@ DownloadInterruptReason BaseFile::Annota
+@@ -453,7 +453,7 @@ DownloadInterruptReason BaseFile::Annota
    }
    return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
  }
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 6474e16759c9..b08b34fe0c4a 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -376,7 +376,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
+@@ -384,7 +384,7 @@ bool GpuDataManagerImplPrivate::GpuAcces
      // strings even if all features are blacklisted. If all GPU features are
      // disabled, the GPU process will only initialize GL bindings, create a GL
      // context, and collect full GPU info.
@@ -9,7 +9,7 @@
      if (reason) {
        *reason = "All GPU features are blacklisted.";
      }
-@@ -493,8 +493,10 @@ void GpuDataManagerImplPrivate::SetGLStr
+@@ -501,8 +501,10 @@ void GpuDataManagerImplPrivate::SetGLStr
    gpu_info.gl_renderer = gl_renderer;
    gpu_info.gl_version = gl_version;
  
@@ -20,7 +20,7 @@
  
    UpdateGpuInfo(gpu_info);
    UpdateGpuSwitchingManager(gpu_info);
-@@ -549,10 +551,12 @@ void GpuDataManagerImplPrivate::Initiali
+@@ -557,10 +559,12 @@ void GpuDataManagerImplPrivate::Initiali
      // Skip collecting the basic driver info if SetGpuInfo() is already called.
      if (IsCompleteGpuInfoAvailable()) {
        gpu_info = gpu_info_;
@@ -33,7 +33,7 @@
      }
  
      if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
-@@ -664,7 +668,9 @@ void GpuDataManagerImplPrivate::UpdateGp
+@@ -671,7 +675,9 @@ void GpuDataManagerImplPrivate::UpdateGp
      return;
  
    bool was_info_available = IsCompleteGpuInfoAvailable();
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
index af37f2d0ffe4..60708274e6c6 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_internals_ui.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/gpu/gpu_internals_ui.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/gpu/gpu_internals_ui.cc
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
  #include "third_party/skia/include/core/SkMilestone.h"
  #include "ui/gl/gpu_switching_manager.h"
  
@@ -9,7 +9,7 @@
  #include <X11/Xlib.h>
  #endif
  #if defined(OS_WIN)
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  #include "ui/gfx/win/physical_size.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "ui/base/x/x11_util.h"       // nogncheck
  #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
  #endif
-@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona
+@@ -210,7 +210,7 @@ base::DictionaryValue* GpuInfoAsDictiona
                                               gpu_info.gl_ws_version));
    basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
                                               gpu_info.gl_ws_extensions));
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 6744088fbaa3..79039faa7c88 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,8 +1,8 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/gpu/gpu_process_host.cc
-@@ -984,7 +984,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
-   base::CommandLine* cmd_line =
-       new base::CommandLine(base::CommandLine::NO_PROGRAM);
+@@ -994,7 +994,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp
+   std::unique_ptr<base::CommandLine> cmd_line =
+       base::MakeUnique<base::CommandLine>(base::CommandLine::NO_PROGRAM);
  #else
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_browser_media_media__internals.cc b/www/chromium/files/patch-content_browser_media_media__internals.cc
index 02526c0b5c7c..da731c742b45 100644
--- a/www/chromium/files/patch-content_browser_media_media__internals.cc
+++ b/www/chromium/files/patch-content_browser_media_media__internals.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_internals.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/media/media_internals.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/media/media_internals.cc
-@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD
+@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureD
      device_dict->SetString("name", descriptor.GetNameAndModel());
      device_dict->Set("formats", format_list);
  #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc
index 29d49895f42f..95ed2c6cdec7 100644
--- a/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc
+++ b/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc
@@ -1,9 +1,9 @@
---- content/browser/memory/memory_coordinator_impl.cc.orig	2017-02-02 02:02:53 UTC
+--- content/browser/memory/memory_coordinator_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/memory/memory_coordinator_impl.cc
-@@ -116,8 +116,12 @@ void RecordMetricsOnStateChange(base::Me
- struct MemoryCoordinatorSingletonTraits
-     : public base::LeakySingletonTraits<MemoryCoordinator> {
-   static MemoryCoordinator* New() {
+@@ -148,8 +148,12 @@ void MemoryCoordinatorHandleImpl::AddChi
+ struct MemoryCoordinatorImplSingletonTraits
+     : public base::LeakySingletonTraits<MemoryCoordinatorImpl> {
+   static MemoryCoordinatorImpl* New() {
 +#if defined(OS_BSD)
 +    return nullptr;
 +#else
diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
index 6436c1bf674e..fa3f9f6fef63 100644
--- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
+++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/ppapi_plugin_process_host.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/ppapi_plugin_process_host.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/ppapi_plugin_process_host.cc
-@@ -53,9 +53,9 @@
+@@ -54,9 +54,9 @@
  
  namespace content {
  
@@ -12,7 +12,7 @@
  
  // NOTE: changes to this class need to be reviewed by the security team.
  class PpapiPluginSandboxedProcessLauncherDelegate
-@@ -109,7 +109,7 @@ class PpapiPluginSandboxedProcessLaunche
+@@ -110,7 +110,7 @@ class PpapiPluginSandboxedProcessLaunche
      return true;
    }
  
@@ -21,7 +21,7 @@
    ZygoteHandle* GetZygote() override {
      const base::CommandLine& browser_command_line =
          *base::CommandLine::ForCurrentProcess();
-@@ -203,13 +203,13 @@ PpapiPluginProcessHost* PpapiPluginProce
+@@ -204,13 +204,13 @@ PpapiPluginProcessHost* PpapiPluginProce
    return NULL;
  }
  
@@ -37,7 +37,7 @@
  
  // static
  void PpapiPluginProcessHost::DidCreateOutOfProcessInstance(
-@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const 
+@@ -362,7 +362,7 @@ bool PpapiPluginProcessHost::Init(const 
    base::CommandLine::StringType plugin_launcher =
        browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher);
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc
new file mode 100644
index 000000000000..745bdd992248
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc
@@ -0,0 +1,20 @@
+--- content/browser/renderer_host/media/video_capture_manager.cc.orig	2017-03-09 20:04:32 UTC
++++ content/browser/renderer_host/media/video_capture_manager.cc
+@@ -662,7 +662,7 @@ VideoCaptureManager::DoStartTabCaptureOn
+   DCHECK(IsOnDeviceThread());
+ 
+   std::unique_ptr<VideoCaptureDevice> video_capture_device;
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+   video_capture_device = WebContentsVideoCaptureDevice::Create(id);
+ #endif
+ 
+@@ -692,7 +692,7 @@ VideoCaptureManager::DoStartDesktopCaptu
+   }
+ 
+   if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+     video_capture_device = WebContentsVideoCaptureDevice::Create(id);
+     IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED);
+     if (desktop_id.audio_share) {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
index 9a34c8919d15..ddac97003718 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_message_filter.cc.orig	2017-02-02 02:02:53 UTC
+--- content/browser/renderer_host/render_message_filter.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/renderer_host/render_message_filter.cc
-@@ -92,7 +92,7 @@
+@@ -90,7 +90,7 @@
  #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
  #endif
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
index e69a162821f0..059ef53f9bd2 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
@@ -1,8 +1,8 @@
---- content/browser/renderer_host/render_message_filter.h.orig	2017-02-02 02:02:53 UTC
+--- content/browser/renderer_host/render_message_filter.h.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/renderer_host/render_message_filter.h
-@@ -175,7 +175,7 @@ class CONTENT_EXPORT RenderMessageFilter
-   void OnDeletedDiscardableSharedMemory(
-       discardable_memory::DiscardableSharedMemoryId id);
+@@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter
+       const std::list<base::ProcessHandle>& handles);
+   void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 2c8c1f9acd41..cc7fa0f3d3b5 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -368,11 +368,11 @@ SiteProcessMap* GetSiteProcessMapForBrow
+@@ -372,11 +372,11 @@ SiteProcessMap* GetSiteProcessMapForBrow
    return map;
  }
  
@@ -14,7 +14,7 @@
  
  // NOTE: changes to this class need to be reviewed by the security team.
  class RendererSandboxedProcessLauncherDelegate
-@@ -395,7 +395,7 @@ class RendererSandboxedProcessLauncherDe
+@@ -399,7 +399,7 @@ class RendererSandboxedProcessLauncherDe
      return GetContentClient()->browser()->PreSpawnRenderer(policy);
    }
  
@@ -23,7 +23,7 @@
    ZygoteHandle* GetZygote() override {
      const base::CommandLine& browser_command_line =
          *base::CommandLine::ForCurrentProcess();
-@@ -635,7 +635,7 @@ void RenderProcessHost::SetMaxRendererPr
+@@ -639,7 +639,7 @@ void RenderProcessHost::SetMaxRendererPr
    g_max_renderer_count_override = count;
  }
  
@@ -32,7 +32,7 @@
  // static
  void RenderProcessHostImpl::EarlyZygoteLaunch() {
    DCHECK(!g_render_zygote);
-@@ -645,7 +645,7 @@ void RenderProcessHostImpl::EarlyZygoteL
+@@ -649,7 +649,7 @@ void RenderProcessHostImpl::EarlyZygoteL
    ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus(
        (*GetGenericZygote())->GetSandboxStatus());
  }
@@ -41,7 +41,7 @@
  
  RenderProcessHostImpl::RenderProcessHostImpl(
      BrowserContext* browser_context,
-@@ -788,7 +788,7 @@ bool RenderProcessHostImpl::Init() {
+@@ -796,7 +796,7 @@ bool RenderProcessHostImpl::Init() {
    renderer_prefix =
        browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index 25636e95b19b..b290d786729d 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2017-02-02 02:02:53 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -139,7 +139,7 @@ void GetPlatformSpecificPrefs(RendererPr
+@@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 05be274cf31f..68adc230011c 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2017-02-02 02:02:53 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -107,7 +107,7 @@
+@@ -111,7 +111,7 @@
  #include "ui/gfx/gdi_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
-@@ -1961,7 +1961,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
+@@ -2018,7 +2018,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -18,7 +18,7 @@
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2158,7 +2158,7 @@ void RenderWidgetHostViewAura::ForwardKe
+@@ -2218,7 +2218,7 @@ void RenderWidgetHostViewAura::ForwardKe
    if (!target_host)
      return;
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
new file mode 100644
index 000000000000..9498f262dbf4
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -0,0 +1,11 @@
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2017-03-09 20:04:32 UTC
++++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
+@@ -545,7 +545,7 @@ bool RenderWidgetHostViewEventHandler::C
+   if (event->type() == ui::ET_MOUSE_EXITED) {
+     if (mouse_locked || selection_popup)
+       return false;
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+     // Don't forward the mouse leave message which is received when the context
+     // menu is displayed by the page. This confuses the page and causes state
+     // changes.
diff --git a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
index ab5313decfc7..48533fef7487 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host_impl.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/utility_process_host_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/browser/utility_process_host_impl.cc
-@@ -43,9 +43,9 @@
+@@ -44,9 +44,9 @@
  #include "services/service_manager/public/cpp/interface_provider.h"
  #include "ui/base/ui_base_switches.h"
  
@@ -12,7 +12,7 @@
  
  #if defined(OS_WIN)
  #include "sandbox/win/src/sandbox_policy.h"
-@@ -54,11 +54,11 @@
+@@ -55,11 +55,11 @@
  
  namespace content {
  
@@ -26,7 +26,7 @@
  
  // NOTE: changes to this class need to be reviewed by the security team.
  class UtilitySandboxedProcessLauncherDelegate
-@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDel
+@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel
          launch_elevated_(launch_elevated)
  #elif defined(OS_POSIX)
          env_(env)
@@ -39,7 +39,7 @@
  #endif  // OS_WIN
    {}
  
-@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDel
+@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel
  
  #elif defined(OS_POSIX)
  
@@ -55,7 +55,7 @@
    base::EnvironmentMap GetEnvironment() override { return env_; }
  #endif  // OS_WIN
  
-@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDel
+@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel
    bool launch_elevated_;
  #elif defined(OS_POSIX)
    base::EnvironmentMap env_;
@@ -67,7 +67,7 @@
  #endif  // OS_WIN
  };
  
-@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHo
+@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo
        is_batch_mode_(false),
        no_sandbox_(false),
        run_elevated_(false),
@@ -76,7 +76,7 @@
        child_flags_(ChildProcessHost::CHILD_ALLOW_SELF),
  #else
        child_flags_(ChildProcessHost::CHILD_NORMAL),
-@@ -235,13 +235,13 @@ void UtilityProcessHostImpl::SetName(con
+@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con
    name_ = name;
  }
  
diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc
index f146898c7767..8ce401bb789c 100644
--- a/www/chromium/files/patch-content_child_child__process.cc
+++ b/www/chromium/files/patch-content_child_child__process.cc
@@ -1,6 +1,6 @@
---- content/child/child_process.cc.orig	2017-02-02 02:02:53 UTC
+--- content/child/child_process.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/child/child_process.cc
-@@ -103,7 +103,7 @@ void ChildProcess::ReleaseProcess() {
+@@ -122,7 +122,7 @@ void ChildProcess::ReleaseProcess() {
      main_thread_->OnProcessFinalRelease();
  }
  
diff --git a/www/chromium/files/patch-content_child_child__thread__impl.cc b/www/chromium/files/patch-content_child_child__thread__impl.cc
index f1d5ec2c7ee8..22ee4e3fb1d0 100644
--- a/www/chromium/files/patch-content_child_child__thread__impl.cc
+++ b/www/chromium/files/patch-content_child_child__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/child/child_thread_impl.cc.orig	2017-02-02 02:02:53 UTC
+--- content/child/child_thread_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/child/child_thread_impl.cc
-@@ -751,7 +751,7 @@ std::unique_ptr<base::SharedMemory> Chil
+@@ -706,7 +706,7 @@ std::unique_ptr<base::SharedMemory> Chil
    return base::MakeUnique<base::SharedMemory>(shared_buf, false);
  }
  
diff --git a/www/chromium/files/patch-content_child_child__thread__impl.h b/www/chromium/files/patch-content_child_child__thread__impl.h
index adb0b4a4954d..1cc44f289b06 100644
--- a/www/chromium/files/patch-content_child_child__thread__impl.h
+++ b/www/chromium/files/patch-content_child_child__thread__impl.h
@@ -1,8 +1,8 @@
---- content/child/child_thread_impl.h.orig	2017-02-02 02:02:53 UTC
+--- content/child/child_thread_impl.h.orig	2017-03-09 20:04:32 UTC
 +++ content/child/child_thread_impl.h
-@@ -130,7 +130,7 @@ class CONTENT_EXPORT ChildThreadImpl
-       IPC::Sender* sender,
-       bool* out_of_memory);
+@@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl
+   static std::unique_ptr<base::SharedMemory> AllocateSharedMemory(
+       size_t buf_size);
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 4f156539005d..61c01976005e 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,15 +1,15 @@
---- content/common/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/common/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/common/BUILD.gn
-@@ -500,7 +500,7 @@ source_set("common") {
-   if (use_seccomp_bpf) {
-     defines += [ "USE_SECCOMP_BPF" ]
-   } else {
+@@ -498,7 +498,7 @@ source_set("common") {
+   }
+ 
+   if (!use_seccomp_bpf) {
 -    if (is_linux) {
 +    if (is_linux || is_bsd) {
        sources -= [
          "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
          "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
-@@ -514,6 +514,15 @@ source_set("common") {
+@@ -512,6 +512,16 @@ source_set("common") {
          "sandbox_linux/bpf_utility_policy_linux.h",
          "sandbox_linux/sandbox_bpf_base_policy_linux.cc",
          "sandbox_linux/sandbox_bpf_base_policy_linux.h",
@@ -19,6 +19,7 @@
 +    }
 +    if (is_bsd) {
 +      sources -= [
++        "quarantine/quarantine_linux.cc",
 +        "sandbox_linux/sandbox_linux.cc",
 +        "sandbox_linux/sandbox_linux.h",
 +        "sandbox_linux/sandbox_init_linux.cc",
diff --git a/www/chromium/files/patch-content_common_child__process__messages.h b/www/chromium/files/patch-content_common_child__process__messages.h
index 694c11db2a58..e12b2650a41f 100644
--- a/www/chromium/files/patch-content_common_child__process__messages.h
+++ b/www/chromium/files/patch-content_common_child__process__messages.h
@@ -1,6 +1,6 @@
---- content/common/child_process_messages.h.orig	2017-02-02 02:02:53 UTC
+--- content/common/child_process_messages.h.orig	2017-03-09 20:04:32 UTC
 +++ content/common/child_process_messages.h
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
  #include "ui/gfx/ipc/gfx_param_traits.h"
  #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
  
@@ -9,7 +9,7 @@
  #include "base/threading/platform_thread.h"
  #endif
  
-@@ -70,7 +70,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects:
+@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects:
    IPC_STRUCT_TRAITS_MEMBER(process_id)
  IPC_STRUCT_TRAITS_END()
  
@@ -18,9 +18,9 @@
  IPC_ENUM_TRAITS_MAX_VALUE(base::ThreadPriority,
                            base::ThreadPriority::REALTIME_AUDIO)
  #endif
-@@ -218,7 +218,7 @@ IPC_SYNC_MESSAGE_CONTROL2_1(
- IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory,
-                      discardable_memory::DiscardableSharedMemoryId)
+@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcess
+ IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ReleaseCachedFonts)
+ #endif  // defined(OS_WIN)
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
diff --git a/www/chromium/files/patch-content_common_content__switches__internal.cc b/www/chromium/files/patch-content_common_content__switches__internal.cc
index 0d5b95f46ba6..386b50c10433 100644
--- a/www/chromium/files/patch-content_common_content__switches__internal.cc
+++ b/www/chromium/files/patch-content_common_content__switches__internal.cc
@@ -1,4 +1,4 @@
---- content/common/content_switches_internal.cc.orig	2017-02-02 02:02:53 UTC
+--- content/common/content_switches_internal.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/common/content_switches_internal.cc
 @@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable
  #endif
diff --git a/www/chromium/files/patch-content_common_view__messages.h b/www/chromium/files/patch-content_common_view__messages.h
index ef3ac1f390c4..32e5a34011b4 100644
--- a/www/chromium/files/patch-content_common_view__messages.h
+++ b/www/chromium/files/patch-content_common_view__messages.h
@@ -1,6 +1,6 @@
---- content/common/view_messages.h.orig	2017-02-02 02:02:53 UTC
+--- content/common/view_messages.h.orig	2017-03-09 20:04:32 UTC
 +++ content/common/view_messages.h
-@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere
+@@ -246,7 +246,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere
    IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
    IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video)
    IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn
index cee0ae1717f6..33d6f62fae72 100644
--- a/www/chromium/files/patch-content_gpu_BUILD.gn
+++ b/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,6 +1,6 @@
---- content/gpu/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/gpu/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/gpu/BUILD.gn
-@@ -96,6 +96,7 @@ target(link_target_type, "gpu_sources") 
+@@ -97,6 +97,7 @@ target(link_target_type, "gpu_sources") 
  
    if (use_x11) {
      deps += [ "//ui/events/platform/x11" ]
diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc
index 2146462d9b25..6e35e0a9ab3d 100644
--- a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_child_thread.cc.orig	2017-01-26 00:49:13 UTC
+--- content/gpu/gpu_child_thread.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/gpu/gpu_child_thread.cc
-@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn
+@@ -387,6 +387,7 @@ void GpuChildThread::OnCollectGraphicsIn
    if (dead_on_arrival_)
      return;
  
@@ -8,7 +8,7 @@
  #if defined(OS_WIN)
    // GPU full info collection should only happen on un-sandboxed GPU process
    // or single process/in-process gpu mode on Windows.
-@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn
+@@ -438,6 +439,7 @@ void GpuChildThread::OnCollectGraphicsIn
      base::MessageLoop::current()->QuitWhenIdle();
    }
  #endif  // OS_WIN
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 5509c75ad5c5..e89b5c69d770 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig	2017-01-26 00:49:13 UTC
+--- content/gpu/gpu_main.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/gpu/gpu_main.cc
-@@ -92,7 +92,7 @@ namespace content {
+@@ -94,7 +94,7 @@ namespace content {
  
  namespace {
  
@@ -9,7 +9,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread*);
  #elif defined(OS_WIN)
  bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*);
-@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu:
+@@ -148,7 +148,7 @@ class ContentSandboxHelper : public gpu:
  
    bool EnsureSandboxInitialized(
        gpu::GpuWatchdogThread* watchdog_thread) override {
@@ -18,7 +18,7 @@
      return StartSandboxLinux(watchdog_thread);
  #elif defined(OS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& pa
  
  namespace {
  
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index dbcc527347d4..d4f8e2e04e69 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2017-01-26 00:49:13 UTC
+--- content/public/common/content_switches.h.orig	2017-03-09 20:04:32 UTC
 +++ content/public/common/content_switches.h
-@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl
+@@ -296,7 +296,7 @@ CONTENT_EXPORT extern const char kDisabl
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
  
diff --git a/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc b/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc
deleted file mode 100644
index 781ff6e7143c..000000000000
--- a/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- content/renderer/pepper/pepper_media_device_manager.cc.orig	2017-02-02 02:02:54 UTC
-+++ content/renderer/pepper/pepper_media_device_manager.cc
-@@ -89,9 +89,9 @@ void PepperMediaDeviceManager::Enumerate
-                  callback, ToMediaDeviceType(type)));
- #else
-   base::ThreadTaskRunnerHandle::Get()->PostTask(
--      FROM_HERE,
--      base::Bind(&PepperMediaDeviceManager::DevicesEnumerated, AsWeakPtr(),
--                 callback, ToMediaDeviceType(type), MediaDeviceInfoArray()));
-+      FROM_HERE, base::Bind(&PepperMediaDeviceManager::DevicesEnumerated,
-+                            AsWeakPtr(), callback, ToMediaDeviceType(type),
-+                            std::vector<MediaDeviceInfoArray>()));
- #endif
- }
- 
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 0650a72a5dfe..d2a74cec3c4d 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2017-01-26 00:49:13 UTC
+--- content/renderer/render_thread_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -206,11 +206,13 @@
+@@ -207,11 +207,13 @@
  #include "content/common/external_ipc_dumper.h"
  #endif
  
@@ -14,7 +14,7 @@
  
  using base::ThreadRestrictions;
  using blink::WebDocument;
-@@ -1488,7 +1490,7 @@ media::GpuVideoAcceleratorFactories* Ren
+@@ -1386,7 +1388,7 @@ media::GpuVideoAcceleratorFactories* Ren
    const bool enable_video_accelerator =
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
    const bool enable_gpu_memory_buffer_video_frames =
@@ -23,7 +23,7 @@
        !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
        !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
        !gpu_channel_host->gpu_info().software_rendering;
-@@ -1846,6 +1848,8 @@ void RenderThreadImpl::RecordPurgeAndSus
+@@ -1729,6 +1731,8 @@ void RenderThreadImpl::GetRendererMemory
  #else
    size_t malloc_usage = minfo.hblkhd + minfo.arena;
  #endif
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index d80b1b8ccde7..7fa3126ae8fb 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2017-01-26 00:49:13 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
 @@ -111,7 +111,7 @@
  
@@ -9,7 +9,7 @@
  #include <map>
  #include <string>
  
-@@ -201,7 +201,7 @@ class RendererBlinkPlatformImpl::FileUti
+@@ -204,7 +204,7 @@ class RendererBlinkPlatformImpl::FileUti
    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
  };
  
@@ -18,7 +18,7 @@
  class RendererBlinkPlatformImpl::SandboxSupport
      : public blink::WebSandboxSupport {
   public:
-@@ -247,7 +247,7 @@ RendererBlinkPlatformImpl::RendererBlink
+@@ -250,7 +250,7 @@ RendererBlinkPlatformImpl::RendererBlink
        renderer_scheduler_(renderer_scheduler),
        blink_interface_provider_(
            new BlinkInterfaceProviderImpl(remote_interfaces)) {
@@ -27,7 +27,7 @@
    if (g_sandbox_enabled && sandboxEnabled()) {
      sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
    } else {
-@@ -283,7 +283,7 @@ RendererBlinkPlatformImpl::~RendererBlin
+@@ -286,7 +286,7 @@ RendererBlinkPlatformImpl::~RendererBlin
  }
  
  void RendererBlinkPlatformImpl::Shutdown() {
@@ -36,7 +36,7 @@
    // SandboxSupport contains a map of WebFontFamily objects, which hold
    // WebCStrings, which become invalidated when blink is shut down. Hence, we
    // need to clear that map now, just before blink::shutdown() is called.
-@@ -331,7 +331,7 @@ blink::WebFileUtilities* RendererBlinkPl
+@@ -334,7 +334,7 @@ blink::WebFileUtilities* RendererBlinkPl
  }
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
@@ -45,7 +45,7 @@
    // These platforms do not require sandbox support.
    return NULL;
  #else
-@@ -539,7 +539,7 @@ bool RendererBlinkPlatformImpl::SandboxS
+@@ -542,7 +542,7 @@ bool RendererBlinkPlatformImpl::SandboxS
    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
  }
  
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index 35db8480ea8d..4f10c4fb1f37 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2017-01-26 00:49:13 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2017-03-09 20:04:32 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -256,7 +256,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
+@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
    class FileUtilities;
    std::unique_ptr<FileUtilities> file_utilities_;
  
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index fe95190ac071..9bbea1f71271 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,4 +1,4 @@
---- content/shell/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/shell/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/shell/BUILD.gn
 @@ -296,7 +296,7 @@ static_library("content_shell_lib") {
      ]
@@ -9,8 +9,8 @@
      deps += [
        "//build/linux:fontconfig",
        "//ui/gfx:test_support",
-@@ -317,7 +317,7 @@ static_library("content_shell_lib") {
-     deps += [ "//content/shell/android:content_shell_jni_headers" ]
+@@ -320,7 +320,7 @@ static_library("content_shell_lib") {
+     ]
    }
  
 -  if (is_posix && !is_mac) {
@@ -18,7 +18,7 @@
      deps += [
        "//components/crash/content/app",
        "//components/crash/content/browser",
-@@ -366,7 +366,7 @@ static_library("content_shell_lib") {
+@@ -369,7 +369,7 @@ static_library("content_shell_lib") {
      ]
    }
  
@@ -27,7 +27,7 @@
      deps += [ "//third_party/freetype2" ]
    }
  
-@@ -532,7 +532,7 @@ if (is_android) {
+@@ -539,7 +539,7 @@ if (is_android) {
        }
      }
  
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 4ad68a31a910..8c34b887cde4 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2017-01-26 00:49:13 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2017-03-09 20:04:32 UTC
 +++ content/shell/browser/shell_browser_main_parts.cc
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
  #if defined(USE_AURA) && defined(USE_X11)
  #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
  #endif
@@ -9,7 +9,7 @@
  #include "ui/base/ime/input_method_initializer.h"
  #endif
  #if defined(OS_CHROMEOS)
-@@ -140,7 +140,7 @@ void ShellBrowserMainParts::PostMainMess
+@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMess
  }
  
  void ShellBrowserMainParts::PreEarlyInitialization() {
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 08c56095d601..13b6df8ccbb9 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig	2017-01-26 00:49:13 UTC
+--- content/test/BUILD.gn.orig	2017-03-09 20:04:32 UTC
 +++ content/test/BUILD.gn
-@@ -748,7 +748,7 @@ test("content_browsertests") {
+@@ -771,7 +771,7 @@ test("content_browsertests") {
      }
    }
  
@@ -9,7 +9,7 @@
      data += [
        "$root_out_dir/content_shell.pak",
        "data/",
-@@ -1350,7 +1350,7 @@ test("content_unittests") {
+@@ -1392,7 +1392,7 @@ test("content_unittests") {
      sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
    }
  
@@ -18,7 +18,7 @@
      data = [
        "$root_out_dir/content_shell.pak",
        "data/",
-@@ -1540,7 +1540,7 @@ test("content_unittests") {
+@@ -1597,7 +1597,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" ]
-@@ -1576,7 +1576,7 @@ test("content_unittests") {
-     ]
+@@ -1631,7 +1631,7 @@ test("content_unittests") {
+     }
    }
  
 -  if (is_linux) {
diff --git a/www/chromium/files/patch-device_BUILD.gn b/www/chromium/files/patch-device_BUILD.gn
index c7a22507aa4e..c23c8555cc1d 100644
--- a/www/chromium/files/patch-device_BUILD.gn
+++ b/www/chromium/files/patch-device_BUILD.gn
@@ -1,6 +1,6 @@
---- device/BUILD.gn.orig	2017-01-26 00:49:14 UTC
+--- device/BUILD.gn.orig	2017-03-09 20:04:33 UTC
 +++ device/BUILD.gn
-@@ -184,7 +184,7 @@ test("device_unittests") {
+@@ -197,7 +197,7 @@ test("device_unittests") {
      ]
    }
  
diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn
index 4c2541e6dcf8..ed64cb766af9 100644
--- a/www/chromium/files/patch-device_bluetooth_BUILD.gn
+++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn
@@ -1,6 +1,6 @@
---- device/bluetooth/BUILD.gn.orig	2017-02-02 02:02:54 UTC
+--- device/bluetooth/BUILD.gn.orig	2017-03-09 20:04:33 UTC
 +++ device/bluetooth/BUILD.gn
-@@ -193,7 +193,7 @@ component("bluetooth") {
+@@ -199,7 +199,7 @@ component("bluetooth") {
      ]
    }
  
diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
index 5840837d70a2..cd2520119bae 100644
--- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
+++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
@@ -1,6 +1,6 @@
---- device/gamepad/gamepad_provider.cc.orig	2017-02-02 02:02:54 UTC
+--- device/gamepad/gamepad_provider.cc.orig	2017-03-09 20:04:33 UTC
 +++ device/gamepad/gamepad_provider.cc
-@@ -145,7 +145,7 @@ void GamepadProvider::Initialize(std::un
+@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::un
      monitor->AddDevicesChangedObserver(this);
  
    polling_thread_.reset(new base::Thread("Gamepad polling thread"));
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc
index 5110bdc65838..d31528589965 100644
--- a/www/chromium/files/patch-device_usb_usb__service__impl.cc
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc
@@ -1,4 +1,4 @@
---- device/usb/usb_service_impl.cc.orig	2017-01-26 00:49:14 UTC
+--- device/usb/usb_service_impl.cc.orig	2017-03-09 20:04:33 UTC
 +++ device/usb/usb_service_impl.cc
 @@ -26,7 +26,11 @@
  #include "device/usb/usb_error.h"
@@ -13,24 +13,7 @@
  
  #if defined(OS_WIN)
  #include <setupapi.h>
-@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl(
-   }
-   context_ = new UsbContext(platform_context);
- 
-+#if !defined(OS_FREEBSD)
-   rv = libusb_hotplug_register_callback(
-       context_->context(),
-       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl(
-   }
- 
-   RefreshDevices();
-+#endif // !defined(OS_FREEBSD)
-+
- #if defined(OS_WIN)
-   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-   if (device_monitor) {
-@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl(
+@@ -229,8 +233,10 @@ UsbServiceImpl::UsbServiceImpl(
  }
  
  UsbServiceImpl::~UsbServiceImpl() {
@@ -41,7 +24,23 @@
    for (auto* platform_device : ignored_devices_)
      libusb_unref_device(platform_device);
  }
-@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped
+@@ -287,6 +293,7 @@ void UsbServiceImpl::OnUsbContext(scoped
+ 
+   context_ = std::move(context);
+ 
++#if !defined(OS_FREEBSD)
+   int rv = libusb_hotplug_register_callback(
+       context_->context(),
+       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
+@@ -299,6 +306,7 @@ void UsbServiceImpl::OnUsbContext(scoped
+ 
+   // This will call any enumeration callbacks queued while initializing.
+   RefreshDevices();
++#endif // !defined(OS_FREEBSD)
+ 
+ #if defined(OS_WIN)
+   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
+@@ -498,6 +506,7 @@ void UsbServiceImpl::RemoveDevice(scoped
    device->OnDisconnect();
  }
  
@@ -49,7 +48,7 @@
  // static
  int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
                                                  PlatformUsbDevice device,
-@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
+@@ -528,6 +537,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
  
    return 0;
  }
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h
index ce6bbaed0253..0ec596dcf9a5 100644
--- a/www/chromium/files/patch-device_usb_usb__service__impl.h
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.h
@@ -1,4 +1,4 @@
---- device/usb/usb_service_impl.h.orig	2017-01-26 00:49:14 UTC
+--- device/usb/usb_service_impl.h.orig	2017-03-09 20:04:33 UTC
 +++ device/usb/usb_service_impl.h
 @@ -15,7 +15,13 @@
  #include "build/build_config.h"
@@ -14,7 +14,7 @@
  
  #if defined(OS_WIN)
  #include "base/scoped_observer.h"
-@@ -70,11 +76,13 @@ class UsbServiceImpl :
+@@ -71,11 +77,13 @@ class UsbServiceImpl :
                   scoped_refptr<UsbDeviceImpl> device);
    void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
  
@@ -28,7 +28,7 @@
    // These functions release a reference to the provided platform device.
    void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
    void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
-@@ -90,7 +98,9 @@ class UsbServiceImpl :
+@@ -92,7 +100,9 @@ class UsbServiceImpl :
    // connected instead of only when a full enumeration is requested.
    // TODO(reillyg): Support this on all platforms. crbug.com/411715
    bool hotplug_enabled_ = false;
diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
index c71eed2a8d3f..d3d5936b6c63 100644
--- a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
+++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
@@ -1,16 +1,15 @@
---- extensions/browser/api/serial/serial_api.cc.orig	2017-01-26 00:49:14 UTC
+--- extensions/browser/api/serial/serial_api.cc.orig	2017-03-09 20:04:33 UTC
 +++ extensions/browser/api/serial/serial_api.cc
-@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare()
- 
+@@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare()
  void SerialGetDevicesFunction::Work() {
    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
--
+ 
 +#if !defined(OS_BSD)
    std::unique_ptr<device::SerialDeviceEnumerator> enumerator =
        device::SerialDeviceEnumerator::Create();
-   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
+   std::vector<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
    results_ = serial::GetDevices::Results::Create(
-       devices.To<std::vector<serial::DeviceInfo>>());
+       mojo::ConvertTo<std::vector<serial::DeviceInfo>>(devices));
 +#endif
  }
  
diff --git a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn
index 8a994a23df35..1b4f6c66d9b7 100644
--- a/www/chromium/files/patch-gpu_ipc_client_BUILD.gn
+++ b/www/chromium/files/patch-gpu_ipc_client_BUILD.gn
@@ -1,6 +1,6 @@
---- gpu/ipc/client/BUILD.gn.orig	2017-01-26 00:49:14 UTC
+--- gpu/ipc/client/BUILD.gn.orig	2017-03-09 20:04:33 UTC
 +++ gpu/ipc/client/BUILD.gn
-@@ -51,6 +51,7 @@ source_set("ipc_client_sources") {
+@@ -44,6 +44,7 @@ source_set("ipc_client_sources") {
    configs += [
      "//build/config/compiler:no_size_t_to_int_warning",
      "//gpu:gpu_implementation",
diff --git a/www/chromium/files/patch-gpu_ipc_service_BUILD.gn b/www/chromium/files/patch-gpu_ipc_service_BUILD.gn
index 77f7218d9b46..cf8bdd740f65 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	2017-01-26 00:49:14 UTC
+--- gpu/ipc/service/BUILD.gn.orig	2017-03-09 20:04:33 UTC
 +++ gpu/ipc/service/BUILD.gn
-@@ -104,11 +104,12 @@ target(link_target_type, "ipc_service_so
+@@ -109,11 +109,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
index 4f3dc87cf4b1..044a355f729f 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig	2017-01-26 00:49:14 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2017-03-09 20:04:33 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -75,7 +75,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
+@@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
    }
  }
  
@@ -9,7 +9,7 @@
  void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
    TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
  
-@@ -94,7 +94,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g
+@@ -95,7 +95,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g
        break;
    }
  }
@@ -18,7 +18,7 @@
  
  #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
  bool CanAccessNvidiaDeviceFile() {
-@@ -189,7 +189,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -194,7 +194,7 @@ bool GpuInit::InitializeAndStartSandbox(
    // By skipping the following code on Mac, we don't really lose anything,
    // because the basic GPU information is passed down from the host process.
    base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now();
@@ -27,7 +27,7 @@
    CollectGraphicsInfo(gpu_info_);
    if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure)
      return false;
-@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(
+@@ -211,7 +211,7 @@ bool GpuInit::InitializeAndStartSandbox(
      gpu::ApplyGpuDriverBugWorkarounds(
          gpu_info_, const_cast<base::CommandLine*>(&command_line));
    }
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
index 4aab541cb1d1..9e5a3003009a 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.h
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.h.orig	2017-01-26 00:49:15 UTC
+--- ipc/ipc_message_utils.h.orig	2017-03-09 20:04:34 UTC
 +++ ipc/ipc_message_utils.h
-@@ -210,7 +210,7 @@ struct ParamTraits<unsigned int> {
+@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> {
  //   3) Android 64 bit also has int64_t typedef'd to long.
  // Since we want to support Android 32<>64 bit IPC, as long as we don't have
  // these traits for 32 bit ARM then that'll catch any errors.
diff --git a/www/chromium/files/patch-mash_package_mash__packaged__service.cc b/www/chromium/files/patch-mash_package_mash__packaged__service.cc
index 2422ce462458..5f8421fa180b 100644
--- a/www/chromium/files/patch-mash_package_mash__packaged__service.cc
+++ b/www/chromium/files/patch-mash_package_mash__packaged__service.cc
@@ -1,15 +1,15 @@
---- mash/package/mash_packaged_service.cc.orig	2017-02-02 02:02:55 UTC
+--- mash/package/mash_packaged_service.cc.orig	2017-03-09 20:04:34 UTC
 +++ mash/package/mash_packaged_service.cc
-@@ -19,7 +19,7 @@
- #include "services/ui/public/interfaces/constants.mojom.h"
- #include "services/ui/service.h"
+@@ -29,7 +29,7 @@
+ #include "ash/touch_hud/mus/touch_hud_application.h"  // nogncheck
+ #endif
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_BSD)
  #include "components/font_service/font_service_app.h"
  #endif
  
-@@ -91,7 +91,7 @@ std::unique_ptr<service_manager::Service
+@@ -103,7 +103,7 @@ std::unique_ptr<service_manager::Service
      return base::WrapUnique(new mash::task_viewer::TaskViewer);
    if (name == "test_ime_driver")
      return base::WrapUnique(new ui::test::TestIMEApplication);
diff --git a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
index 660966f4d8ab..dba40d6c500a 100644
--- a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
+++ b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
@@ -1,6 +1,6 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2017-01-26 00:49:15 UTC
+--- media/audio/alsa/audio_manager_alsa.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/audio/alsa/audio_manager_alsa.cc
-@@ -135,7 +135,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+@@ -138,7 +138,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
    int card = -1;
  
    // Loop through the sound cards to get ALSA device hints.
@@ -10,7 +10,7 @@
      void** hints = NULL;
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
-@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
+@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
        DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
@@ -19,8 +19,8 @@
 +#endif
  }
  
- void AudioManagerAlsa::GetAlsaDevicesInfo(
-@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
+ void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
+@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
      // goes through software conversion if needed (e.g. incompatible
      // sample rate).
      // TODO(joi): Should we prefer "hw" instead?
@@ -32,7 +32,7 @@
      return strncmp(kDeviceTypeDesired,
                     device_name,
                     arraysize(kDeviceTypeDesired) - 1) == 0;
-@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
    // Loop through the sound cards.
    // Don't use snd_device_name_hint(-1,..) since there is a access violation
    // inside this ALSA API with libasound.so.2.0.0.
@@ -42,7 +42,7 @@
      int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
      if (!error) {
        for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
+@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
        DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
                      << wrapper_->StrError(error);
      }
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index 9fe0294f3122..41a4627ba13d 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig	2017-01-26 00:49:15 UTC
+--- media/audio/BUILD.gn.orig	2017-03-09 20:04:34 UTC
 +++ media/audio/BUILD.gn
-@@ -206,7 +206,7 @@ source_set("audio") {
+@@ -207,7 +207,7 @@ source_set("audio") {
      deps += [ "//media/base/android:media_jni_headers" ]
    }
  
@@ -9,7 +9,7 @@
      sources += [ "linux/audio_manager_linux.cc" ]
    }
  
-@@ -255,10 +255,12 @@ source_set("audio") {
+@@ -256,10 +256,12 @@ source_set("audio") {
        configs += [ ":libpulse" ]
      } else {
        # TODO(ajwong): Technically, this dl should go in the action.
diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc
index 1e20e66587e3..2c9571cfbd39 100644
--- a/www/chromium/files/patch-media_audio_audio__manager.cc
+++ b/www/chromium/files/patch-media_audio_audio__manager.cc
@@ -1,4 +1,4 @@
---- media/audio/audio_manager.cc.orig	2017-01-26 00:49:15 UTC
+--- media/audio/audio_manager.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/audio/audio_manager.cc
 @@ -95,7 +95,7 @@ class AudioManagerHelper : public base::
    }
@@ -18,7 +18,7 @@
    std::string app_name_;
  #endif
  
-@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging
+@@ -369,7 +369,7 @@ void AudioManager::EnableCrashKeyLogging
    g_helper.Pointer()->enable_crash_key_logging();
  }
  
diff --git a/www/chromium/files/patch-media_base_BUILD.gn b/www/chromium/files/patch-media_base_BUILD.gn
index 613a23365fee..dc04ed7be73c 100644
--- a/www/chromium/files/patch-media_base_BUILD.gn
+++ b/www/chromium/files/patch-media_base_BUILD.gn
@@ -1,6 +1,6 @@
---- media/base/BUILD.gn.orig	2017-01-26 00:49:15 UTC
+--- media/base/BUILD.gn.orig	2017-03-09 20:04:34 UTC
 +++ media/base/BUILD.gn
-@@ -309,7 +309,7 @@ target(link_target_type, "base") {
+@@ -311,7 +311,7 @@ target(link_target_type, "base") {
      allow_circular_includes_from += [ "//media/base/android" ]
    }
  
@@ -9,7 +9,7 @@
      configs += [
        "//build/config/linux:x11",
        "//build/config/linux:xext",
-@@ -345,7 +345,7 @@ target(link_target_type, "base") {
+@@ -347,7 +347,7 @@ target(link_target_type, "base") {
      deps += [ ":media_yasm" ]
    }
  
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 20ffe5faa928..59ba49a03366 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2017-02-02 02:02:55 UTC
+--- media/base/video_frame.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/base/video_frame.cc
 @@ -53,7 +53,7 @@ static std::string StorageTypeToString(
        return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -323,7 +323,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
+@@ -324,7 +324,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
    return frame;
  }
  
@@ -27,7 +27,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      VideoPixelFormat format,
-@@ -435,7 +435,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
+@@ -436,7 +436,7 @@ scoped_refptr<VideoFrame> VideoFrame::Wr
      wrapping_frame->data_[i] = frame->data(i);
    }
  
@@ -36,7 +36,7 @@
    // If there are any |dmabuf_fds_| plugged in, we should duplicate them.
    if (frame->storage_type() == STORAGE_DMABUFS) {
      std::vector<int> original_fds;
-@@ -720,7 +720,7 @@ size_t VideoFrame::shared_memory_offset(
+@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset(
    return shared_memory_offset_;
  }
  
diff --git a/www/chromium/files/patch-media_capture_BUILD.gn b/www/chromium/files/patch-media_capture_BUILD.gn
index 06b5a73c85e7..971750616887 100644
--- a/www/chromium/files/patch-media_capture_BUILD.gn
+++ b/www/chromium/files/patch-media_capture_BUILD.gn
@@ -1,6 +1,6 @@
---- media/capture/BUILD.gn.orig	2017-01-26 00:49:15 UTC
+--- media/capture/BUILD.gn.orig	2017-03-09 20:04:34 UTC
 +++ media/capture/BUILD.gn
-@@ -127,6 +127,16 @@ component("capture") {
+@@ -135,6 +135,16 @@ component("capture") {
      ]
    }
  
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index b82e0df36270..72a0cb33c1ff 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,16 +1,17 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2017-01-26 00:49:15 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -4,7 +4,9 @@
+@@ -4,8 +4,10 @@
  
  #include "media/capture/video/linux/v4l2_capture_delegate.h"
  
 +#if !defined(OS_BSD)
  #include <linux/version.h>
+ #include <linux/videodev2.h>
 +#endif
  #include <poll.h>
  #include <sys/fcntl.h>
  #include <sys/ioctl.h>
-@@ -20,10 +22,10 @@
+@@ -21,10 +23,10 @@
  #include "media/capture/video/blob_utils.h"
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
index 45188576d681..f88eb5e76784 100644
--- a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2017-01-26 00:49:15 UTC
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/capture/video/linux/video_capture_device_linux.cc
 @@ -21,6 +21,7 @@
  
@@ -24,9 +24,9 @@
  void VideoCaptureDeviceLinux::AllocateAndStart(
      const VideoCaptureParams& params,
      std::unique_ptr<VideoCaptureDevice::Client> client) {
-@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn
-                  params.requested_format.frame_size.height(),
-                  params.requested_format.frame_rate, base::Passed(&client)));
+@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+     v4l2_thread_.task_runner()->PostTask(FROM_HERE, request);
+   photo_requests_queue_.clear();
  }
 +#else // !defined(OS_FREEBSD)
 +void VideoCaptureDeviceLinux::AllocateAndStart(
@@ -38,9 +38,9 @@
  void VideoCaptureDeviceLinux::StopAndDeAllocate() {
    if (!v4l2_thread_.IsRunning())
      return;  // Wrong state.
-@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
-       base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_,
-                  base::Passed(&settings), base::Passed(&callback)));
+@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp
+   }
+   v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor));
  }
 +#else // !defined(OS_FREEBSD)
 +void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
@@ -50,7 +50,7 @@
  void VideoCaptureDeviceLinux::SetRotation(int rotation) {
    if (v4l2_thread_.IsRunning()) {
      v4l2_thread_.task_runner()->PostTask(
-@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotatio
          base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
    }
  }
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
index beb144f4d44d..816c1995579c 100644
--- 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
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig	2017-01-26 00:49:15 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/capture/video/video_capture_device_client.cc
-@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin
+@@ -220,7 +220,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
diff --git a/www/chromium/files/patch-media_cast_BUILD.gn b/www/chromium/files/patch-media_cast_BUILD.gn
index a7731a61f341..383281c50daa 100644
--- a/www/chromium/files/patch-media_cast_BUILD.gn
+++ b/www/chromium/files/patch-media_cast_BUILD.gn
@@ -1,6 +1,6 @@
---- media/cast/BUILD.gn.orig	2017-01-26 00:49:15 UTC
+--- media/cast/BUILD.gn.orig	2017-03-09 20:04:34 UTC
 +++ media/cast/BUILD.gn
-@@ -356,7 +356,7 @@ test("cast_unittests") {
+@@ -358,7 +358,7 @@ test("cast_unittests") {
    }
  }
  
@@ -9,7 +9,7 @@
    # This is a target for the collection of cast development tools.  They are
    # not built/linked into the Chromium browser.
    group("testing_tools") {
-@@ -410,7 +410,7 @@ if (is_win || is_mac || (is_linux && !is
+@@ -412,7 +412,7 @@ if (is_win || is_mac || (is_linux && !is
        "//ui/gfx/geometry",
      ]
  
@@ -18,7 +18,7 @@
        sources += [
          "test/linux_output_window.cc",
          "test/linux_output_window.h",
-@@ -513,7 +513,7 @@ if (is_win || is_mac || (is_linux && !is
+@@ -515,7 +515,7 @@ if (is_win || is_mac || (is_linux && !is
    }
  }
  
diff --git a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
index 78486f2affaf..d015745ca9e7 100644
--- a/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
+++ b/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc
@@ -1,6 +1,6 @@
---- media/filters/ffmpeg_demuxer.cc.orig	2017-01-26 00:49:15 UTC
+--- media/filters/ffmpeg_demuxer.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/filters/ffmpeg_demuxer.cc
-@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
+@@ -1195,24 +1195,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
    // If no estimate is found, the stream entry will be kInfiniteDuration.
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                      kInfiniteDuration);
diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
index c566c596118f..a783be4231ea 100644
--- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
@@ -1,6 +1,6 @@
---- media/formats/mp2t/es_parser_adts.cc.orig	2017-01-26 00:49:15 UTC
+--- media/formats/mp2t/es_parser_adts.cc.orig	2017-03-09 20:04:34 UTC
 +++ media/formats/mp2t/es_parser_adts.cc
-@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
    const uint8_t* es;
    es_queue_->Peek(&es, &es_size);
  
@@ -15,7 +15,7 @@
      const uint8_t* cur_buf = &es[offset];
      if (!isAdtsSyncWord(cur_buf))
        continue;
-@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
      return true;
    }
  
diff --git a/www/chromium/files/patch-mojo_edk_test_BUILD.gn b/www/chromium/files/patch-mojo_edk_test_BUILD.gn
index e1b2450ab0c8..bf2a989a0afc 100644
--- a/www/chromium/files/patch-mojo_edk_test_BUILD.gn
+++ b/www/chromium/files/patch-mojo_edk_test_BUILD.gn
@@ -1,6 +1,6 @@
---- mojo/edk/test/BUILD.gn.orig	2017-01-26 00:49:15 UTC
+--- mojo/edk/test/BUILD.gn.orig	2017-03-09 20:04:34 UTC
 +++ mojo/edk/test/BUILD.gn
-@@ -48,7 +48,7 @@ source_set("run_all_unittests") {
+@@ -46,7 +46,7 @@ source_set("run_all_unittests") {
      "//testing/gtest",
    ]
  
@@ -9,7 +9,7 @@
      public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
    }
  }
-@@ -68,7 +68,7 @@ source_set("run_all_perftests") {
+@@ -66,7 +66,7 @@ source_set("run_all_perftests") {
      "run_all_perftests.cc",
    ]
  
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 6f77c842a329..1550b8a60b3a 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2017-02-02 02:02:56 UTC
+--- net/BUILD.gn.orig	2017-03-09 20:04:35 UTC
 +++ net/BUILD.gn
 @@ -82,7 +82,7 @@ if (use_glib && use_gconf && !is_chromeo
    net_configs += [ "//build/config/linux/gconf" ]
@@ -9,24 +9,14 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -153,6 +153,11 @@ component("net") {
-       ]
-       if (is_android) {
-         sources -= [ "base/openssl_private_key_store_android.cc" ]
-+      } else if (is_bsd) {
-+        sources -= [
-+          "base/address_tracker_linux.cc",
-+          "base/address_tracker_linux.h",
-+        ]
-       }
-     } else {
-       if (is_android) {
-@@ -278,6 +283,14 @@ component("net") {
+@@ -281,6 +281,16 @@ component("net") {
        sources -= [ "disk_cache/blockfile/file_posix.cc" ]
      }
  
 +    if (is_bsd) {
 +      sources -= [
++         "base/address_tracker_linux.cc",
++         "base/address_tracker_linux.h",
 +         "base/network_change_notifier_linux.cc",
 +         "base/network_change_notifier_linux.h",
 +         "base/network_interfaces_linux.cc",
@@ -36,7 +26,7 @@
      if (is_ios || is_mac) {
        sources += gypi_values.net_base_mac_ios_sources
      }
-@@ -966,7 +979,7 @@ if (!is_ios && !is_android) {
+@@ -962,7 +972,7 @@ if (!is_ios && !is_android) {
    }
  }
  
@@ -45,7 +35,7 @@
    executable("cachetool") {
      testonly = true
      sources = [
-@@ -995,7 +1008,7 @@ if (is_linux || is_mac) {
+@@ -991,7 +1001,7 @@ if (is_linux || is_mac) {
    }
  }
  
@@ -54,7 +44,7 @@
    static_library("epoll_server") {
      sources = [
        "tools/epoll_server/epoll_server.cc",
-@@ -1098,7 +1111,7 @@ if (is_android) {
+@@ -1095,7 +1105,7 @@ if (is_android) {
    }
  }
  
@@ -63,7 +53,7 @@
    executable("disk_cache_memory_test") {
      testonly = true
      sources = [
-@@ -1276,7 +1289,7 @@ test("net_unittests") {
+@@ -1276,7 +1286,7 @@ test("net_unittests") {
      "third_party/nist-pkits/",
    ]
  
@@ -72,7 +62,7 @@
      deps += [
        "//third_party/pyftpdlib/",
        "//third_party/pywebsocket/",
-@@ -1299,7 +1312,7 @@ test("net_unittests") {
+@@ -1299,7 +1309,7 @@ test("net_unittests") {
    if (is_desktop_linux) {
      deps += [ ":epoll_quic_tools" ]
    }
@@ -81,7 +71,7 @@
      sources += gypi_values.net_linux_test_sources
      deps += [
        ":epoll_quic_tools",
-@@ -1319,6 +1332,12 @@ test("net_unittests") {
+@@ -1319,6 +1329,12 @@ test("net_unittests") {
      sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
    }
  
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index 24482d4c7a96..649307c8a868 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,13 +1,13 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2017-01-26 00:49:16 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig	2017-03-09 20:04:35 UTC
 +++ net/http/http_auth_gssapi_posix.cc
 @@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:
      static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
-       "/System/Library/Frameworks/Kerberos.framework/Kerberos"
+       "/System/Library/Frameworks/GSS.framework/GSS"
 -#elif defined(OS_OPENBSD)
 -      "libgssapi.so"          // Heimdal - OpenBSD
 +#elif defined(OS_BSD)
-+      "libgssapi.so"          // Heimdal - OpenBSD / FreeBSD
++      "libgssapi.so"          // Heimdal - OpenBSD, FreeBSD
  #else
        "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
        "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/chromium/files/patch-net_http_http__network__session.cc b/www/chromium/files/patch-net_http_http__network__session.cc
index cfcb720d4977..cdefb6d6eb7b 100644
--- a/www/chromium/files/patch-net_http_http__network__session.cc
+++ b/www/chromium/files/patch-net_http_http__network__session.cc
@@ -1,9 +1,9 @@
---- net/http/http_network_session.cc.orig	2017-01-26 00:49:16 UTC
+--- net/http/http_network_session.cc.orig	2017-03-09 20:04:35 UTC
 +++ net/http/http_network_session.cc
-@@ -17,7 +17,9 @@
- #include "base/strings/string_util.h"
+@@ -20,7 +20,9 @@
+ #include "base/trace_event/process_memory_dump.h"
  #include "base/values.h"
- #include "net/base/network_throttle_manager.h"
+ #include "net/base/network_throttle_manager_impl.h"
 +#if defined(USE_KERBEROS)
  #include "net/http/http_auth_handler_factory.h"
 +#endif
diff --git a/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
new file mode 100644
index 000000000000..cf4cdf0d1072
--- /dev/null
+++ b/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc
@@ -0,0 +1,10 @@
+--- net/quic/platform/impl/quic_ip_address_impl.cc.orig	2017-03-09 20:04:35 UTC
++++ net/quic/platform/impl/quic_ip_address_impl.cc
+@@ -12,6 +12,7 @@
+ #include <ws2bth.h>
+ #elif defined(OS_POSIX)
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #endif
+ 
+ using std::string;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index 0809ef1db0ff..0cb815cb0468 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig	2017-01-26 00:49:16 UTC
+--- net/socket/udp_socket_posix.cc.orig	2017-03-09 20:04:35 UTC
 +++ net/socket/udp_socket_posix.cc
-@@ -58,7 +58,7 @@ const int kBindRetries = 10;
+@@ -59,7 +59,7 @@ const int kBindRetries = 10;
  const int kPortStart = 1024;
  const int kPortEnd = 65535;
  
@@ -9,7 +9,7 @@
  
  // Returns IPv4 address in network order.
  int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) {
-@@ -762,7 +762,7 @@ int UDPSocketPosix::SetMulticastOptions(
+@@ -763,7 +763,7 @@ int UDPSocketPosix::SetMulticastOptions(
    if (multicast_interface_ != 0) {
      switch (addr_family_) {
        case AF_INET: {
@@ -18,7 +18,7 @@
          ip_mreqn mreq;
          mreq.imr_ifindex = multicast_interface_;
          mreq.imr_address.s_addr = htonl(INADDR_ANY);
-@@ -837,7 +837,7 @@ int UDPSocketPosix::JoinGroup(const IPAd
+@@ -838,7 +838,7 @@ int UDPSocketPosix::JoinGroup(const IPAd
        if (addr_family_ != AF_INET)
          return ERR_ADDRESS_INVALID;
  
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
index 1c7b9fddb980..fb1f446823eb 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc
@@ -1,6 +1,6 @@
---- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig	2017-02-02 02:02:56 UTC
+--- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig	2017-03-09 20:04:35 UTC
 +++ net/tools/cert_verify_tool/verify_using_path_builder.cc
-@@ -29,7 +29,7 @@
+@@ -33,7 +33,7 @@
  #include "net/cert/internal/trust_store_nss.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "net/proxy/proxy_config.h"
  #include "net/proxy/proxy_config_service_fixed.h"
  #endif
-@@ -226,7 +226,7 @@ bool VerifyUsingPathBuilder(
+@@ -179,7 +179,7 @@ void SetUpOnNetworkThread(std::unique_pt
    // (similar to VERIFY_CERT_IO_ENABLED flag for CertVerifyProc).
    net::URLRequestContextBuilder url_request_context_builder;
    url_request_context_builder.set_user_agent(GetUserAgent());
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index 29a00a2f4d8d..cb8b4afa79e3 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2017-01-26 00:49:16 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2017-03-09 20:04:35 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -127,7 +127,7 @@ std::vector<uint32_t> GetPageNumbersFrom
+@@ -129,7 +129,7 @@ std::vector<uint32_t> GetPageNumbersFrom
    return page_numbers;
  }
  
@@ -9,7 +9,7 @@
  
  PP_Instance g_last_instance_id;
  
-@@ -629,7 +629,7 @@ bool InitializeSDK() {
+@@ -642,7 +642,7 @@ bool InitializeSDK() {
    config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
    FPDF_InitLibraryWithConfig(&config);
  
@@ -18,7 +18,7 @@
    // Font loading doesn't work in the renderer sandbox in Linux.
    FPDF_SetSystemFontInfo(&g_font_info);
  #else
-@@ -654,7 +654,7 @@ bool InitializeSDK() {
+@@ -667,7 +667,7 @@ bool InitializeSDK() {
  
  void ShutdownSDK() {
    FPDF_DestroyLibrary();
@@ -27,7 +27,7 @@
    delete g_font_info;
  #endif
    TearDownV8();
-@@ -758,7 +758,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
+@@ -772,7 +772,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
    IFSDK_PAUSE::user = nullptr;
    IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
  
@@ -36,7 +36,7 @@
    // PreviewModeClient does not know its pp::Instance.
    pp::Instance* instance = client_->GetPluginInstance();
    if (instance)
-@@ -1510,7 +1510,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
+@@ -1513,7 +1513,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
      FPDF_ClosePage(pdf_page);
    }
  
@@ -45,7 +45,7 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int pro
+@@ -2936,7 +2936,7 @@ bool PDFiumEngine::ContinuePaint(int pro
    DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
    DCHECK(image_data);
  
@@ -54,7 +54,7 @@
    g_last_instance_id = client_->GetPluginInstance()->pp_instance();
  #endif
  
-@@ -3377,7 +3377,7 @@ void PDFiumEngine::SetCurrentPage(int in
+@@ -3394,7 +3394,7 @@ void PDFiumEngine::SetCurrentPage(int in
      FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
    }
    most_visible_page_ = index;
diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn
index 266028c1967c..65262b263bfe 100644
--- a/www/chromium/files/patch-printing_BUILD.gn
+++ b/www/chromium/files/patch-printing_BUILD.gn
@@ -1,6 +1,6 @@
---- printing/BUILD.gn.orig	2017-01-26 00:49:17 UTC
+--- printing/BUILD.gn.orig	2017-03-09 20:04:35 UTC
 +++ printing/BUILD.gn
-@@ -129,7 +129,7 @@ component("printing") {
+@@ -137,7 +137,7 @@ component("printing") {
    if (use_cups) {
      configs += [ ":cups" ]
  
@@ -9,7 +9,7 @@
        # rebase_path does not accept an empty string
        if (use_sysroot) {
          cups_sysroot = rebase_path(sysroot)
-@@ -206,7 +206,7 @@ component("printing") {
+@@ -214,7 +214,7 @@ component("printing") {
        "printing_context_no_system_dialog.cc",
        "printing_context_no_system_dialog.h",
      ]
diff --git a/www/chromium/files/patch-remoting_host_BUILD.gn b/www/chromium/files/patch-remoting_host_BUILD.gn
index 614e5720d9f3..f0fa0c38503b 100644
--- a/www/chromium/files/patch-remoting_host_BUILD.gn
+++ b/www/chromium/files/patch-remoting_host_BUILD.gn
@@ -1,6 +1,6 @@
---- remoting/host/BUILD.gn.orig	2017-01-26 00:49:17 UTC
+--- remoting/host/BUILD.gn.orig	2017-03-09 20:04:35 UTC
 +++ remoting/host/BUILD.gn
-@@ -326,7 +326,7 @@ static_library("host") {
+@@ -329,7 +329,7 @@ static_library("host") {
      deps += [ "//components/policy:generated" ]
    }
  
@@ -9,7 +9,7 @@
      libs += [ "pam" ]
    }
  
-@@ -349,7 +349,7 @@ static_library("host") {
+@@ -348,7 +348,7 @@ static_library("host") {
        "input_injector_x11.cc",
        "local_input_monitor_x11.cc",
      ]
@@ -27,16 +27,16 @@
      sources -= [ "linux/unicode_to_keysym_unittest.cc" ]
    }
    if (use_ozone || is_chromeos) {
-@@ -755,7 +755,7 @@ if (enable_me2me_host) {
-         deps += [ "//build/config/linux/gtk2" ]
-       }
+@@ -750,7 +750,7 @@ if (enable_me2me_host) {
+     if (is_desktop_linux) {
+       deps += [ "//build/config/linux/gtk" ]
      }
 -    if ((is_linux && !is_chromeos) || is_mac) {
 +    if ((is_linux && !is_chromeos) || is_mac || is_bsd) {
        libs = [ "pam" ]
      }
  
-@@ -825,7 +825,7 @@ if (enable_me2me_host) {
+@@ -820,7 +820,7 @@ if (enable_me2me_host) {
        }
      }
    }
diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni
new file mode 100644
index 000000000000..6d98e072fc37
--- /dev/null
+++ b/www/chromium/files/patch-sandbox_features.gni
@@ -0,0 +1,10 @@
+--- sandbox/features.gni.orig	2017-03-09 20:04:36 UTC
++++ sandbox/features.gni
+@@ -11,6 +11,6 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf =
+     (is_linux || is_android) &&
+     (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
+-     current_cpu == "arm64" || current_cpu == "mipsel")
++     current_cpu == "arm64" || current_cpu == "mipsel") && !is_bsd
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
new file mode 100644
index 000000000000..8b93175527e4
--- /dev/null
+++ b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
@@ -0,0 +1,11 @@
+--- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig	2017-03-09 20:04:36 UTC
++++ services/service_manager/public/cpp/standalone_service/BUILD.gn
+@@ -23,7 +23,7 @@ source_set("standalone_service") {
+     "//services/service_manager/public/interfaces",
+   ]
+ 
+-  if (is_linux && !is_android) {
++  if (is_linux && !is_android && !is_bsd) {
+     sources += [
+       "linux_sandbox.cc",
+       "linux_sandbox.h",
diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
new file mode 100644
index 000000000000..f67f58ae2a2c
--- /dev/null
+++ b/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
@@ -0,0 +1,11 @@
+--- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig	2017-03-09 20:04:36 UTC
++++ services/service_manager/public/cpp/standalone_service/standalone_service.cc
+@@ -70,6 +70,8 @@ void RunStandaloneService(const Standalo
+       *base::CommandLine::ForCurrentProcess();
+   if (command_line.HasSwitch(switches::kEnableSandbox))
+     sandbox = InitializeSandbox();
++#elif defined(OS_BSD)
++  NOTIMPLEMENTED();
+ #endif
+ 
+   mojo::edk::Init();
diff --git a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
index 1db91982967c..003707d29f12 100644
--- a/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
+++ b/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
@@ -1,11 +1,11 @@
---- services/service_manager/runner/host/BUILD.gn.orig	2017-01-26 00:49:17 UTC
+--- services/service_manager/runner/host/BUILD.gn.orig	2017-03-09 20:04:36 UTC
 +++ services/service_manager/runner/host/BUILD.gn
-@@ -51,7 +51,7 @@ source_set("child_process_base") {
-     "//services/service_manager/runner/common",
+@@ -28,7 +28,7 @@ source_set("lib") {
+     "//mojo/public/cpp/system",
    ]
  
 -  if (is_linux && !is_android) {
 +  if (is_linux && !is_android && !is_bsd) {
-     sources += [
-       "linux_sandbox.cc",
-       "linux_sandbox.h",
+     deps += [ "//sandbox/linux:sandbox_services" ]
+   }
+ }
diff --git a/www/chromium/files/patch-services_service__manager_standalone_context.cc b/www/chromium/files/patch-services_service__manager_standalone_context.cc
index 599833393aa5..975ef5ecf117 100644
--- a/www/chromium/files/patch-services_service__manager_standalone_context.cc
+++ b/www/chromium/files/patch-services_service__manager_standalone_context.cc
@@ -1,9 +1,9 @@
---- services/service_manager/standalone/context.cc.orig	2017-01-26 00:49:17 UTC
+--- services/service_manager/standalone/context.cc.orig	2017-03-09 20:04:36 UTC
 +++ services/service_manager/standalone/context.cc
-@@ -208,7 +208,7 @@ void Context::Init(std::unique_ptr<InitP
+@@ -218,7 +218,7 @@ void Context::Init(std::unique_ptr<InitP
        tracing::mojom::StartupPerformanceDataCollectorPtr collector;
-       ConnectToInterface(service_manager(), source_identity, tracing_identity,
-                          &collector);
+       BindInterface(service_manager(), source_identity, tracing_identity,
+                     &collector);
 -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
        // CurrentProcessInfo::CreationTime is only defined on some platforms.
diff --git a/www/chromium/files/patch-services_ui_BUILD.gn b/www/chromium/files/patch-services_ui_BUILD.gn
index 821eb5ce8d24..067d382168b0 100644
--- a/www/chromium/files/patch-services_ui_BUILD.gn
+++ b/www/chromium/files/patch-services_ui_BUILD.gn
@@ -1,4 +1,4 @@
---- services/ui/BUILD.gn.orig	2017-01-26 00:49:17 UTC
+--- services/ui/BUILD.gn.orig	2017-03-09 20:04:36 UTC
 +++ services/ui/BUILD.gn
 @@ -13,7 +13,6 @@ group("all") {
    testonly = true
@@ -8,11 +8,20 @@
      "//services/ui/test_wm",
    ]
  }
-@@ -38,7 +37,6 @@ service("ui") {
- 
+@@ -36,7 +35,6 @@ service("ui") {
    data_deps = [
+     ":copy_gl_libraries",
      ":manifest",
 -    "//services/ui/ime/test_ime_driver",
    ]
  
    resources = [
+@@ -67,7 +65,7 @@ copy("copy_gl_libraries") {
+       "$root_shlib_dir/libGLESv2.dll",
+       "$root_shlib_dir/osmesa.dll",
+     ]
+-  } else if (is_android || is_linux) {
++  } else if (is_android || is_linux || is_bsd) {
+     sources = [
+       "$root_shlib_dir/libosmesa.so",
+     ]
diff --git a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc
index a2812d839f2f..f8e0c74d2237 100644
--- a/www/chromium/files/patch-services_ui_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-services_ui_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- services/ui/gpu/gpu_main.cc.orig	2017-02-02 02:02:57 UTC
+--- services/ui/gpu/gpu_main.cc.orig	2017-03-09 20:04:36 UTC
 +++ services/ui/gpu/gpu_main.cc
-@@ -50,7 +50,7 @@ GpuMain::GpuMain()
+@@ -52,7 +52,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r
    thread_options.message_pump_factory = base::Bind(&CreateMessagePumpX11);
  #elif defined(USE_OZONE)
    thread_options.message_loop_type = base::MessageLoop::TYPE_UI;
diff --git a/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc b/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc
deleted file mode 100644
index 6a5222ecdb6d..000000000000
--- a/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/ui/public/cpp/gles2_context.cc.orig	2017-02-02 02:02:57 UTC
-+++ services/ui/public/cpp/gles2_context.cc
-@@ -46,7 +46,7 @@ bool GLES2Context::Initialize(
-   gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get();
-   gpu::GpuControl* gpu_control = command_buffer_proxy_impl_.get();
- 
--  constexpr gpu::SharedMemoryLimits default_limits;
-+  constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits();
-   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
-   if (!gles2_helper_->Initialize(default_limits.command_buffer_size))
-     return false;
diff --git a/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc b/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc
deleted file mode 100644
index 37cb9cb92e08..000000000000
--- a/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/ui/surfaces/surfaces_context_provider.cc.orig	2017-02-02 02:02:57 UTC
-+++ services/ui/surfaces/surfaces_context_provider.cc
-@@ -78,7 +78,7 @@ bool SurfacesContextProvider::BindToCurr
-   gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get();
- 
-   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
--  constexpr gpu::SharedMemoryLimits default_limits;
-+  constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits();
-   if (!gles2_helper_->Initialize(default_limits.command_buffer_size))
-     return false;
-   gles2_helper_->SetAutomaticFlushes(false);
diff --git a/www/chromium/files/patch-skia_BUILD.gn b/www/chromium/files/patch-skia_BUILD.gn
index c2d845f94577..d2b4ff49ca82 100644
--- a/www/chromium/files/patch-skia_BUILD.gn
+++ b/www/chromium/files/patch-skia_BUILD.gn
@@ -1,6 +1,6 @@
---- skia/BUILD.gn.orig	2017-01-26 00:49:17 UTC
+--- skia/BUILD.gn.orig	2017-03-09 20:04:36 UTC
 +++ skia/BUILD.gn
-@@ -135,7 +135,7 @@ config("skia_library_config") {
+@@ -124,7 +124,7 @@ config("skia_library_config") {
    }
  
    # Settings for text blitting, chosen to approximate the system browser.
@@ -9,7 +9,7 @@
      defines += [
        "SK_GAMMA_EXPONENT=1.2",
        "SK_GAMMA_CONTRAST=0.2",
-@@ -363,7 +363,7 @@ component("skia") {
+@@ -340,7 +340,7 @@ component("skia") {
      sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
    }
  
@@ -18,15 +18,7 @@
      sources -= [
        "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
        "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-@@ -375,14 +375,14 @@ component("skia") {
- 
-   # Add the files for the SkFontMgr_Android. This is used to emulate android
-   # fonts on linux. See content/zygote/zygote_main_linux.cc
--  if (is_linux) {
-+  if (is_linux || is_bsd) {
-     sources += [
-       "//third_party/skia/src/ports/SkFontMgr_android.cpp",
-       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
+@@ -349,7 +349,7 @@ component("skia") {
      ]
    }
  
@@ -35,7 +27,7 @@
      sources -= [
        "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
        "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-@@ -421,7 +421,7 @@ component("skia") {
+@@ -387,7 +387,7 @@ component("skia") {
      "//base/third_party/dynamic_annotations",
    ]
  
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
index f5ed0af477a4..db60690b1d88 100644
--- 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
@@ -1,6 +1,6 @@
---- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/core/layout/BUILD.gn.orig	2017-03-09 20:04:45 UTC
 +++ third_party/WebKit/Source/core/layout/BUILD.gn
-@@ -361,7 +361,7 @@ blink_core_sources("layout") {
+@@ -368,7 +368,7 @@ blink_core_sources("layout") {
      sources += [ "LayoutThemeFontProviderDefault.cpp" ]
    }
  
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 befb99ad30a2..170e6ce126fe 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,4 +1,4 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2017-03-09 20:04:45 UTC
 +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
 @@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const
        m_syntheticBold(source.m_syntheticBold),
@@ -17,7 +17,7 @@
 +#if OS(LINUX) || OS(ANDROID) || OS(BSD)
        m_style(FontRenderStyle::querySystem(m_family,
                                             m_textSize,
-                                            m_typeface->style())),
+                                            m_typeface->fontStyle())),
 @@ -155,7 +155,7 @@ FontPlatformData::FontPlatformData(sk_sp
        m_syntheticBold(syntheticBold),
        m_syntheticItalic(syntheticItalic),
@@ -26,7 +26,7 @@
 +#if OS(LINUX) || OS(ANDROID) | OS(BSD)
        m_style(FontRenderStyle::querySystem(m_family,
                                             m_textSize,
-                                            m_typeface->style())),
+                                            m_typeface->fontStyle())),
 @@ -200,7 +200,7 @@ const FontPlatformData& FontPlatformData
    m_syntheticItalic = other.m_syntheticItalic;
    m_harfBuzzFace = nullptr;
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 df2089af91f2..417e9df8a376 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,4 +1,4 @@
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2017-03-09 20:04:45 UTC
 +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h
 @@ -47,9 +47,9 @@
  #include "wtf/text/CString.h"
@@ -12,7 +12,7 @@
  
  #if OS(MACOSX)
  OBJC_CLASS NSFont;
-@@ -149,7 +149,7 @@ class PLATFORM_EXPORT FontPlatformData {
+@@ -151,7 +151,7 @@ class PLATFORM_EXPORT FontPlatformData {
    PassRefPtr<OpenTypeVerticalData> verticalData() const;
    PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
  
@@ -21,7 +21,7 @@
    // The returned styles are all actual styles without
    // FontRenderStyle::NoPreference.
    const FontRenderStyle& getFontRenderStyle() const { return m_style; }
-@@ -177,7 +177,7 @@ class PLATFORM_EXPORT FontPlatformData {
+@@ -179,7 +179,7 @@ class PLATFORM_EXPORT FontPlatformData {
    FontOrientation m_orientation;
  
   private:
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 2346c9701429..88259375b1af 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	2017-02-02 02:03:10 UTC
+--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2017-03-09 20:04:45 UTC
 +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
-@@ -67,7 +67,7 @@ AtomicString toAtomicString(const SkStri
+@@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri
    return AtomicString::fromUTF8(str.c_str(), str.size());
  }
  
@@ -9,7 +9,7 @@
  // Android special locale for retrieving the color emoji font
  // based on the proposed changes in UTR #51 for introducing
  // an Emoji script code:
-@@ -234,7 +234,7 @@ sk_sp<SkTypeface> FontCache::createTypef
+@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::createTypef
    }
  #endif
  
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
index f68b1602ea66..e13608cfb71d 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
@@ -1,8 +1,8 @@
---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2017-03-09 20:04:45 UTC
 +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-@@ -6,6 +6,8 @@
- 
+@@ -7,6 +7,8 @@
  #include "public/platform/Platform.h"
+ #include "wtf/StackUtil.h"
  
 +#include <pthread_np.h>
 +
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 4c25606135a9..d659e3f41627 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,6 +1,6 @@
---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig	2017-03-09 20:04:46 UTC
 +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp
-@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex
+@@ -155,7 +155,7 @@ class PopupMenuImpl::ItemIterationContex
          m_isInGroup(false),
          m_buffer(buffer) {
      DCHECK(m_buffer);
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
index 7349db4a5077..3313be6ab482 100644
--- a/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/WebKit/Source/wtf/BUILD.gn.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/wtf/BUILD.gn.orig	2017-03-09 20:04:46 UTC
 +++ third_party/WebKit/Source/wtf/BUILD.gn
-@@ -284,6 +284,10 @@ component("wtf") {
+@@ -280,6 +280,10 @@ component("wtf") {
      libs = [ "dl" ]
    }
  
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp
new file mode 100644
index 000000000000..af56209ca37c
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_StackUtil.cpp
@@ -0,0 +1,13 @@
+--- third_party/WebKit/Source/wtf/StackUtil.cpp.orig	2017-03-09 20:04:46 UTC
++++ third_party/WebKit/Source/wtf/StackUtil.cpp
+@@ -8,6 +8,10 @@
+ #include "wtf/Threading.h"
+ #include "wtf/WTFThreadData.h"
+ 
++#if OS(FREEBSD)
++#include <pthread_np.h>
++#endif
++
+ #if OS(WIN)
+ #include <stddef.h>
+ #include <windows.h>
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ThreadingPthreads.cpp
index 88874b77592d..b56cc76de46b 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,4 +1,4 @@
---- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2017-01-26 00:49:28 UTC
+--- third_party/WebKit/Source/wtf/ThreadingPthreads.cpp.orig	2017-03-09 20:04:46 UTC
 +++ third_party/WebKit/Source/wtf/ThreadingPthreads.cpp
 @@ -49,11 +49,15 @@
  #include <objc/objc-auto.h>
@@ -18,7 +18,7 @@
  #include <unistd.h>
  #endif
  
-@@ -91,6 +95,8 @@ ThreadIdentifier currentThread() {
+@@ -66,6 +70,8 @@ ThreadIdentifier currentThreadSyscall() 
    return pthread_mach_thread_np(pthread_self());
  #elif OS(LINUX)
    return syscall(__NR_gettid);
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 6939f4bbfb6c..a7f1e053523b 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/angle/BUILD.gn.orig	2017-01-26 00:50:09 UTC
+--- third_party/angle/BUILD.gn.orig	2017-03-09 20:05:21 UTC
 +++ third_party/angle/BUILD.gn
 @@ -16,6 +16,12 @@ if (ozone_platform_gbm) {
    }
@@ -13,7 +13,7 @@
  angle_git_is_present = exec_script("src/commit_id.py",
                                     [
                                       "check",
-@@ -340,11 +346,7 @@ static_library("libANGLE") {
+@@ -343,11 +349,7 @@ static_library("libANGLE") {
      if (use_x11) {
        sources += rebase_path(gles_gypi.libangle_gl_glx_sources, ".", "src")
        deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ]
@@ -26,7 +26,7 @@
      }
      if (is_mac) {
        sources += rebase_path(gles_gypi.libangle_gl_cgl_sources, ".", "src")
-@@ -486,7 +488,7 @@ util_gypi = exec_script("//build/gypi_to
+@@ -545,7 +547,7 @@ util_gypi = exec_script("//build/gypi_to
  
  config("angle_util_config") {
    include_dirs = [ "util" ]
@@ -35,3 +35,12 @@
      libs = [ "X11" ]
    }
  }
+@@ -572,7 +574,7 @@ foreach(is_shared_library,
+       sources += rebase_path(util_gypi.util_win32_sources, ".", "util")
+     }
+ 
+-    if (is_linux) {
++    if (is_linux && !is_bsd) {
+       sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
+       libs = [
+         "rt",
diff --git a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn
index 3c58d500d5f5..dbfa81cc9d42 100644
--- a/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_src_tests_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/angle/src/tests/BUILD.gn.orig	2017-01-26 00:50:09 UTC
+--- third_party/angle/src/tests/BUILD.gn.orig	2017-03-09 20:05:21 UTC
 +++ third_party/angle/src/tests/BUILD.gn
 @@ -41,7 +41,7 @@ test("angle_unittests") {
    ]
@@ -18,7 +18,7 @@
        # Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
      }
-@@ -175,7 +175,7 @@ if (build_angle_deqp_tests) {
+@@ -230,7 +230,7 @@ if (build_angle_deqp_tests) {
      # Ask the system headers to expose all the regular function otherwise
      # dEQP doesn't compile and produces warnings about implicitly defined
      # functions.
@@ -27,7 +27,7 @@
        # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
        defines += [ "_GNU_SOURCE" ]
      }
-@@ -198,7 +198,7 @@ if (build_angle_deqp_tests) {
+@@ -253,7 +253,7 @@ if (build_angle_deqp_tests) {
      ]
    }
  
@@ -36,7 +36,7 @@
      deqp_undefine_configs += [ "//build/config/gcc:no_exceptions" ]
    }
  
-@@ -234,7 +234,7 @@ if (build_angle_deqp_tests) {
+@@ -290,7 +290,7 @@ if (build_angle_deqp_tests) {
      if (is_win) {
        sources += rebase_path(deqp_gypi.deqp_libtester_sources_win, ".", "../..")
      }
@@ -45,7 +45,7 @@
        sources +=
            rebase_path(deqp_gypi.deqp_libtester_sources_unix, ".", "../..")
      }
-@@ -262,7 +262,7 @@ if (build_angle_deqp_tests) {
+@@ -320,7 +320,7 @@ if (build_angle_deqp_tests) {
  
      # Taken from gpu/BUILD.gn
      # TODO(jmadill): this should be in a shared location
@@ -54,7 +54,7 @@
        libs = [ "pci" ]
      }
    }
-@@ -335,7 +335,7 @@ if (build_angle_deqp_tests) {
+@@ -393,7 +393,7 @@ if (build_angle_deqp_tests) {
          "../../../deqp/src/data/",
        ]
  
diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
index f4112d30167d..bf1c817a2ebd 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
+++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
@@ -1,4 +1,4 @@
---- third_party/ffmpeg/ffmpeg_generated.gni.orig	2017-01-26 00:50:10 UTC
+--- third_party/ffmpeg/ffmpeg_generated.gni.orig	2017-03-09 20:05:22 UTC
 +++ third_party/ffmpeg/ffmpeg_generated.gni
 @@ -12,7 +12,7 @@ ffmpeg_c_sources = []
  ffmpeg_gas_sources = []
@@ -9,7 +9,7 @@
    ffmpeg_c_sources += [
      "libavcodec/allcodecs.c",
      "libavcodec/autorename_libavcodec_flacdec.c",
-@@ -160,7 +160,7 @@ if ((is_android && current_cpu == "arm" 
+@@ -161,7 +161,7 @@ if ((is_android && current_cpu == "arm" 
    ]
  }
  
@@ -18,7 +18,7 @@
    ffmpeg_c_sources += [
      "libavcodec/autorename_libavcodec_hpeldsp.c",
      "libavcodec/autorename_libavcodec_videodsp.c",
-@@ -175,7 +175,7 @@ if ((is_linux && current_cpu == "arm" &&
+@@ -176,7 +176,7 @@ if ((is_linux && current_cpu == "arm" &&
    ]
  }
  
@@ -27,7 +27,7 @@
    ffmpeg_c_sources += [
      "libavcodec/aac_ac3_parser.c",
      "libavcodec/aac_parser.c",
-@@ -212,7 +212,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
+@@ -213,7 +213,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
    ]
  }
  
@@ -36,7 +36,7 @@
    ffmpeg_c_sources += [
      "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
      "libavcodec/x86/constants.c",
-@@ -225,7 +225,7 @@ if ((is_android && current_cpu == "x64")
+@@ -226,7 +226,7 @@ if ((is_android && current_cpu == "x64")
    ]
  }
  
@@ -45,7 +45,7 @@
    ffmpeg_c_sources += [
      "libavcodec/cabac.c",
      "libavcodec/h2645_parse.c",
-@@ -257,7 +257,7 @@ if ((is_android && current_cpu == "arm" 
+@@ -258,7 +258,7 @@ if ((is_android && current_cpu == "arm" 
    ]
  }
  
@@ -54,7 +54,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/fft_fixed_init_arm.c",
      "libavcodec/arm/fft_init_arm.c",
-@@ -276,7 +276,7 @@ if ((is_android && current_cpu == "arm" 
+@@ -277,7 +277,7 @@ if ((is_android && current_cpu == "arm" 
    ]
  }
  
@@ -63,7 +63,7 @@
    ffmpeg_yasm_sources += [
      "libavcodec/x86/fft.asm",
      "libavcodec/x86/flacdsp.asm",
-@@ -288,7 +288,7 @@ if ((is_android && current_cpu == "x64")
+@@ -289,7 +289,7 @@ if ((is_android && current_cpu == "x64")
    ]
  }
  
@@ -72,7 +72,7 @@
    ffmpeg_c_sources += [
      "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
      "libavcodec/x86/h264_intrapred_init.c",
-@@ -308,7 +308,7 @@ if ((is_linux && current_cpu == "x64") |
+@@ -309,7 +309,7 @@ if ((is_linux && current_cpu == "x64") |
    ]
  }
  
@@ -81,7 +81,7 @@
    ffmpeg_c_sources += [
      "libavcodec/x86/aacpsdsp_init.c",
      "libavcodec/x86/dct_init.c",
-@@ -317,7 +317,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
+@@ -318,7 +318,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
    ]
  }
  
@@ -90,7 +90,7 @@
    ffmpeg_yasm_sources += [
      "libavcodec/x86/aacpsdsp.asm",
      "libavcodec/x86/dct32.asm",
-@@ -326,7 +326,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
+@@ -327,7 +327,7 @@ if ((current_cpu == "x64" && ffmpeg_bran
    ]
  }
  
@@ -99,7 +99,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/h264pred_init_arm.c",
      "libavcodec/arm/hpeldsp_init_arm.c",
-@@ -346,13 +346,13 @@ if ((is_linux && current_cpu == "arm" &&
+@@ -347,13 +347,13 @@ if ((is_linux && current_cpu == "arm" &&
    ]
  }
  
@@ -115,7 +115,7 @@
    ffmpeg_c_sources += [
      "libavcodec/acelp_filters.c",
      "libavcodec/acelp_pitch_delay.c",
-@@ -407,7 +407,7 @@ if ((is_linux && current_cpu == "arm" &&
+@@ -408,7 +408,7 @@ if ((is_linux && current_cpu == "arm" &&
    ]
  }
  
@@ -124,7 +124,7 @@
    ffmpeg_c_sources += [
      "libavcodec/aarch64/fft_init_aarch64.c",
      "libavcodec/aarch64/vorbisdsp_init.c",
-@@ -422,7 +422,7 @@ if ((is_android && current_cpu == "arm64
+@@ -423,7 +423,7 @@ if ((is_android && current_cpu == "arm64
    ]
  }
  
@@ -133,7 +133,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/aacpsdsp_init_arm.c",
      "libavcodec/arm/mpegaudiodsp_init_arm.c",
-@@ -433,7 +433,7 @@ if ((is_android && current_cpu == "arm" 
+@@ -434,7 +434,7 @@ if ((is_android && current_cpu == "arm" 
    ]
  }
  
@@ -142,7 +142,7 @@
    ffmpeg_c_sources += [
      "libavutil/arm/float_dsp_init_neon.c",
    ]
-@@ -448,7 +448,7 @@ if ((is_android && current_cpu == "arm" 
+@@ -449,7 +449,7 @@ if ((is_android && current_cpu == "arm" 
    ]
  }
  
@@ -151,7 +151,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/h264chroma_init_arm.c",
      "libavcodec/arm/h264dsp_init_arm.c",
-@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm" &&
+@@ -460,7 +460,7 @@ if ((is_linux && current_cpu == "arm" &&
    ]
  }
  
@@ -160,7 +160,7 @@
    ffmpeg_c_sources += [
      "libavcodec/x86/h264_qpel.c",
      "libavcodec/x86/h264chroma_init.c",
-@@ -480,7 +480,7 @@ if ((is_linux && current_cpu == "x64" &&
+@@ -481,7 +481,7 @@ if ((is_linux && current_cpu == "x64" &&
    ]
  }
  
@@ -169,7 +169,7 @@
    ffmpeg_c_sources += [
      "libavcodec/mips/aacdec_mips.c",
      "libavcodec/mips/aacpsdsp_mips.c",
-@@ -489,7 +489,7 @@ if ((is_android && current_cpu == "mips6
+@@ -490,7 +490,7 @@ if ((is_android && current_cpu == "mips6
    ]
  }
  
@@ -178,7 +178,7 @@
    ffmpeg_c_sources += [
      "libavcodec/mips/h264pred_init_mips.c",
      "libavcodec/mips/hpeldsp_init_mips.c",
-@@ -497,7 +497,7 @@ if (is_linux && current_cpu == "mipsel")
+@@ -498,7 +498,7 @@ if (is_linux && current_cpu == "mipsel")
    ]
  }
  
@@ -187,7 +187,7 @@
    ffmpeg_c_sources += [
      "libavcodec/mips/h264chroma_init_mips.c",
      "libavcodec/mips/h264dsp_init_mips.c",
-@@ -505,7 +505,7 @@ if ((is_linux && current_cpu == "mipsel"
+@@ -506,7 +506,7 @@ if ((is_linux && current_cpu == "mipsel"
    ]
  }
  
@@ -196,7 +196,7 @@
    ffmpeg_c_sources += [
      "libavcodec/aarch64/h264pred_init.c",
      "libavcodec/aarch64/hpeldsp_init_aarch64.c",
-@@ -518,7 +518,7 @@ if (is_linux && current_cpu == "arm64") 
+@@ -519,7 +519,7 @@ if (is_linux && current_cpu == "arm64") 
    ]
  }
  
@@ -205,7 +205,7 @@
    ffmpeg_c_sources += [
      "libavcodec/aarch64/imdct15_init.c",
      "libavcodec/aarch64/mpegaudiodsp_init.c",
-@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "arm64
+@@ -530,7 +530,7 @@ if ((is_android && current_cpu == "arm64
    ]
  }
  
@@ -214,7 +214,7 @@
    ffmpeg_c_sources += [
      "libavcodec/aarch64/h264chroma_init_aarch64.c",
      "libavcodec/aarch64/h264dsp_init_aarch64.c",
-@@ -543,7 +543,7 @@ if ((is_linux && current_cpu == "arm64" 
+@@ -544,7 +544,7 @@ if ((is_linux && current_cpu == "arm64" 
    ]
  }
  
@@ -223,7 +223,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/hpeldsp_init_neon.c",
      "libavcodec/arm/vp8dsp_init_neon.c",
-@@ -556,14 +556,14 @@ if (is_linux && current_cpu == "arm" && 
+@@ -557,14 +557,14 @@ if (is_linux && current_cpu == "arm" && 
    ]
  }
  
@@ -240,7 +240,7 @@
    ffmpeg_c_sources += [
      "libavcodec/arm/blockdsp_init_arm.c",
      "libavcodec/arm/idctdsp_init_arm.c",
-@@ -587,13 +587,13 @@ if ((is_linux && current_cpu == "arm" &&
+@@ -588,13 +588,13 @@ if ((is_linux && current_cpu == "arm" &&
    ]
  }
  
@@ -256,7 +256,7 @@
    ffmpeg_gas_sources += [
      "libavcodec/arm/h264cmc_neon.S",
      "libavcodec/arm/h264dsp_neon.S",
-@@ -608,7 +608,7 @@ if (is_win && current_cpu == "x64") {
+@@ -609,7 +609,7 @@ if (is_win && current_cpu == "x64") {
    ]
  }
  
@@ -265,7 +265,7 @@
    ffmpeg_c_sources += [
      "libavcodec/x86/blockdsp_init.c",
      "libavcodec/x86/fdct.c",
-@@ -635,7 +635,7 @@ if ((is_linux && current_cpu == "x64" &&
+@@ -636,7 +636,7 @@ if ((is_linux && current_cpu == "x64" &&
    ]
  }
  
@@ -274,7 +274,7 @@
    ffmpeg_c_sources += [
      "libavcodec/mips/blockdsp_init_mips.c",
      "libavcodec/mips/h263dsp_init_mips.c",
-@@ -648,7 +648,7 @@ if (is_linux && current_cpu == "mipsel" 
+@@ -649,7 +649,7 @@ if (is_linux && current_cpu == "mipsel" 
    ]
  }
  
diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn
index 4d4a29faaecd..0fec9e18545b 100644
--- a/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn
+++ b/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/harfbuzz-ng/BUILD.gn.orig	2017-01-26 00:49:29 UTC
+--- third_party/harfbuzz-ng/BUILD.gn.orig	2017-03-09 20:04:47 UTC
 +++ third_party/harfbuzz-ng/BUILD.gn
 @@ -50,7 +50,7 @@ if (use_system_harfbuzz) {
  
@@ -9,7 +9,7 @@
          current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {
        # These symbols are referenced from libpangoft2, which will be
        # dynamically linked later.
-@@ -193,7 +193,7 @@ if (use_system_harfbuzz) {
+@@ -194,7 +194,7 @@ if (use_system_harfbuzz) {
      # in the tree, all symbols pango needs must be included, or
      # pango uses mixed versions of harfbuzz and leads to crash.
      # See crbug.com/462689.
diff --git a/www/chromium/files/patch-third__party_pdfium_BUILD.gn b/www/chromium/files/patch-third__party_pdfium_BUILD.gn
index d75aeea8babe..6231a8e7141b 100644
--- a/www/chromium/files/patch-third__party_pdfium_BUILD.gn
+++ b/www/chromium/files/patch-third__party_pdfium_BUILD.gn
@@ -1,7 +1,7 @@
---- third_party/pdfium/BUILD.gn.orig	2017-01-26 00:50:14 UTC
+--- third_party/pdfium/BUILD.gn.orig	2017-03-09 20:05:26 UTC
 +++ third_party/pdfium/BUILD.gn
-@@ -44,7 +44,7 @@ config("pdfium_core_config") {
-   cflags = []
+@@ -45,7 +45,7 @@ config("pdfium_core_config") {
+   ldflags = []
    configs = [ ":pdfium_common_config" ]
    defines = [ "V8_DEPRECATION_WARNINGS" ]
 -  if (is_linux) {
diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
index d0374c22f6c4..b1b76657ff40 100644
--- a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2017-01-26 00:50:15 UTC
+--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2017-03-09 20:05:26 UTC
 +++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp
-@@ -458,11 +458,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C
+@@ -457,11 +457,12 @@ v8::Local<v8::Date> CJS_Date::ToV8Date(C
  }
  
  double _getLocalTZA() {
@@ -14,7 +14,7 @@
  #if _MSC_VER >= 1900
    // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
    // variable declared in time.h. That variable was deprecated and in VS 2015
-@@ -470,7 +471,11 @@ double _getLocalTZA() {
+@@ -469,7 +470,11 @@ double _getLocalTZA() {
    long timezone = 0;
    _get_timezone(&timezone);
  #endif
diff --git a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
index 3852ed7b66bf..d4c983d43777 100644
--- a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
+++ b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
@@ -1,7 +1,7 @@
---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig	2017-02-02 02:03:55 UTC
+--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig	2017-03-09 20:05:27 UTC
 +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h
-@@ -22,7 +22,7 @@
- #include <xlocale.h>
+@@ -25,7 +25,7 @@
+ #define HAVE_XLOCALE 0
  #endif
  
 -#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION)
diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
index e11d2c7aa9aa..95a4c125669b 100644
--- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn
+++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/sqlite/BUILD.gn.orig	2017-01-26 00:49:30 UTC
+--- third_party/sqlite/BUILD.gn.orig	2017-03-09 20:04:47 UTC
 +++ third_party/sqlite/BUILD.gn
 @@ -22,7 +22,7 @@ if (!use_system_sqlite) {
        # sqlite3Fts3InitTok).
@@ -9,6 +9,15 @@
        cflags += [
          # SQLite doesn"t believe in compiler warnings,
          # preferring testing.
+@@ -150,7 +150,7 @@ if (!use_system_sqlite) {
+       ":sqlite_warnings",
+     ]
+ 
+-    if (is_linux) {
++    if (is_linux && !is_bsd) {
+       libs = [ "dl" ]
+     } else if (is_mac || is_ios) {
+       libs = [
 @@ -187,7 +187,7 @@ if (!use_system_sqlite) {
      public_configs = [ ":sqlite_export" ]
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn
index 84b2abca2604..eec2387d071a 100644
--- a/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_base_BUILD.gn
@@ -1,10 +1,18 @@
---- third_party/webrtc/base/BUILD.gn.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/base/BUILD.gn.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/base/BUILD.gn
-@@ -650,7 +650,6 @@ rtc_static_library("rtc_base") {
-       "x11windowpicker.h",
-     ]
+@@ -604,7 +604,6 @@ rtc_static_library("rtc_base") {
+ 
+   if (use_x11) {
      libs += [
 -      "dl",
        "rt",
        "Xext",
        "X11",
+@@ -615,7 +614,6 @@ rtc_static_library("rtc_base") {
+ 
+   if (is_linux) {
+     libs += [
+-      "dl",
+       "rt",
+     ]
+   }
diff --git a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
index 516620598f78..860774486273 100644
--- a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
+++ b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/base/httpcommon.cc.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/base/httpcommon.cc.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/base/httpcommon.cc
-@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string
+@@ -385,7 +385,7 @@ bool HttpDateToSeconds(const std::string
      gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
    }
    // TODO: Android should support timezone, see b/2441195
diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.cc b/www/chromium/files/patch-third__party_webrtc_base_linux.cc
deleted file mode 100644
index b51871524bdf..000000000000
--- a/www/chromium/files/patch-third__party_webrtc_base_linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/webrtc/base/linux.cc.orig	2017-01-26 00:50:17 UTC
-+++ third_party/webrtc/base/linux.cc
-@@ -8,7 +8,7 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include "webrtc/base/linux.h"
- 
- #include <ctype.h>
-@@ -261,4 +261,4 @@ int ReadCpuMaxFreq() {
- 
- }  // namespace rtc
- 
--#endif  // defined(WEBRTC_LINUX)
-+#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.h b/www/chromium/files/patch-third__party_webrtc_base_linux.h
deleted file mode 100644
index 8d1705bd183c..000000000000
--- a/www/chromium/files/patch-third__party_webrtc_base_linux.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- third_party/webrtc/base/linux.h.orig	2017-01-26 00:50:17 UTC
-+++ third_party/webrtc/base/linux.h
-@@ -11,7 +11,7 @@
- #ifndef WEBRTC_BASE_LINUX_H_
- #define WEBRTC_BASE_LINUX_H_
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include <string>
- #include <map>
- #include <memory>
-@@ -114,5 +114,5 @@ int ReadCpuMaxFreq();
- 
- }  // namespace rtc
- 
--#endif  // defined(WEBRTC_LINUX)
-+#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #endif  // WEBRTC_BASE_LINUX_H_
diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.cc b/www/chromium/files/patch-third__party_webrtc_base_network.cc
index d0b798cc3d39..224bb198d147 100644
--- a/www/chromium/files/patch-third__party_webrtc_base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_base_network.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/base/network.cc.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/base/network.cc.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/base/network.cc
 @@ -14,7 +14,7 @@
  // linux/if.h can't be included at the same time as the posix sys/if.h, and
@@ -9,7 +9,7 @@
  #include <linux/if.h>
  #include <linux/route.h>
  #elif !defined(__native_client__)
-@@ -656,7 +656,7 @@ bool BasicNetworkManager::CreateNetworks
+@@ -657,7 +657,7 @@ bool BasicNetworkManager::CreateNetworks
  }
  #endif  // WEBRTC_WIN
  
@@ -18,7 +18,7 @@
  bool IsDefaultRoute(const std::string& network_name) {
    FileStream fs;
    if (!fs.Open("/proc/net/route", "r", NULL)) {
-@@ -699,7 +699,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
+@@ -700,7 +700,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
        strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
      return true;
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.h b/www/chromium/files/patch-third__party_webrtc_base_network.h
index 7c6a919cbeaa..91fdc800f28c 100644
--- a/www/chromium/files/patch-third__party_webrtc_base_network.h
+++ b/www/chromium/files/patch-third__party_webrtc_base_network.h
@@ -1,6 +1,6 @@
---- third_party/webrtc/base/network.h.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/base/network.h.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/base/network.h
-@@ -23,6 +23,10 @@
+@@ -24,6 +24,10 @@
  #include "webrtc/base/messagehandler.h"
  #include "webrtc/base/sigslot.h"
  
diff --git a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
index cef0e4687dc6..0ec3782e88cf 100644
--- a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
+++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/base/physicalsocketserver.cc.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/base/physicalsocketserver.cc.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/base/physicalsocketserver.cc
-@@ -61,7 +61,11 @@ typedef void* SockOptArg;
+@@ -62,7 +62,11 @@ typedef void* SockOptArg;
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
@@ -12,7 +12,7 @@
    if (ret != 0)
      return -1;
    int64_t timestamp =
-@@ -274,7 +278,7 @@ int PhysicalSocket::GetOption(Option opt
+@@ -275,7 +279,7 @@ int PhysicalSocket::GetOption(Option opt
    socklen_t optlen = sizeof(*value);
    int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
    if (ret != -1 && opt == OPT_DONTFRAGMENT) {
@@ -21,7 +21,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    }
-@@ -287,7 +291,7 @@ int PhysicalSocket::SetOption(Option opt
+@@ -288,7 +292,7 @@ int PhysicalSocket::SetOption(Option opt
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -30,7 +30,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    }
-@@ -569,10 +573,10 @@ int PhysicalSocket::TranslateOption(Opti
+@@ -570,10 +574,10 @@ int PhysicalSocket::TranslateOption(Opti
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
diff --git a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
deleted file mode 100644
index 5c7d481d662d..000000000000
--- a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
+++ /dev/null
@@ -1,40 +0,0 @@
---- third_party/webrtc/base/systeminfo.cc.orig	2017-01-26 00:50:17 UTC
-+++ third_party/webrtc/base/systeminfo.cc
-@@ -20,8 +20,12 @@
- #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
- #include <ApplicationServices/ApplicationServices.h>
- #include <CoreServices/CoreServices.h>
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include <unistd.h>
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
- #endif
- #if defined(WEBRTC_MAC)
- #include <sys/sysctl.h>
-@@ -66,7 +70,7 @@ static int DetectNumberOfCores() {
-   SYSTEM_INFO si;
-   GetSystemInfo(&si);
-   number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
-   number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
- #elif defined(WEBRTC_MAC)
-   int name[] = {CTL_HW, HW_AVAILCPU};
-@@ -174,9 +178,13 @@ int64_t SystemInfo::GetMemorySize() {
-     LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed.";
-   }
- 
--#elif defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
-   size_t len = sizeof(memory);
-+  #if defined(WEBRTC_MAC) 
-   int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0);
-+  #else
-+  int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
-+  #endif
-   if (error || memory == 0)
-     memory = -1;
- #elif defined(WEBRTC_LINUX)
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 1baf427bdec6..f4ca350378b9 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -77,7 +77,7 @@ rtc_static_library("audio_device") {
+@@ -82,7 +82,7 @@ rtc_static_library("audio_device") {
    ]
  
    include_dirs = []
@@ -9,7 +9,7 @@
      include_dirs += [ "linux" ]
    }
    if (is_ios) {
-@@ -125,7 +125,7 @@ rtc_static_library("audio_device") {
+@@ -130,7 +130,7 @@ rtc_static_library("audio_device") {
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
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 f86f84ab3302..df32038a8258 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,24 +1,28 @@
---- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/modules/video_coding/BUILD.gn.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/modules/video_coding/BUILD.gn
-@@ -137,9 +137,7 @@ rtc_static_library("webrtc_h264") {
+@@ -164,11 +164,7 @@ rtc_static_library("webrtc_h264") {
    }
  
    defines = []
 -  deps = [
+-    ":video_coding_utility",
+-    "../../base:rtc_base_approved",
 -    "../../system_wrappers",
 -  ]
 +  deps = []
  
    if (rtc_use_h264) {
      defines += [ "WEBRTC_USE_H264" ]
-@@ -153,9 +151,9 @@ rtc_static_library("webrtc_h264") {
+@@ -182,10 +178,10 @@ rtc_static_library("webrtc_h264") {
        "codecs/h264/h264_encoder_impl.h",
      ]
      deps += [
 -      "../../common_video",
+-      "../../media:rtc_media_base",
        "//third_party/ffmpeg:ffmpeg",
        "//third_party/openh264:encoder",
 +      "../../common_video",
++      "../../media:rtc_media_base",
      ]
    }
  }
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 5c82743419fb..0d47d3bd3045 100644
--- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2017-01-26 00:50:17 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2017-03-09 20:05:29 UTC
 +++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -90,7 +90,7 @@ rtc_static_library("system_wrappers") {
+@@ -87,7 +87,7 @@ rtc_static_library("system_wrappers") {
      libs += [ "log" ]
    }
  
@@ -9,7 +9,7 @@
      defines += [ "WEBRTC_THREAD_RR" ]
  
      if (!build_with_chromium) {
-@@ -100,7 +100,7 @@ rtc_static_library("system_wrappers") {
+@@ -97,7 +97,7 @@ rtc_static_library("system_wrappers") {
      libs += [ "rt" ]
    }
  
diff --git a/www/chromium/files/patch-tools_gn_args.cc b/www/chromium/files/patch-tools_gn_args.cc
index 4eaa5b60eea9..7b2a4c7331b4 100644
--- a/www/chromium/files/patch-tools_gn_args.cc
+++ b/www/chromium/files/patch-tools_gn_args.cc
@@ -1,6 +1,6 @@
---- tools/gn/args.cc.orig	2017-01-26 00:49:31 UTC
+--- tools/gn/args.cc.orig	2017-03-09 20:04:48 UTC
 +++ tools/gn/args.cc
-@@ -254,6 +254,8 @@ void Args::SetSystemVarsLocked(Scope* de
+@@ -270,6 +270,8 @@ void Args::SetSystemVarsLocked(Scope* de
    os = "mac";
  #elif defined(OS_LINUX)
    os = "linux";
diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
index e0eca49ad35f..c29d59cc943c 100644
--- a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
+++ b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
---- tools/gn/bootstrap/bootstrap.py.orig	2017-01-26 00:49:31 UTC
+--- tools/gn/bootstrap/bootstrap.py.orig	2017-03-09 20:04:48 UTC
 +++ tools/gn/bootstrap/bootstrap.py
 @@ -23,6 +23,7 @@ import os
  import shutil
@@ -19,7 +19,7 @@
  
  def check_call(cmd, **kwargs):
    logging.debug('Running: %s', ' '.join(cmd))
-@@ -594,6 +596,39 @@ def write_gn_ninja(path, root_gen_dir, o
+@@ -605,6 +607,39 @@ def write_gn_ninja(path, root_gen_dir, o
          'base/third_party/libevent/epoll.c',
      ])
  
diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index 6e513d2fd31d..cb6f066551cf 100644
--- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,4 +1,4 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2017-02-02 02:03:13 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig	2017-03-09 20:04:48 UTC
 +++ tools/perf/chrome_telemetry_build/BUILD.gn
 @@ -93,7 +93,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
@@ -6,6 +6,6 @@
  
 -  if (is_linux) {
 +  if (is_linux && !is_bsd) {
-     data_deps += [
-       "//tools/xdisplaycheck",
-       "//breakpad:dump_syms($host_toolchain)",
+     data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
+   }
+ 
diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc
deleted file mode 100644
index 4f8482fc85a4..000000000000
--- a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/app_list/views/app_list_view.cc.orig	2017-01-26 00:49:31 UTC
-+++ ui/app_list/views/app_list_view.cc
-@@ -70,7 +70,7 @@ const int kArrowOffset = 10;
- 
- // Determines whether the current environment supports shadows bubble borders.
- bool SupportsShadow() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Shadows are not supported on (non-ChromeOS) Linux.
-   return false;
- #endif
-@@ -538,7 +538,7 @@ void AppListView::OnBeforeBubbleWidgetIn
-   if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop())
-     params->native_widget = new views::DesktopNativeWidgetAura(widget);
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Set up a custom WM_CLASS for the app launcher window. This allows task
-   // switchers in X11 environments to distinguish it from main browser windows.
-   params->wm_class_name = kAppListWMClass;
diff --git a/www/chromium/files/patch-ui_aura_BUILD.gn b/www/chromium/files/patch-ui_aura_BUILD.gn
index e6d0852a7a47..d86c8f497f91 100644
--- a/www/chromium/files/patch-ui_aura_BUILD.gn
+++ b/www/chromium/files/patch-ui_aura_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/aura/BUILD.gn.orig	2017-01-26 00:49:31 UTC
+--- ui/aura/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/aura/BUILD.gn
-@@ -361,7 +361,7 @@ test("aura_unittests") {
+@@ -362,7 +362,7 @@ test("aura_unittests") {
      "//ui/gl:test_support",
    ]
  
diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn
index b379291b7708..a22a3bea9d11 100644
--- a/www/chromium/files/patch-ui_base_BUILD.gn
+++ b/www/chromium/files/patch-ui_base_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/base/BUILD.gn.orig	2017-01-26 00:49:31 UTC
+--- ui/base/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/BUILD.gn
-@@ -348,7 +348,7 @@ component("base") {
+@@ -352,7 +352,7 @@ component("base") {
      sources += [ "touch/touch_device_android.cc" ]
    } else if (is_ios) {
      sources += [ "touch/touch_device_ios.cc" ]
@@ -9,7 +9,7 @@
      sources += [ "touch/touch_device_linux.cc" ]
    } else {
      # Empty implementation for all other cases.
-@@ -450,11 +450,11 @@ component("base") {
+@@ -462,11 +462,11 @@ component("base") {
      ]
    }
  
@@ -23,7 +23,7 @@
      deps += [ "//build/linux:fontconfig" ]
    }
  
-@@ -462,7 +462,7 @@ component("base") {
+@@ -474,7 +474,7 @@ component("base") {
      configs += [ "//build/config/linux:glib" ]
    }
  
@@ -32,7 +32,7 @@
      if (!toolkit_views && !use_aura) {
        sources -= [
          "dragdrop/drag_utils.cc",
-@@ -801,7 +801,7 @@ test("ui_base_unittests") {
+@@ -825,7 +825,7 @@ test("ui_base_unittests") {
        "ime/win/imm32_manager_unittest.cc",
        "ime/win/tsf_input_scope_unittest.cc",
      ]
@@ -41,7 +41,7 @@
        sources += [ "ime/input_method_auralinux_unittest.cc" ]
      }
      if (use_x11) {
-@@ -924,7 +924,7 @@ test("ui_base_unittests") {
+@@ -946,7 +946,7 @@ test("ui_base_unittests") {
      ]
    }
  
@@ -50,7 +50,7 @@
      # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
      # instead of depending directly on the non-test .pak files, but depending
      # on ui_test_pak seems to have no effect.
-@@ -937,7 +937,7 @@ test("ui_base_unittests") {
+@@ -959,7 +959,7 @@ test("ui_base_unittests") {
        "//third_party/mesa:osmesa",
      ]
    }
diff --git a/www/chromium/files/patch-ui_base_ime_BUILD.gn b/www/chromium/files/patch-ui_base_ime_BUILD.gn
index 64a2320aae15..aa3a96edd096 100644
--- a/www/chromium/files/patch-ui_base_ime_BUILD.gn
+++ b/www/chromium/files/patch-ui_base_ime_BUILD.gn
@@ -1,7 +1,7 @@
---- ui/base/ime/BUILD.gn.orig	2017-02-02 02:03:13 UTC
+--- ui/base/ime/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/ime/BUILD.gn
-@@ -123,7 +123,7 @@ component("ime") {
-     ":text_input_types",
+@@ -124,7 +124,7 @@ component("ime") {
+     "//skia",
    ]
  
 -  if (!use_aura || (!is_linux && !use_ozone)) {
@@ -9,7 +9,7 @@
      sources -= [
        "input_method_auralinux.cc",
        "input_method_auralinux.h",
-@@ -137,7 +137,7 @@ component("ime") {
+@@ -138,7 +138,7 @@ component("ime") {
      ]
    }
  
diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
index 205449aaa8cc..9f1edc2bbeac 100644
--- a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
+++ b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
@@ -1,6 +1,6 @@
---- ui/base/ime/ime_engine_handler_interface.h.orig	2017-01-26 00:49:31 UTC
+--- ui/base/ime/ime_engine_handler_interface.h.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/ime/ime_engine_handler_interface.h
-@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
+@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
    // Hides the input view window (from API call).
    virtual void HideInputView() = 0;
  
diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
index a90f8a4b22fa..4f3bd3466310 100644
--- a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
+++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
@@ -1,6 +1,6 @@
---- ui/base/ime/input_method_factory.cc.orig	2017-01-26 00:49:31 UTC
+--- ui/base/ime/input_method_factory.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/ime/input_method_factory.cc
-@@ -14,7 +14,8 @@
+@@ -16,7 +16,8 @@
  #include "ui/base/ime/input_method_win.h"
  #elif defined(OS_MACOSX)
  #include "ui/base/ime/input_method_mac.h"
@@ -10,7 +10,7 @@
  #include "ui/base/ime/input_method_auralinux.h"
  #elif defined(OS_ANDROID)
  #include "ui/base/ime/input_method_android.h"
-@@ -55,7 +56,8 @@ std::unique_ptr<InputMethod> CreateInput
+@@ -60,7 +61,8 @@ std::unique_ptr<InputMethod> CreateInput
    return base::MakeUnique<InputMethodWin>(delegate, widget);
  #elif defined(OS_MACOSX)
    return base::MakeUnique<InputMethodMac>(delegate);
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index f5c6d5d704c7..6a846b08ddb9 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig	2017-01-26 00:49:31 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/resource/resource_bundle.cc
-@@ -651,7 +651,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -650,7 +650,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
    return max_scale_factor_;
  #else
    return GetSupportedScaleFactors().back();
-@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance(
+@@ -709,7 +709,7 @@ void ResourceBundle::InitSharedInstance(
      supported_scale_factors.push_back(SCALE_FACTOR_100P);
    }
  #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
diff --git a/www/chromium/files/patch-ui_base_ui__features.gni b/www/chromium/files/patch-ui_base_ui__features.gni
index 5919a0571cc7..2611b94f25cc 100644
--- a/www/chromium/files/patch-ui_base_ui__features.gni
+++ b/www/chromium/files/patch-ui_base_ui__features.gni
@@ -1,8 +1,8 @@
---- ui/base/ui_features.gni.orig	2017-01-26 00:49:31 UTC
+--- ui/base/ui_features.gni.orig	2017-03-09 20:04:49 UTC
 +++ ui/base/ui_features.gni
-@@ -2,4 +2,4 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
+@@ -10,4 +10,4 @@ declare_args() {
+   mac_views_browser = false
+ }
  
 -enable_hidpi = is_mac || is_win || is_linux
 +enable_hidpi = is_mac || is_win || is_linux || is_bsd
diff --git a/www/chromium/files/patch-ui_compositor_BUILD.gn b/www/chromium/files/patch-ui_compositor_BUILD.gn
index ba9bd27d0f98..b2f9fbae84ca 100644
--- a/www/chromium/files/patch-ui_compositor_BUILD.gn
+++ b/www/chromium/files/patch-ui_compositor_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/compositor/BUILD.gn.orig	2017-01-26 00:49:31 UTC
+--- ui/compositor/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/compositor/BUILD.gn
-@@ -201,7 +201,7 @@ test("compositor_unittests") {
+@@ -203,7 +203,7 @@ test("compositor_unittests") {
      "//ui/gl",
      "//ui/resources",
    ]
diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc
index 2a84fa28cdf7..3dc720b6b658 100644
--- a/www/chromium/files/patch-ui_events_event__switches.cc
+++ b/www/chromium/files/patch-ui_events_event__switches.cc
@@ -1,6 +1,6 @@
---- ui/events/event_switches.cc.orig	2017-01-26 00:49:31 UTC
+--- ui/events/event_switches.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/events/event_switches.cc
-@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis
+@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "
  const char kCompensateForUnstablePinchZoom[] =
      "compensate-for-unstable-pinch-zoom";
  
diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h
index 55826ecf8215..a2fa8cf86ad6 100644
--- a/www/chromium/files/patch-ui_events_event__switches.h
+++ b/www/chromium/files/patch-ui_events_event__switches.h
@@ -1,7 +1,7 @@
---- ui/events/event_switches.h.orig	2017-01-26 00:49:31 UTC
+--- ui/events/event_switches.h.orig	2017-03-09 20:04:49 UTC
 +++ ui/events/event_switches.h
-@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo
- EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
+@@ -14,7 +14,7 @@ namespace switches {
+ EVENTS_BASE_EXPORT extern const char kEnableScrollPrediction[];
  EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
  
 -#if defined(OS_LINUX)
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 0fe075970e46..b45552233373 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2017-01-26 00:49:31 UTC
+--- ui/gfx/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/gfx/BUILD.gn
-@@ -371,7 +371,7 @@ component("gfx") {
+@@ -375,7 +375,7 @@ component("gfx") {
    }
  
    # Linux.
@@ -9,7 +9,7 @@
      deps += [ "//build/linux:fontconfig" ]
    }
  
-@@ -549,7 +549,7 @@ static_library("test_support") {
+@@ -570,7 +570,7 @@ static_library("test_support") {
        "test/ui_cocoa_test_helper.mm",
      ]
    }
diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
index a199f90b8b7a..722f99a3181e 100644
--- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc
+++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
@@ -1,6 +1,6 @@
---- ui/gfx/canvas_skia.cc.orig	2017-01-26 00:49:31 UTC
+--- ui/gfx/canvas_skia.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/gfx/canvas_skia.cc
-@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithShadows(c
+@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(con
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc
index d1f2bc886ec2..447e8b874f30 100644
--- a/www/chromium/files/patch-ui_gfx_render__text.cc
+++ b/www/chromium/files/patch-ui_gfx_render__text.cc
@@ -1,6 +1,6 @@
---- ui/gfx/render_text.cc.orig	2017-01-26 00:49:31 UTC
+--- ui/gfx/render_text.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/gfx/render_text.cc
-@@ -972,32 +972,33 @@ void RenderText::SetDisplayOffset(int ho
+@@ -982,32 +982,33 @@ void RenderText::SetDisplayOffset(int ho
    const int extra_content = GetContentWidth() - display_rect_.width();
    const int cursor_width = cursor_enabled_ ? 1 : 0;
  
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index 4032c06f6a4b..f4cbc99b3c0d 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,4 +1,4 @@
---- ui/gl/BUILD.gn.orig	2017-01-26 00:49:31 UTC
+--- ui/gl/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/gl/BUILD.gn
 @@ -13,7 +13,7 @@ declare_args() {
    enable_swiftshader = is_chrome_branded && is_win
@@ -9,7 +9,7 @@
  use_glx = use_x11 || ozone_platform_x11
  
  if (is_android) {
-@@ -170,7 +170,7 @@ component("gl") {
+@@ -174,7 +174,7 @@ component("gl") {
        "gl_surface_egl.h",
      ]
    }
diff --git a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc
index dcf12e86019a..4c365798ee10 100644
--- a/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc
+++ b/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc
@@ -1,11 +1,11 @@
---- ui/message_center/views/message_view_factory.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/message_center/views/message_view_factory.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/message_center/views/message_view_factory.cc
 @@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(
        notification_view = new NotificationView(controller, notification);
    }
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Don't create shadows for notification toasts on linux wih aura.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Don't create shadows for notification toasts on Linux or CrOS.
    if (top_level)
      return notification_view;
diff --git a/www/chromium/files/patch-ui_views_BUILD.gn b/www/chromium/files/patch-ui_views_BUILD.gn
index 7179e665fe79..bf91543d99bc 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	2017-01-26 00:49:32 UTC
+--- ui/views/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/BUILD.gn
-@@ -426,7 +426,7 @@ component("views") {
+@@ -430,7 +430,7 @@ component("views") {
    if (use_x11 && !is_chromeos) {
      deps += [ "//ui/display/util" ]
    }
@@ -15,6 +15,6 @@
        }
 -      if (is_linux) {
 +      if (is_linux || is_bsd) {
-         sources += [
-           "style/platform_style_linux.cc",
-           "widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc",
+         sources += [ "style/platform_style_linux.cc" ]
+       }
+     }
diff --git a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
index b89bfd664161..931dadc4daa4 100644
--- a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
+++ b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
@@ -1,6 +1,6 @@
---- ui/views/accessibility/native_view_accessibility.h.orig	2017-01-26 00:49:32 UTC
+--- ui/views/accessibility/native_view_accessibility.h.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/accessibility/native_view_accessibility.h
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
  #endif
  
diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
index 97f3bec1e4d3..9d021b8d1902 100644
--- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/bubble/bubble_dialog_delegate.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/views/bubble/bubble_dialog_delegate.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/bubble/bubble_dialog_delegate.cc
-@@ -73,7 +73,7 @@ Widget* BubbleDialogDelegateView::Create
+@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::Create
    // the parent frame and let DWM handle compositing.  If not, then we don't
    // want to allow the bubble to extend the frame because it will be clipped.
    bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc
index 395758c64072..a8e2477bb8cd 100644
--- a/www/chromium/files/patch-ui_views_controls_label.cc
+++ b/www/chromium/files/patch-ui_views_controls_label.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/label.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/views/controls/label.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/controls/label.cc
-@@ -523,7 +523,7 @@ bool Label::OnMousePressed(const ui::Mou
+@@ -521,7 +521,7 @@ bool Label::OnMousePressed(const ui::Mou
      GetFocusManager()->SetFocusedView(this);
    }
  
@@ -9,7 +9,7 @@
    if (event.IsOnlyMiddleMouseButton() && GetFocusManager())
      GetFocusManager()->SetFocusedView(this);
  #endif
-@@ -687,7 +687,7 @@ bool Label::PasteSelectionClipboard() {
+@@ -685,7 +685,7 @@ bool Label::PasteSelectionClipboard() {
  }
  
  void Label::UpdateSelectionClipboard() {
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 bc7c34cf4c0d..20dca0ff0af6 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	2017-01-26 00:49:32 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/controls/textfield/textfield.cc
-@@ -53,7 +53,7 @@
+@@ -54,7 +54,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"
-@@ -146,14 +146,14 @@ ui::TextEditCommand GetCommandForKeyEven
+@@ -153,14 +153,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;
-@@ -580,7 +580,7 @@ bool Textfield::OnMousePressed(const ui:
+@@ -582,7 +582,7 @@ bool Textfield::OnMousePressed(const ui:
      ShowImeIfNeeded();
    }
  
@@ -35,7 +35,7 @@
    if (!handled && !HasFocus() && event.IsOnlyMiddleMouseButton())
      RequestFocus();
  #endif
-@@ -617,7 +617,7 @@ bool Textfield::OnKeyPressed(const ui::K
+@@ -619,7 +619,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;
-@@ -757,7 +757,7 @@ void Textfield::AboutToRequestFocusFromT
+@@ -759,7 +759,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();
-@@ -1035,7 +1035,7 @@ void Textfield::WriteDragDataForView(Vie
+@@ -1041,7 +1041,7 @@ void Textfield::WriteDragDataForView(Vie
    std::unique_ptr<gfx::Canvas> canvas(
        GetCanvasForDragImage(GetWidget(), label.size()));
    label.SetEnabledColor(GetTextColor());
@@ -62,7 +62,7 @@
    // Desktop Linux Aura does not yet support transparency in drag images.
    canvas->DrawColor(GetBackgroundColor());
  #endif
-@@ -1827,7 +1827,7 @@ bool Textfield::PasteSelectionClipboard(
+@@ -1833,7 +1833,7 @@ bool Textfield::PasteSelectionClipboard(
  }
  
  void Textfield::UpdateSelectionClipboard() {
diff --git a/www/chromium/files/patch-ui_views_mus_BUILD.gn b/www/chromium/files/patch-ui_views_mus_BUILD.gn
index 15bb5763d0fd..fdc733c7b8ff 100644
--- a/www/chromium/files/patch-ui_views_mus_BUILD.gn
+++ b/www/chromium/files/patch-ui_views_mus_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/views/mus/BUILD.gn.orig	2017-02-02 02:03:13 UTC
+--- ui/views/mus/BUILD.gn.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/mus/BUILD.gn
-@@ -91,7 +91,7 @@ component("mus") {
+@@ -78,7 +78,7 @@ component("mus") {
      "//ui/wm",
    ]
  
diff --git a/www/chromium/files/patch-ui_views_mus_aura__init.cc b/www/chromium/files/patch-ui_views_mus_aura__init.cc
index 186cc436553e..48f8aa713c47 100644
--- a/www/chromium/files/patch-ui_views_mus_aura__init.cc
+++ b/www/chromium/files/patch-ui_views_mus_aura__init.cc
@@ -1,6 +1,6 @@
---- ui/views/mus/aura_init.cc.orig	2017-02-02 02:03:13 UTC
+--- ui/views/mus/aura_init.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/mus/aura_init.cc
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
  #include "ui/views/mus/mus_client.h"
  #include "ui/views/views_delegate.h"
  
@@ -9,7 +9,7 @@
  #include "components/font_service/public/cpp/font_loader.h"
  #endif
  
-@@ -67,7 +67,7 @@ AuraInit::AuraInit(service_manager::Conn
+@@ -69,7 +69,7 @@ AuraInit::AuraInit(service_manager::Conn
    InitializeResources(connector);
  
  // Initialize the skia font code to go ask fontconfig underneath.
@@ -18,7 +18,7 @@
    font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
    SkFontConfigInterface::SetGlobal(font_loader_.get());
  #endif
-@@ -80,7 +80,7 @@ AuraInit::AuraInit(service_manager::Conn
+@@ -82,7 +82,7 @@ AuraInit::AuraInit(service_manager::Conn
  }
  
  AuraInit::~AuraInit() {
diff --git a/www/chromium/files/patch-ui_views_mus_aura__init.h b/www/chromium/files/patch-ui_views_mus_aura__init.h
index 276a03c689fc..85eac9cb3132 100644
--- a/www/chromium/files/patch-ui_views_mus_aura__init.h
+++ b/www/chromium/files/patch-ui_views_mus_aura__init.h
@@ -1,6 +1,6 @@
---- ui/views/mus/aura_init.h.orig	2017-02-02 02:03:13 UTC
+--- ui/views/mus/aura_init.h.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/mus/aura_init.h
-@@ -64,7 +64,7 @@ class VIEWS_MUS_EXPORT AuraInit {
+@@ -68,7 +68,7 @@ class VIEWS_MUS_EXPORT AuraInit {
   private:
    void InitializeResources(service_manager::Connector* connector);
  
diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc
index 46483c64b830..9a83d560acad 100644
--- a/www/chromium/files/patch-ui_views_style_platform__style.cc
+++ b/www/chromium/files/patch-ui_views_style_platform__style.cc
@@ -1,11 +1,11 @@
---- ui/views/style/platform_style.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/views/style/platform_style.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/style/platform_style.cc
-@@ -17,7 +17,7 @@
- #include "ui/views/controls/focusable_border.h"
- #include "ui/views/controls/scrollbar/scroll_bar_views.h"
+@@ -19,7 +19,7 @@
  
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
  #define DESKTOP_LINUX
  #endif
  
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
index a99aafc216ac..82b14bf32478 100644
--- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,6 +1,6 @@
---- ui/views/window/custom_frame_view.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/window/custom_frame_view.cc
-@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderH
+@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderH
  int CustomFrameView::CaptionButtonY() const {
    // Maximized buttons start at window top so that even if their images aren't
    // drawn flush with the screen edge, they still obey Fitts' Law.
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index 9e585e99dfb1..5b104ff20822 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2017-01-26 00:49:32 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2017-03-09 20:04:49 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -56,7 +56,7 @@ Widget::InitParams DialogDelegate::GetDi
+@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDi
    params.bounds = bounds;
    DialogDelegate* dialog = delegate->AsDialogDelegate();
  
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index 0953dc1464bc..5388ea4fd057 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig	2017-01-26 00:50:20 UTC
+--- v8/BUILD.gn.orig	2017-03-09 20:05:30 UTC
 +++ v8/BUILD.gn
-@@ -2273,7 +2273,7 @@ v8_component("v8_libbase") {
+@@ -2315,7 +2315,7 @@ v8_component("v8_libbase") {
      sources += [ "src/base/platform/platform-posix.cc" ]
    }
  
@@ -9,7 +9,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -2283,6 +2283,12 @@ v8_component("v8_libbase") {
+@@ -2325,6 +2325,12 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
@@ -22,7 +22,7 @@
    } else if (is_android) {
      if (current_toolchain == host_toolchain) {
        libs = [
-@@ -2420,6 +2426,7 @@ if (current_toolchain == v8_snapshot_too
+@@ -2458,6 +2464,7 @@ if (current_toolchain == v8_snapshot_too
      sources = [
        "src/snapshot/mksnapshot.cc",
      ]
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
index ede89322a8c2..a32e2fb24d9a 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig	2017-01-26 00:50:20 UTC
+--- v8/src/base/platform/platform-posix.cc.orig	2017-03-09 20:05:30 UTC
 +++ v8/src/base/platform/platform-posix.cc
 @@ -27,6 +27,10 @@
  #include <sys/sysctl.h>  // NOLINT, for sysctl
@@ -11,7 +11,7 @@
  #undef MAP_TYPE
  
  #if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
-@@ -329,6 +333,12 @@ int OS::GetCurrentThreadId() {
+@@ -352,6 +356,12 @@ int OS::GetCurrentThreadId() {
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
diff --git a/www/chromium/files/patch-v8_src_globals.h b/www/chromium/files/patch-v8_src_globals.h
index a5a216a8d535..407f2dc7c98a 100644
--- a/www/chromium/files/patch-v8_src_globals.h
+++ b/www/chromium/files/patch-v8_src_globals.h
@@ -1,6 +1,6 @@
---- v8/src/globals.h.orig	2017-02-02 02:04:00 UTC
+--- v8/src/globals.h.orig	2017-03-09 20:05:30 UTC
 +++ v8/src/globals.h
-@@ -182,7 +182,11 @@ const size_t kCodeRangeAreaAlignment = 2
+@@ -183,7 +183,11 @@ const size_t kCodeRangeAreaAlignment = 2
  const size_t kMaximalCodeRangeSize = 512 * MB;
  const size_t kCodeRangeAreaAlignment = 64 * KB;  // OS page on PPC Linux
  #else
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 75188440c777..2e4cfd8e75bc 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -5,6 +5,8 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/chrome-wrapper
 %%DATADIR%%/chrome_100_percent.pak
 %%DATADIR%%/chrome_200_percent.pak
+%%DATADIR%%/font_service.service
+%%DATADIR%%/headless_lib.pak
 %%DATADIR%%/icudtl.dat
 %%DATADIR%%/natives_blob.bin
 %%DATADIR%%/keyboard_resources.pak
@@ -142,9 +144,13 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/animation/animation_module.js
 %%DATADIR%%/resources/inspector/audits/audits_module.js
 %%DATADIR%%/resources/inspector/audits2/audits2_module.js
+%%DATADIR%%/resources/inspector/cm/cm_module.js
 %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
-%%DATADIR%%/resources/inspector/components_lazy/components_lazy_module.js
+%%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
 %%DATADIR%%/resources/inspector/console/console_module.js
+%%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
+%%DATADIR%%/resources/inspector/css_tracker/css_tracker_module.js
+%%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
 %%DATADIR%%/resources/inspector/devices/devices_module.js
 %%DATADIR%%/resources/inspector/devtools_compatibility.js
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
@@ -189,13 +195,17 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
 %%DATADIR%%/resources/inspector/formatter_worker.js
 %%DATADIR%%/resources/inspector/gonzales/gonzales_module.js
+%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker.js
+%%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.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/perf_ui/perf_ui_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
+%%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
 %%DATADIR%%/resources/inspector/resources/resources_module.js
 %%DATADIR%%/resources/inspector/sass/sass_module.js
 %%DATADIR%%/resources/inspector/screencast/screencast_module.js
@@ -210,9 +220,11 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
-%%DATADIR%%/resources/inspector/ui_lazy/ui_lazy_module.js
+%%DATADIR%%/resources/inspector/unit_test_runner.html
+%%DATADIR%%/resources/inspector/unit_test_runner.js
 %%DATADIR%%/resources/inspector/utility_shared_worker.js
 %%DATADIR%%/snapshot_blob.bin
+%%DATADIR%%/ui.service
 %%DATADIR%%/views_mus_resources.pak
 %%DRIVER%%bin/chromedriver
 share/icons/hicolor/128x128/apps/chrome.png
author	Carlos J. Puga Medina <cpm@FreeBSD.org>	2017-03-18 00:57:10 +0000
committer	Carlos J. Puga Medina <cpm@FreeBSD.org>	2017-03-18 00:57:10 +0000
commit	f1653e7a0b6b00b774cb588300d6a03c7d6cadd5 (patch)
tree	1ea4104f3d224ae4b3b51354d76b2c93ceac01ac
parent	dcf57b80221cf973bfa51d9bfc31cf3ed8f9c3d7 (diff)
download	ports-f1653e7a0b6b00b774cb588300d6a03c7d6cadd5.tar.gz ports-f1653e7a0b6b00b774cb588300d6a03c7d6cadd5.zip