www/chromium: update to 59.0.3071.104

- Use https in WWW and MASTER_SITES - Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS - Put in correct place MAKE_ENV+= V=1 variable - Use LLD linker by default for supported archs - Fix DEBUG option - Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type] - Get rid of multiple definition errors Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000 MFH: 2017Q2 Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-e8e0b747a45a.html
svn path=/head/; revision=443998
2025-07-18 17:59:20 -04:00 · 2017-06-20 20:20:44 +00:00 · 2017-06-20 20:20:44 +00:00 · 893d9b13f0 · 2021-03-31 03:12:20 +00:00
commit 893d9b13f0
parent 9372694c27
421 changed files with 2197 additions and 2057 deletions
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -2,10 +2,9 @@
 # $FreeBSD$

 PORTNAME=	chromium
-PORTVERSION=	58.0.3029.110
-PORTREVISION=	2
+PORTVERSION=	59.0.3071.104
 CATEGORIES=	www
-MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
+MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on

 MAINTAINER=	chromium@FreeBSD.org
@ -59,16 +58,17 @@ LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf

-ONLY_FOR_ARCHS=	i386 amd64
-USES=		compiler bison cpe desktop-file-utils execinfo jpeg \
+ONLY_FOR_ARCHS=	amd64 i386
+USES=		bison compiler cpe desktop-file-utils execinfo jpeg \
 		ninja perl5 pkgconfig python:2,build shebangfix tar:xz

 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
+USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xproto xrandr xrender xscrnsaver xtst
-USE_GNOME=	atk glib20 gtk20 gtk30 dconf libxslt libxml2
+USE_GNOME=	atk dconf glib20 gtk20 gtk30 libxml2 libxslt
 MAKE_ARGS=	-C out/${BUILDTYPE}
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
@ -80,20 +80,22 @@ INSTALLS_ICONS=	yes
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
-GN_ARGS+=	is_clang=true \
-		clang_use_chrome_plugins=false \
+GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_media_router=true \
 		enable_nacl=false \
 		enable_one_click_signin=true \
 		enable_remoting=false \
 		enable_webrtc=false \
 		fieldtrial_testing_like_official_build=true \
+		is_clang=true \
 		toolkit_views=true \
+		treat_warnings_as_errors=false \
 		use_allocator="none" \
 		use_aura=true \
 		use_cups=true \
 		use_experimental_allocator_shim=false \
-		treat_warnings_as_errors=false \
+		use_gtk3=true \
+		use_lld=true \
 		use_sysroot=false \
 		use_system_libjpeg=true \
 		use_system_sqlite=false   # chrome has additional patches
@ -148,17 +150,13 @@ GN_ARGS+=	proprietary_codecs=false
 GN_ARGS+=	enable_hevc_demuxing=false
 .endif

-DEBUG_MAKE_ENV=	V=1
 .if ${PORT_OPTIONS:MDEBUG}
 BUILDTYPE=	Debug
 GN_ARGS+=	is_debug=true
 GN_BOOTSTRAP_FLAGS+=	--debug
-#GN_ARGS+=	is_component_build=true
+MAKE_ENV+=	V=1
 .else
 BUILDTYPE=	Release
-.if ${ARCH} == amd64
-GN_ARGS+=	use_lld=true # harder, better, faster, stronger
-.endif
 GN_ARGS+=	is_debug=false
 GN_ARGS+=	symbol_level=0
 GN_ARGS+=	remove_webcore_debug_symbols=true
@ -246,8 +244,8 @@ 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 test_ime_driver ui
-	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \
+.for m in font_service test_ime_driver ui
+	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${m}.service \
 		${STAGEDIR}${DATADIR}
 .endfor
 .for s in 22 24 48 64 128 256
@ -276,6 +274,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \
 		${STAGEDIR}${DATADIR}
+.if ${PORT_OPTIONS:MDEBUG}
+	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
+		${STAGEDIR}${DATADIR}
+.endif
 .if ${PORT_OPTIONS:MDRIVER}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
--- a/www/chromium/Makefile.tests
+++ b/www/chromium/Makefile.tests
@ -4,7 +4,6 @@ TEST_TARGETS=	base_unittests \
 		crypto_unittests \
 		cacheinvalidation_unittests \
 		gpu_unittests \
-		sync_unit_tests \
 		printing_unittests \
 		sql_unittests \
 		content_unittests \
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1494416961
-SHA256 (chromium-58.0.3029.110.tar.xz) = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff
-SIZE (chromium-58.0.3029.110.tar.xz) = 518167664
-SHA256 (chromium-58.0.3029.110-testdata.tar.xz) = 53ace1eaee38bc3bb11aef932851131d563a2deefb2fd9c9f1fa524b7098e472
-SIZE (chromium-58.0.3029.110-testdata.tar.xz) = 124161428
+TIMESTAMP = 1497583686
+SHA256 (chromium-59.0.3071.104.tar.xz) = a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0
+SIZE (chromium-59.0.3071.104.tar.xz) = 531895868
+SHA256 (chromium-59.0.3071.104-testdata.tar.xz) = 4826be59b1f29dcf25c9868d0cac296fb2c98a8f1f944e6a3d7cea275705b771
+SIZE (chromium-59.0.3071.104-testdata.tar.xz) = 124231072
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@ -1,6 +1,6 @@
--- BUILD.gn.orig	2017-04-19 19:06:27 UTC
+--- BUILD.gn.orig	2017-06-05 19:03:00 UTC
 +++ BUILD.gn
-@@ -220,7 +220,7 @@ group("both_gn_and_gyp") {
+@@ -95,7 +95,7 @@ group("gn_all") {
     ]
   }
 
@ -9,7 +9,7 @@
     deps += [
       "//chrome",
       "//chrome/test:browser_tests",
-@@ -277,7 +277,7 @@ group("both_gn_and_gyp") {
+@@ -153,7 +153,7 @@ group("gn_all") {
     ]
   }
 
@ -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 += [
-@@ -322,7 +322,7 @@ group("both_gn_and_gyp") {
+@@ -199,7 +199,7 @@ group("gn_all") {
       "//ui/touch_selection:ui_touch_selection_unittests",
       "//url/ipc:url_ipc_unittests",
     ]
@ -27,7 +27,7 @@
     deps += [ "//ios:all" ]
   }
 
-@@ -482,7 +482,7 @@ group("both_gn_and_gyp") {
+@@ -359,7 +359,7 @@ group("gn_all") {
     ]
   }
 
@ -36,7 +36,7 @@
     # The following are definitely linux-only.
     deps += [
       "//chrome:manpage",
-@@ -505,9 +505,16 @@ group("both_gn_and_gyp") {
+@@ -382,9 +382,16 @@ group("gn_all") {
       # TODO(dpranke): add the linux_dump_symbols flag?
       deps += [ "//chrome:linux_symbols" ]
     }
@ -54,7 +54,7 @@
     deps += [
       "//base:base_i18n_perftests",
       "//base:base_perftests",
-@@ -578,7 +585,7 @@ group("both_gn_and_gyp") {
+@@ -455,7 +462,7 @@ group("gn_all") {
     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" ]
 
-@@ -684,7 +691,7 @@ group("both_gn_and_gyp") {
+@@ -557,7 +564,7 @@ group("gn_all") {
       deps +=
           [ "//chrome/installer/mini_installer:next_version_mini_installer" ]
     }
@ -72,7 +72,7 @@
     deps += [ "//breakpad:symupload($host_toolchain)" ]
   }
 
-@@ -728,7 +735,7 @@ group("gn_only") {
+@@ -595,7 +602,7 @@ group("gn_all") {
     deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
   }
 
@ -81,7 +81,7 @@
     deps += [
       "//mash:all",
       "//media/mojo/services:media_service_unittests",
-@@ -754,7 +761,7 @@ group("gn_only") {
+@@ -620,7 +627,7 @@ group("gn_all") {
     }
   }
 
@ -90,7 +90,7 @@
     # TODO(GYP): Figure out if any of these should be in gn_all
     # and figure out how cross-platform they are
     deps += [
-@@ -794,7 +801,7 @@ group("gn_only") {
+@@ -659,7 +666,7 @@ group("gn_all") {
     }
 
     if (target_cpu == "x86" || target_cpu == "x64") {
@ -99,7 +99,7 @@
         deps += [ "//chrome/test:load_library_perf_tests" ]
       }
       deps += [
-@@ -802,7 +809,7 @@ group("gn_only") {
+@@ -667,7 +674,7 @@ group("gn_all") {
         "//third_party/libjpeg_turbo:simd_asm",
       ]
     }
@ -108,7 +108,7 @@
       deps += [ "//v8:v8_shell" ]
     }
   }
-@@ -812,7 +819,7 @@ group("gn_only") {
+@@ -677,7 +684,7 @@ group("gn_all") {
   }
 
   if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) ||
@ -117,7 +117,7 @@
     deps += [
       "//testing/libfuzzer/fuzzers",
       "//testing/libfuzzer/tests:libfuzzer_tests",
-@@ -844,7 +851,7 @@ group("gn_only") {
+@@ -828,7 +835,7 @@ if (is_chromeos) {
 
 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 = [
-@@ -870,7 +877,7 @@ group("gn_visibility") {
+@@ -854,7 +861,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") {
-@@ -935,7 +942,7 @@ if (!is_ios) {
+@@ -921,7 +928,7 @@ if (!is_ios) {
       data_deps += [ "//content/shell:content_shell_crash_service" ]
     }
 
@ -144,7 +144,7 @@
       data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]
     }
 
-@@ -943,7 +950,7 @@ if (!is_ios) {
+@@ -929,7 +936,7 @@ if (!is_ios) {
       data_deps += [ "//breakpad:dump_syms($host_toolchain)" ]
     }
 
--- a/www/chromium/files/patch-apps_ui_views_appwindowframe__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_appwindowframe__view.cc
@ -1,6 +1,6 @@
--- apps/ui/views/app_window_frame_view.cc.orig	2017-04-19 19:06:27 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2017-06-05 19:03:00 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsF
+@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
 gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Rect window_bounds = client_bounds;
--- a/www/chromium/files/patch-ash_display_mirrorwindowcontroller.cc
+++ b/www/chromium/files/patch-ash_display_mirrorwindowcontroller.cc
@ -1,6 +1,6 @@
--- ash/display/mirror_window_controller.cc.orig	2017-04-19 19:06:27 UTC
+--- ash/display/mirror_window_controller.cc.orig	2017-06-05 19:03:00 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -251,7 +251,11 @@ void MirrorWindowController::UpdateWindo
+@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow(
                          return info.id() == iter->first;
                        }) == display_info_list.end()) {
         CloseAndDeleteHost(iter->second, true);
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@ -1,6 +1,15 @@
--- base/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ base/BUILD.gn
-@@ -1156,6 +1156,9 @@ component("base") {
+--- base/BUILD.gn.orig	2017-06-05 21:03:00.000000000 +0200
+++ base/BUILD.gn	2017-06-13 19:23:34.211227000 +0200
+@@ -1098,7 +1098,7 @@
+       "base_paths_win.h",
+     ]
+ 
+-    if (is_linux) {
+    if (is_linux || is_bsd) {
+       sources += [ "base_paths_posix.cc" ]
+     }
+   }
+@@ -1157,6 +1157,9 @@
       deps += [ "//base/allocator:tcmalloc" ]
     } else if (is_linux && use_allocator == "none") {
       sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
@ -10,7 +19,7 @@
     } else if (is_android && use_allocator == "none") {
       sources += [
         "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc",
-@@ -1171,6 +1174,34 @@ component("base") {
+@@ -1172,6 +1175,33 @@
     }
   }
 
@ -28,7 +37,6 @@
 +    ]
 +    sources += [
 +      "files/file_path_watcher_stub.cc",
-+      "process/memory_stubs.cc",
 +      "process/process_handle_freebsd.cc",
 +      "process/process_iterator_freebsd.cc",
 +      "process/process_metrics_freebsd.cc",
@ -45,7 +53,7 @@
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos || is_chromecast) {
-@@ -1467,7 +1498,7 @@ component("base") {
+@@ -1469,7 +1499,7 @@
   }
 
   # Linux.
@ -54,7 +62,7 @@
     if (is_asan || is_lsan || is_msan || is_tsan) {
       # For llvm-sanitizer.
       data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ]
-@@ -1492,7 +1523,7 @@ component("base") {
+@@ -1494,7 +1524,7 @@
       "//base/third_party/xdg_user_dirs",
     ]
   } else {
@ -63,30 +71,16 @@
     sources -= [
       "nix/mime_util_xdg.cc",
       "nix/mime_util_xdg.h",
-@@ -1508,6 +1539,13 @@ component("base") {
-     }
-   }
- 
-+  if (is_bsd) {
-+    sources -= [
-+      "threading/platform_thread_linux.cc",
-+    ]
-+    sources += [ "threading/platform_thread_freebsd.cc" ]
+@@ -2325,6 +2355,12 @@
+       "trace_event/trace_event_android_unittest.cc",
+     ]
+     set_sources_assignment_filter(sources_assignment_filter)
 +  }
 +
-   # iOS
-   if (is_ios) {
-     set_sources_assignment_filter([])
-@@ -2309,6 +2347,12 @@ test("base_unittests") {
-     set_sources_assignment_filter(sources_assignment_filter)
-   }
- 
 +  if (is_bsd) {
 +    sources -= [
 +      "debug/proc_maps_linux_unittest.cc",
 +    ]
-+  }
-+
+   }
+ 
   if (is_win) {
-     deps += [ "//base:scoped_handle_test_dll" ]
-     if (current_cpu == "x64") {
--- a/www/chromium/files/patch-base_allocator_allocator__shim.cc
+++ b/www/chromium/files/patch-base_allocator_allocator__shim.cc
@ -1,6 +1,6 @@
--- base/allocator/allocator_shim.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim.cc
-@@ -81,7 +81,7 @@ inline const allocator::AllocatorDispatc
+@@ -83,7 +83,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
   // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
   // barriered on Linux+Clang, and that causes visible perf regressons.
   return reinterpret_cast<const allocator::AllocatorDispatch*>(
--- a/www/chromium/files/patch-base_allocator_allocatorshimdefaultdispatchto__glibc.cc
+++ b/www/chromium/files/patch-base_allocator_allocatorshimdefaultdispatchto__glibc.cc
@ -1,15 +1,15 @@
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
@@ -3,19 +3,28 @@
 // found in the LICENSE file.
 
 #include "base/allocator/allocator_shim.h"
-
-#include <malloc.h>
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <malloc_np.h>
 
+-#include <malloc.h>
+-
 // This translation unit defines a default dispatch for the allocator shim which
 // routes allocations to libc functions.
 -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
--- a/www/chromium/files/patch-base_allocator_allocatorshimunittest.cc
+++ b/www/chromium/files/patch-base_allocator_allocatorshimunittest.cc
@ -1,6 +1,6 @@
--- base/allocator/allocator_shim_unittest.cc.orig	2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/allocator/allocator_shim_unittest.cc
-@@ -289,7 +289,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
   ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
 #endif  // !OS_WIN
 
@ -9,7 +9,7 @@
   void* memalign_ptr = memalign(128, 53);
   ASSERT_NE(nullptr, memalign_ptr);
   ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
-@@ -302,7 +302,7 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
   ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
   // pvalloc rounds the size up to the next page.
   ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
@ -18,7 +18,7 @@
 
   char* realloc_ptr = static_cast<char*>(malloc(10));
   strcpy(realloc_ptr, "foobar");
-@@ -318,13 +318,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS
+@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
   free(zero_alloc_ptr);
   ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
 
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@ -0,0 +1,57 @@
+--- base/debug/debugger_posix.cc.orig	2017-06-18 01:23:49.065175000 +0200
+++ base/debug/debugger_posix.cc	2017-06-18 01:58:29.603481000 +0200
+@@ -84,7 +84,7 @@
+     KERN_PROC,
+     KERN_PROC_PID,
+     getpid()
+-#if defined(OS_OPENBSD)
+#if defined(OS_BSD) 
+     , sizeof(struct kinfo_proc),
+     0
+ #endif
+@@ -92,33 +92,36 @@
+ 
+   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
+   // binary interfaces may change.
+-  struct kinfo_proc info;
+-  size_t info_size = sizeof(info);
+  struct kinfo_proc *info;
+  size_t info_size;
+ 
+-#if defined(OS_OPENBSD)
+   if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0)
+     return -1;
+ 
+  info = (struct kinfo_proc *)malloc(info_size);
+
+   mib[5] = (info_size / sizeof(struct kinfo_proc));
+-#endif
+ 
+-  int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
+  int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0);
+   DCHECK_EQ(sysctl_result, 0);
+   if (sysctl_result != 0) {
+     is_set = true;
+     being_debugged = false;
+-    return being_debugged;
+    goto out;
+   }
+ 
+   // This process is being debugged if the P_TRACED flag is set.
+   is_set = true;
+ #if defined(OS_FREEBSD)
+-  being_debugged = (info.ki_flag & P_TRACED) != 0;
+  being_debugged = (info->ki_flag & P_TRACED) != 0;
+ #elif defined(OS_BSD)
+-  being_debugged = (info.p_flag & P_TRACED) != 0;
+  being_debugged = (info->p_flag & P_TRACED) != 0;
+ #else
+-  being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
+  being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0;
+ #endif
+
+out:
+  free(info);
+   return being_debugged;
+ }
+ 
--- a/www/chromium/files/patch-base_debug_threadheapusage__tracker.cc
+++ b/www/chromium/files/patch-base_debug_threadheapusage__tracker.cc
@ -1,6 +1,6 @@
--- base/debug/thread_heap_usage_tracker.cc.orig	2017-04-19 19:06:28 UTC
+--- base/debug/thread_heap_usage_tracker.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/debug/thread_heap_usage_tracker.cc
-@@ -16,11 +16,13 @@
+@@ -16,10 +16,12 @@
 #include "base/threading/thread_local_storage.h"
 #include "build/build_config.h"
 
@ -9,8 +9,7 @@
 #include <malloc/malloc.h>
 #else
 #include <malloc.h>
- #endif
 +#endif
+ #endif
 
 namespace base {
- namespace debug {
--- a/www/chromium/files/patch-base_files_filepathunittest.cc
+++ b/www/chromium/files/patch-base_files_filepathunittest.cc
@ -1,6 +1,6 @@
--- base/files/file_path_unittest.cc.orig	2017-04-19 19:06:28 UTC
+--- base/files/file_path_unittest.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/files/file_path_unittest.cc
-@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_
+@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) 
       "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
   };
 
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@ -1,6 +1,6 @@
--- base/files/file_util.h.orig	2017-04-19 19:06:28 UTC
+--- base/files/file_util.h.orig	2017-06-05 19:03:00 UTC
 +++ base/files/file_util.h
-@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByA
+@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
 // the directory |path|, in the number of FilePath::CharType, or -1 on failure.
 BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
 
--- a/www/chromium/files/patch-base_nativelibraryposix.cc
+++ b/www/chromium/files/patch-base_nativelibraryposix.cc
@ -1,6 +1,6 @@
--- base/native_library_posix.cc.orig	2017-04-19 19:06:28 UTC
+--- base/native_library_posix.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/native_library_posix.cc
-@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio
+@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
   // further investigation, as it might vary across versions. Crash here to
   // warn developers that they're trying to rely on uncertain behavior.
   CHECK(!options.prefer_own_symbols);
--- a/www/chromium/files/patch-base_posix_unixdomainsocket__linux.cc
+++ b/www/chromium/files/patch-base_posix_unixdomainsocket__linux.cc
@ -1,4 +1,4 @@
--- base/posix/unix_domain_socket_linux.cc.orig	2017-04-19 19:06:28 UTC
+--- base/posix/unix_domain_socket_linux.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/posix/unix_domain_socket_linux.cc
@@ -23,6 +23,15 @@
 
@ -16,7 +16,7 @@
 const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
 
 #if !defined(OS_NACL_NONSFI)
-@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o
+@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
 
 // static
 bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
@ -31,7 +31,7 @@
 }
 #endif  // !defined(OS_NACL_NONSFI)
 
-@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
+@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
       // The PNaCl toolchain for Non-SFI binary build does not support
       // SCM_CREDENTIALS.
       if (cmsg->cmsg_level == SOL_SOCKET &&
--- a/www/chromium/files/patch-base_process_launch.cc
+++ b/www/chromium/files/patch-base_process_launch.cc
@ -1,6 +1,6 @@
--- base/process/launch.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/launch.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/launch.cc
-@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul
+@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
 
 LaunchOptions LaunchOptionsForTest() {
   LaunchOptions options;
--- a/www/chromium/files/patch-base_process_memory.cc
+++ b/www/chromium/files/patch-base_process_memory.cc
@ -1,6 +1,6 @@
--- base/process/memory.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/memory.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/memory.cc
-@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t 
+@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
 #endif
 
 // Defined in memory_mac.mm for Mac.
--- a/www/chromium/files/patch-base_process_memory.h
+++ b/www/chromium/files/patch-base_process_memory.h
@ -1,6 +1,6 @@
--- base/process/memory.h.orig	2017-04-19 19:06:28 UTC
+--- base/process/memory.h.orig	2017-06-05 19:03:00 UTC
 +++ base/process/memory.h
-@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO
+@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
 // Crash reporting classifies such crashes as OOM.
 BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
 
--- a/www/chromium/files/patch-base_process_memory__stubs.cc
+++ b/www/chromium/files/patch-base_process_memory__stubs.cc
@ -1,18 +0,0 @@
--- base/process/memory_stubs.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/memory_stubs.cc
-@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t 
- // their respective stdlib function since those functions will return null on a
- // failure to allocate.
- 
-+#if !defined(OS_FREEBSD)
-+// FreeBSD brings it's own implementation in memory.cc -- cmt
- bool UncheckedMalloc(size_t size, void** result) {
-   *result = malloc(size);
-   return *result != nullptr;
-@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s
-   *result = calloc(num_items, size);
-   return *result != nullptr;
- }
-+#endif
- 
- }  // namespace base
--- a/www/chromium/files/patch-base_process_memory__unittest.cc
+++ b/www/chromium/files/patch-base_process_memory__unittest.cc
@ -1,7 +1,7 @@
--- base/process/memory_unittest.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/memory_unittest.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/memory_unittest.cc
-@@ -93,10 +93,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
-   ASSERT_TRUE(base::allocator::IsAllocatorInitialized());
+@@ -101,10 +101,10 @@ TEST(MemoryTest, AllocatorShimWorking) {
+ #endif
 }
 
 -// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
@ -13,7 +13,7 @@
     BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \
     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
 
-@@ -488,5 +488,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
+@@ -508,5 +508,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
   EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
   EXPECT_TRUE(value_ == NULL);
 }
--- a/www/chromium/files/patch-base_process_processinfolinux.cc
+++ b/www/chromium/files/patch-base_process_processinfolinux.cc
@ -1,4 +1,4 @@
--- base/process/process_info_linux.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/process_info_linux.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/process_info_linux.cc
@@ -11,10 +11,28 @@
 #include "base/process/process_handle.h"
@ -28,10 +28,10 @@
 +#else
   int64_t start_ticks =
       internal::ReadProcSelfStatsAndGetFieldAsInt64(internal::VM_STARTTIME);
-   DCHECK(start_ticks);
-@@ -22,6 +40,7 @@ const Time CurrentProcessInfo::CreationT
-   Time boot_time = internal::GetBootTime();
-   DCHECK(!boot_time.is_null());
+   if (!start_ticks)
+@@ -24,6 +42,7 @@ const Time CurrentProcessInfo::CreationTime() {
+   if (boot_time.is_null())
+     return Time();
   return Time(boot_time + start_offset);
 +#endif
 }
--- a/www/chromium/files/patch-base_process_processiteratorfreebsd.cc
+++ b/www/chromium/files/patch-base_process_processiteratorfreebsd.cc
@ -1,4 +1,4 @@
--- base/process/process_iterator_freebsd.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/process_iterator_freebsd.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/process_iterator_freebsd.cc
@@ -10,6 +10,10 @@
 #include <sys/sysctl.h>
@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_split.h"
-@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces
+@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProcess() {
   for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
     size_t length;
     struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
--- 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-04-19 19:06:28 UTC
+--- base/process/process_metrics.h.orig	2017-06-05 19:03:00 UTC
 +++ base/process/process_metrics.h
@@ -22,6 +22,12 @@
 #include "base/values.h"
@ -13,7 +13,34 @@
 #if defined(OS_MACOSX)
 #include <mach/mach.h>
 #include "base/process/port_provider_mac.h"
-@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
+@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics {
+   // otherwise.
+   bool GetIOCounters(IoCounters* io_counters) const;
+ 
+-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
+   // Returns the number of file descriptors currently open by the process, or
+   // -1 on error.
+   int GetOpenFdCount() const;
+@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics {
+   // Returns the soft limit of file descriptors that can be opened by the
+   // process, or -1 on error.
+   int GetOpenFdSoftLimit() const;
+-#endif  // defined(OS_LINUX)
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+  private:
+ #if !defined(OS_MACOSX) || defined(OS_IOS)
+@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto
+ #endif  // defined(OS_POSIX)
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+-    defined(OS_ANDROID)
+    defined(OS_ANDROID) || defined(OS_BSD)
+ // Data about system-wide memory consumption. Values are in KB. Available on
+ // Windows, Mac, Linux, Android and Chrome OS.
+ //
+@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
 // CPU-related ticks.  Returns -1 on parse error.
 // Exposed for testing.
 BASE_EXPORT int ParseProcStatCPU(const std::string& input);
--- a/www/chromium/files/patch-base_process_processmetricsfreebsd.cc
+++ b/www/chromium/files/patch-base_process_processmetricsfreebsd.cc
@ -1,4 +1,4 @@
--- base/process/process_metrics_freebsd.cc.orig	2017-04-19 19:06:28 UTC
+--- base/process/process_metrics_freebsd.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/process/process_metrics_freebsd.cc
@@ -13,6 +13,9 @@
 #include "base/memory/ptr_util.h"
@ -10,10 +10,12 @@
 namespace base {
 
 ProcessMetrics::ProcessMetrics(ProcessHandle process)
-@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() {
-   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
- }
+@@ -120,6 +123,25 @@ size_t GetSystemCommitCharge() {
+   pagesize = getpagesize();
 
+   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+}
+
 +int GetNumberOfThreads(ProcessHandle process) {
 +  // Taken from FreeBSD top (usr.bin/top/machine.c)
 +
@ -31,6 +33,6 @@
 +    return 0;
 +
 +  return nproc;
-+}
-+
+ }
+ 
 }  // namespace base
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@ -1,5 +1,5 @@
--- base/process/process_posix.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/process/process_posix.cc
+--- base/process/process_posix.cc.orig	2017-06-15 21:03:00.000000000 +0200
+++ base/process/process_posix.cc	2017-06-19 15:25:27.760111000 +0200
@@ -21,8 +21,18 @@
 #include <sys/event.h>
 #endif
@ -19,7 +19,7 @@
 #if !defined(OS_NACL_NONSFI)
 
 bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
+@@ -184,13 +194,13 @@
   base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
   base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
   if (parent_pid != our_pid) {
@ -36,7 +36,7 @@
   }
 
   int status;
-@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro
+@@ -256,12 +266,16 @@
   return Process(handle);
 }
 
@ -55,7 +55,7 @@
 
 // static
 void Process::TerminateCurrentProcessImmediately(int exit_code) {
-@@ -370,15 +384,32 @@ bool Process::WaitForExitWithTimeout(Tim
+@@ -369,15 +383,31 @@
 bool Process::IsProcessBackgrounded() const {
   // See SetProcessBackgrounded().
   DCHECK(IsValid());
@ -82,7 +82,6 @@
 +  int priority = value ? kBackgroundPriority : kForegroundPriority;
 +  int result   = setpriority(PRIO_PROCESS, process_, priority);
 +
-+  DPCHECK(result == 0);
 +  return result == 0;
 +#endif // !defined(OS_FREEBSD)
 }
--- a/www/chromium/files/patch-base_sysinfofreebsd.cc
+++ b/www/chromium/files/patch-base_sysinfofreebsd.cc
@ -1,4 +1,4 @@
--- base/sys_info_freebsd.cc.orig	2017-04-19 19:06:28 UTC
+--- base/sys_info_freebsd.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/sys_info_freebsd.cc
@@ -12,12 +12,34 @@
 
@ -39,7 +39,7 @@
     NOTREACHED();
     return 0;
   }
-@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory(
+@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory() {
 }
 
 // static
--- a/www/chromium/files/patch-base_sysinfoposix.cc
+++ b/www/chromium/files/patch-base_sysinfoposix.cc
@ -1,4 +1,4 @@
--- base/sys_info_posix.cc.orig	2017-04-19 19:06:28 UTC
+--- base/sys_info_posix.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/sys_info_posix.cc
@@ -35,7 +35,7 @@
 
@ -9,7 +9,7 @@
 int NumberOfProcessors() {
   // sysconf returns the number of "logical" (not "physical") processors on both
   // Mac and Linux.  So we get the number of max available "logical" processors.
-@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa
+@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
 
 namespace base {
 
--- 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-04-19 19:06:28 UTC
+--- base/test/BUILD.gn.orig	2017-06-05 19:03:00 UTC
 +++ base/test/BUILD.gn
-@@ -312,7 +312,7 @@ static_library("run_all_base_unittests")
+@@ -314,7 +314,7 @@ static_library("run_all_base_unittests") {
   ]
 }
 
--- 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-04-19 19:06:28 UTC
+--- base/test/launcher/test_launcher.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -60,6 +60,10 @@
+@@ -61,6 +61,10 @@
 #include "base/win/windows_version.h"
 #endif
 
--- a/www/chromium/files/patch-base_test_testfileutil__posix.cc
+++ b/www/chromium/files/patch-base_test_testfileutil__posix.cc
@ -1,6 +1,6 @@
--- base/test/test_file_util_posix.cc.orig	2017-04-19 19:06:28 UTC
+--- base/test/test_file_util_posix.cc.orig	2017-06-05 19:03:00 UTC
 +++ base/test/test_file_util_posix.cc
-@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bo
+@@ -79,7 +79,7 @@ bool DieFileDie(const FilePath& file, bool recurse) {
   return DeleteFile(file, recurse);
 }
 
--- a/www/chromium/files/patch-base_threading_platformthreadlinux.cc
+++ b/www/chromium/files/patch-base_threading_platformthreadlinux.cc
@ -1,4 +1,4 @@
--- base/threading/platform_thread_linux.cc.orig	2017-04-19 19:06:28 UTC
+--- base/threading/platform_thread_linux.cc.orig	2017-06-05 19:03:01 UTC
 +++ base/threading/platform_thread_linux.cc
@@ -19,7 +19,9 @@
 
@ -10,7 +10,7 @@
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
-@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::
+@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) 
   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
   tracked_objects::ThreadData::InitializeThreadContext(name);
 
@ -19,7 +19,7 @@
   // On linux we can get the thread names to show up in the debugger by setting
   // the process name for the LWP.  We don't want to do this for the main
   // thread because that would rename the process, causing tools like killall
-@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::
+@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std::string& name) 
 #endif  //  !defined(OS_NACL)
 }
 
--- a/www/chromium/files/patch-base_threading_threadtaskrunner__handle.cc
+++ b/www/chromium/files/patch-base_threading_threadtaskrunner__handle.cc
@ -1,4 +1,4 @@
--- base/threading/thread_task_runner_handle.cc.orig	2017-04-19 19:06:28 UTC
+--- base/threading/thread_task_runner_handle.cc.orig	2017-06-05 19:03:01 UTC
 +++ base/threading/thread_task_runner_handle.cc
@@ -7,6 +7,7 @@
 #include <utility>
@ -16,7 +16,7 @@
 // static
 ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
     scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHand
+@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
       base::Passed(&overriding_task_runner),
       base::Unretained(ttrh->task_runner_.get())));
 }
--- a/www/chromium/files/patch-base_trace__event_mallocdumpprovider.cc
+++ b/www/chromium/files/patch-base_trace__event_mallocdumpprovider.cc
@ -1,11 +0,0 @@
--- base/trace_event/malloc_dump_provider.cc.orig	2017-04-19 19:06:28 UTC
-+++ base/trace_event/malloc_dump_provider.cc
-@@ -21,7 +21,7 @@
- #if defined(OS_MACOSX)
- #include <malloc/malloc.h>
- #else
-#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #if defined(OS_WIN)
- #include <windows.h>
--- a/www/chromium/files/patch-base_trace__event_processmemorydump.cc
+++ b/www/chromium/files/patch-base_trace__event_processmemorydump.cc
@ -1,6 +1,6 @@
--- base/trace_event/process_memory_dump.cc.orig	2017-04-19 19:06:28 UTC
+--- base/trace_event/process_memory_dump.cc.orig	2017-06-05 19:03:01 UTC
 +++ base/trace_event/process_memory_dump.cc
-@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB
+@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
   const size_t kMaxChunkSize = 8 * 1024 * 1024;
   size_t max_vec_size =
       GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
--- a/www/chromium/files/patch-base_trace__event_trace__log.cc
+++ b/www/chromium/files/patch-base_trace__event_trace__log.cc
@ -0,0 +1,20 @@
+--- base/trace_event/trace_log.cc.orig	2017-06-05 19:03:01 UTC
+++ base/trace_event/trace_log.cc
+@@ -1504,7 +1504,7 @@ void TraceLog::AddMetadataEventsWhileLocked() {
+                             process_name_);
+   }
+ 
+-#if !defined(OS_NACL) && !defined(OS_IOS)
+#if !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD)
+   Time process_creation_time = CurrentProcessInfo::CreationTime();
+   if (!process_creation_time.is_null()) {
+     TimeDelta process_uptime = Time::Now() - process_creation_time;
+@@ -1512,7 +1512,7 @@ void TraceLog::AddMetadataEventsWhileLocked() {
+                             current_thread_id, "process_uptime_seconds",
+                             "uptime", process_uptime.InSeconds());
+   }
+-#endif  // !defined(OS_NACL) && !defined(OS_IOS)
+#endif  // !defined(OS_NACL) && !defined(OS_IOS) && !defined(OS_BSD)
+ 
+   if (!process_labels_.empty()) {
+     std::vector<base::StringPiece> labels;
--- a/www/chromium/files/patch-breakpad_BUILD.gn
+++ b/www/chromium/files/patch-breakpad_BUILD.gn
@ -1,6 +1,6 @@
--- breakpad/BUILD.gn.orig	2017-04-19 19:06:28 UTC
+--- breakpad/BUILD.gn.orig	2017-06-05 19:03:01 UTC
 +++ breakpad/BUILD.gn
-@@ -468,7 +468,7 @@ if (is_mac) {
+@@ -472,7 +472,7 @@ if (is_mac) {
   }
 }
 
--- a/www/chromium/files/patch-build__overrides_pdfium.gni
+++ b/www/chromium/files/patch-build__overrides_pdfium.gni
@ -0,0 +1,11 @@
+--- build_overrides/pdfium.gni.orig	2017-06-05 19:03:01 UTC
+++ build_overrides/pdfium.gni
+@@ -10,7 +10,7 @@ pdf_enable_xfa_override = false
+ 
+ # Build PDFium either using the bundled FreeType, or using a third-party
+ # FreeType, configured by the embedder in //build/config/freetype.
+-pdf_bundle_freetype_override = !is_linux && !is_win
+pdf_bundle_freetype_override = false
+ 
+ # Disable use of Skia backend.
+ pdf_use_skia_override = false
--- 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-04-19 19:06:28 UTC
+--- build/config/BUILD.gn.orig	2017-06-05 19:03:01 UTC
 +++ build/config/BUILD.gn
-@@ -193,7 +193,7 @@ config("debug") {
+@@ -169,7 +169,7 @@ config("debug") {
       # builds, and we have to tell it to turn it off.
       defines += [ "_HAS_ITERATOR_DEBUGGING=0" ]
     }
@ -9,7 +9,7 @@
     # Enable libstdc++ debugging facilities to help catch problems early, see
     # http://crbug.com/65151 .
     # TODO(phajdan.jr): Should we enable this for all of POSIX?
-@@ -276,7 +276,7 @@ config("default_libs") {
+@@ -258,7 +258,7 @@ config("default_libs") {
       "CoreText.framework",
       "Foundation.framework",
     ]
@ -18,7 +18,7 @@
     libs = [
       "dl",
       "rt",
-@@ -307,7 +307,7 @@ config("executable_config") {
+@@ -292,7 +292,7 @@ config("executable_config") {
     ]
   } else if (is_ios) {
     configs += [ "//build/config/ios:ios_dynamic_flags" ]
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@ -1,4 +1,4 @@
--- build/config/BUILDCONFIG.gn.orig	2017-04-19 19:06:28 UTC
+--- build/config/BUILDCONFIG.gn.orig	2017-06-05 19:03:01 UTC
 +++ build/config/BUILDCONFIG.gn
@@ -131,12 +131,13 @@ declare_args() {
   is_official_build = false
@ -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"
-@@ -342,8 +343,17 @@ if (current_os == "win" || current_os ==
+@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == "winrt_81" ||
   is_nacl = false
   is_posix = true
   is_win = false
--- a/www/chromium/files/patch-build_config_allocator.gni
+++ b/www/chromium/files/patch-build_config_allocator.gni
@ -1,16 +1,11 @@
--- build/config/allocator.gni.orig	2017-04-19 19:06:28 UTC
+--- build/config/allocator.gni.orig	2017-06-05 19:03:01 UTC
 +++ build/config/allocator.gni
-@@ -45,10 +45,10 @@ assert(use_allocator == "none" || use_al
- assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.")
- assert(!is_mac || use_allocator == "none", "Tcmalloc doesn't work on macOS.")
- 
-assert(!use_experimental_allocator_shim || is_linux || is_android || is_win ||
-           is_mac,
-+assert(!use_experimental_allocator_shim || is_linux || is_android || is_win || 
-+           is_mac || is_bsd,
-        "use_experimental_allocator_shim supported only on Linux, Android, " +
-           "Windows and macOS targets")
-+           "Windows, macOS and BSD targets")
- 
- if (is_win && use_experimental_allocator_shim) {
-   assert(!is_component_build,
+@@ -18,7 +18,7 @@ if (is_android || current_cpu == "mipsel" || is_mac ||
+ # against the debug CRT with "is_nacl=false".
+ if ((is_linux || is_android || is_mac ||
+      (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
+-    !is_tsan && !is_msan) {
+    !is_tsan && !is_msan && !is_bsd) {
+   _default_use_experimental_allocator_shim = true
+ } else {
+   _default_use_experimental_allocator_shim = false
--- a/www/chromium/files/patch-build_config_clang_BUILD.gn
+++ b/www/chromium/files/patch-build_config_clang_BUILD.gn
@ -1,6 +1,6 @@
--- build/config/clang/BUILD.gn.orig	2017-04-19 19:06:28 UTC
+--- build/config/clang/BUILD.gn.orig	2017-06-05 19:03:01 UTC
 +++ build/config/clang/BUILD.gn
-@@ -20,7 +20,7 @@ config("find_bad_constructs") {
+@@ -19,7 +19,7 @@ config("find_bad_constructs") {
         rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib",
                     root_build_dir),
       ]
@ -9,12 +9,12 @@
       cflags += [
         "-Xclang",
         "-load",
-@@ -41,7 +41,7 @@ config("find_bad_constructs") {
+@@ -40,7 +40,7 @@ config("find_bad_constructs") {
       "check-auto-raw-pointer",
     ]
 
-    if ((is_linux || is_android) && !is_chromecast) {
-+    if ((is_linux || is_bsd || is_android) && !is_chromecast) {
+-    if (is_linux || is_android) {
+    if (is_linux || is_bsd || is_android) {
       cflags += [
         "-Xclang",
         "-plugin-arg-find-bad-constructs",
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@ -1,6 +1,15 @@
--- build/config/compiler/BUILD.gn.orig	2017-04-19 19:06:28 UTC
-+++ build/config/compiler/BUILD.gn
-@@ -158,7 +158,7 @@ config("compiler") {
+--- build/config/compiler/BUILD.gn.orig	2017-06-05 21:03:01.000000000 +0200
+++ build/config/compiler/BUILD.gn	2017-06-13 16:28:04.062660000 +0200
+@@ -37,7 +37,7 @@
+   # only two architectures that are currently checked in). Turn this off when
+   # you are using a custom toolchain and need to control -B in cflags.
+   linux_use_bundled_binutils =
+-      linux_use_bundled_binutils_override && is_linux &&
+      linux_use_bundled_binutils_override && (is_linux && !is_bsd) &&
+       (current_cpu == "x64" || current_cpu == "x86")
+   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
+                               root_build_dir)
+@@ -156,7 +156,7 @@
     configs += [ "//build/config/win:compiler" ]
   } else if (is_android) {
     configs += [ "//build/config/android:compiler" ]
@ -9,16 +18,34 @@
     configs += [ "//build/config/linux:compiler" ]
   } else if (is_nacl) {
     configs += [ "//build/config/nacl:compiler" ]
-@@ -301,7 +301,7 @@ config("compiler") {
+@@ -207,7 +207,7 @@
+ 
+     # Linker warnings.
+     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
+-        !(is_android && use_order_profiling) && !is_mac && !is_ios) {
+        !(is_android && use_order_profiling) && !is_mac && !is_ios && !is_bsd) {
+       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
+       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
+       # crbug.com/485542
+@@ -304,7 +304,7 @@
 
   # Linux/Android common flags setup.
   # ---------------------------------
 -  if (is_linux || is_android) {
 +  if (is_linux || is_bsd || is_android) {
-     cflags += [
-       "-fPIC",
-       "-pipe",  # Use pipes for communicating between sub-processes. Faster.
-@@ -428,14 +428,14 @@ config("compiler") {
+     if (use_pic) {
+       cflags += [ "-fPIC" ]
+       ldflags += [ "-fPIC" ]
+@@ -319,7 +319,7 @@
+       "-Wl,-z,relro",
+     ]
+     if (!using_sanitizer) {
+-      if (!use_cfi_diag) {
+      if (!use_cfi_diag && !is_bsd) {
+         ldflags += [ "-Wl,-z,defs" ]
+       }
+ 
+@@ -429,14 +429,14 @@
   # clang-cl (used if is_win) doesn't expose this flag.
   # Currently disabled for nacl since its toolchain lacks this flag (too old).
   # TODO(zforman): Once nacl's toolchain is updated, remove check.
@ -35,7 +62,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,
-@@ -488,7 +488,7 @@ config("compiler") {
+@@ -493,7 +493,7 @@
       ]
 
       # Apply a lower LTO optimization level as the default is too slow.
@ -44,7 +71,7 @@
         if (use_lld) {
           ldflags += [ "-Wl,--lto-O1" ]
         } else {
-@@ -508,7 +508,7 @@ config("compiler") {
+@@ -513,7 +513,7 @@
     # targeting ARM, without this flag, LTO produces a .text section that is
     # larger than the maximum call displacement, preventing the linker from
     # relocating calls (http://llvm.org/PR22999).
@ -53,7 +80,7 @@
       ldflags += [ "-Wl,-plugin-opt,-function-sections" ]
     }
   }
-@@ -776,7 +776,7 @@ config("compiler_codegen") {
+@@ -781,7 +781,7 @@
 #   configs -= [ "//build/config/compiler:clang_stackrealign" ]
 # See https://crbug.com/556393 for details of where it must be avoided.
 config("clang_stackrealign") {
@ -62,7 +89,7 @@
     cflags = [
       # Align the stack on 16-byte boundaries, http://crbug.com/418554.
       "-mstack-alignment=16",
-@@ -830,7 +830,7 @@ config("runtime_library") {
+@@ -835,7 +835,7 @@
   # smaller.
   if (is_win) {
     configs += [ "//build/config/win:runtime_library" ]
@ -71,16 +98,16 @@
     configs += [ "//build/config/linux:runtime_library" ]
   } else if (is_ios) {
     configs += [ "//build/config/ios:runtime_library" ]
-@@ -1087,7 +1087,7 @@ config("default_warnings") {
+@@ -1097,7 +1097,7 @@
+         "-Wno-address-of-packed-member",
 
-     # use_xcode_clang only refers to the iOS toolchain, host binaries use
-     # chromium's clang always.
-    if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) {
-+    if (!is_nacl && !is_bsd && (!use_xcode_clang || current_toolchain == host_toolchain)) {
-       # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
-       # recognize.
-       cflags += [
-@@ -1144,7 +1144,7 @@ config("chromium_code") {
+         # TODO(hans): https://crbug.com/681136
+-        "-Wno-unused-lambda-capture",
+        # "-Wno-unused-lambda-capture",
+ 
+         # TODO(thakis ): https://crbug.com/683349
+         "-Wno-user-defined-warnings",
+@@ -1137,7 +1137,7 @@
     ]
 
     if (!is_debug && !using_sanitizer &&
@ -89,7 +116,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
-@@ -1203,7 +1203,7 @@ config("no_chromium_code") {
+@@ -1196,7 +1196,7 @@
     ]
   }
 
@ -98,3 +125,12 @@
     cflags_cc += [
       # Don't warn about hash_map in third-party code.
       "-Wno-deprecated",
+@@ -1644,7 +1644,7 @@
+         "-g2",
+       ]
+     } else {
+-      cflags = [ "-g2" ]
+      cflags = [ "-g0" ]
+     }
+     if (use_debug_fission) {
+       cflags += [ "-gsplit-dwarf" ]
--- a/www/chromium/files/patch-build_config_crypto.gni
+++ b/www/chromium/files/patch-build_config_crypto.gni
@ -1,6 +1,6 @@
--- build/config/crypto.gni.orig	2017-04-19 19:06:28 UTC
+--- build/config/crypto.gni.orig	2017-06-05 19:03:01 UTC
 +++ build/config/crypto.gni
-@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nac
+@@ -20,4 +20,4 @@ use_openssl_certs = is_android || is_nacl
 
 # True if NSS is used for certificate handling. It is possible to use OpenSSL
 # for the crypto library, but NSS for the platform certificate library.
--- a/www/chromium/files/patch-build_config_features.gni
+++ b/www/chromium/files/patch-build_config_features.gni
@ -1,8 +1,11 @@
--- build/config/features.gni.orig	2017-04-19 19:06:28 UTC
+--- build/config/features.gni.orig	2017-06-05 19:03:01 UTC
 +++ build/config/features.gni
-@@ -60,13 +60,13 @@ declare_args() {
+@@ -58,15 +58,15 @@ declare_args() {
+   fieldtrial_testing_like_official_build = is_chrome_branded
+ 
   # libudev usage. This currently only affects the content layer.
-   use_udev = is_linux && !is_chromecast
+-  use_udev = is_linux && !is_chromecast
+  use_udev = is_linux && !is_chromecast && !is_bsd
 
 -  use_dbus = is_linux && !is_chromecast
 +  use_dbus = (is_linux || is_bsd) && !is_chromecast
@ -14,6 +17,6 @@
 
 -  use_gio = is_linux && !is_chromeos && !is_chromecast
 +  use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast
- 
-   # Whether or not to use external popup menu.
-   use_external_popup_menu = is_android || is_mac
+ }
+ #
+ # =============================================
--- a/www/chromium/files/patch-build_config_freetype_BUILD.gn
+++ b/www/chromium/files/patch-build_config_freetype_BUILD.gn
@ -0,0 +1,11 @@
+--- build/config/freetype/BUILD.gn.orig	2017-06-05 19:03:01 UTC
+++ build/config/freetype/BUILD.gn
+@@ -9,7 +9,7 @@ group("freetype") {
+     public_deps = [
+       "//third_party/freetype",
+     ]
+-  } else if (is_linux) {
+  } else if (is_linux || is_bsd) {
+     public_configs = [ "//build/linux:freetype_from_pkgconfig" ]
+   }
+ }
--- a/www/chromium/files/patch-build_config_sanitizers_BUILD.gn
+++ b/www/chromium/files/patch-build_config_sanitizers_BUILD.gn
@ -1,6 +1,6 @@
--- build/config/sanitizers/BUILD.gn.orig	2017-04-19 19:06:28 UTC
+--- build/config/sanitizers/BUILD.gn.orig	2017-06-05 19:03:01 UTC
 +++ build/config/sanitizers/BUILD.gn
-@@ -428,7 +428,7 @@ config("lsan_flags") {
+@@ -438,7 +438,7 @@ config("lsan_flags") {
 
 config("msan_flags") {
   if (is_msan) {
@ -9,7 +9,7 @@
     if (!defined(msan_blacklist_path)) {
       msan_blacklist_path =
           rebase_path("//tools/msan/blacklist.txt", root_build_dir)
-@@ -443,7 +443,7 @@ config("msan_flags") {
+@@ -453,7 +453,7 @@ config("msan_flags") {
 
 config("tsan_flags") {
   if (is_tsan) {
--- a/www/chromium/files/patch-build_config_ui.gni
+++ b/www/chromium/files/patch-build_config_ui.gni
@ -1,4 +1,4 @@
--- build/config/ui.gni.orig	2017-04-19 19:06:28 UTC
+--- build/config/ui.gni.orig	2017-06-05 19:03:01 UTC
 +++ build/config/ui.gni
@@ -31,10 +31,10 @@ declare_args() {
 
@ -10,15 +10,11 @@
   # Whether we should use glib, a low level C utility library.
 -  use_glib = is_linux
 +  use_glib = is_linux || is_bsd
+ }
 
-   # Indicates if Wayland display server support is enabled.
-   enable_wayland_server = is_chromeos
-@@ -55,17 +55,17 @@ declare_args() {
- 
- # Use GPU accelerated cross process image transport by default on linux builds
- # with the Aura window manager.
-ui_compositor_image_transport = use_aura && is_linux
-+ui_compositor_image_transport = use_aura && (is_linux || is_bsd)
+ declare_args() {
+@@ -48,14 +48,14 @@ declare_args() {
+ # These variables depend on other variables and can't be set externally.
 
 # Indicates if the UI toolkit depends on X11.
 -use_x11 = is_linux && !use_ozone
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@ -1,8 +1,8 @@
--- build/toolchain/gcc_toolchain.gni.orig	2017-04-19 19:06:28 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2017-06-05 19:03:01 UTC
 +++ build/toolchain/gcc_toolchain.gni
-@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a
- import("//build/toolchain/goma.gni")
- import("//build/toolchain/toolchain.gni")
+@@ -19,6 +19,11 @@ analyzer_wrapper =
+     rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
+                 root_build_dir) + " --mode=clang"
 
 +declare_args() {
 +  extra_cxxflags = ""
@ -12,7 +12,7 @@
 # This template defines a toolchain for something that works like gcc
 # (including clang).
 #
-@@ -483,10 +488,22 @@ template("clang_toolchain") {
+@@ -548,13 +553,22 @@ template("clang_toolchain") {
   }
 
   gcc_toolchain(target_name) {
@ -20,6 +20,9 @@
 -    cc = "$prefix/clang"
 -    cxx = "$prefix/clang++"
 -    ld = cxx
+-    readelf = "${toolprefix}readelf"
+-    ar = "${prefix}/llvm-ar"
+-    nm = "${toolprefix}nm"
 +    if (is_bsd) {
 +      cc = "${toolprefix}clang40"
 +      cxx = "${toolprefix}clang++40"
@ -33,20 +36,9 @@
 +      cxx = "$prefix/clang++"
 +      ld = cxx
 +      readelf = "${toolprefix}readelf"
-+      ar = "${toolprefix}ar"
+      ar = "${prefix}/llvm-ar"
 +      nm = "${toolprefix}nm"
 +    }
 
-     if (use_clang_static_analyzer) {
-       # Static analysis isn't supported under GOMA. See crbug.com/687245
-@@ -507,10 +524,6 @@ template("clang_toolchain") {
-                         root_build_dir)
-     }
- 
-    readelf = "${toolprefix}readelf"
-    ar = "${toolprefix}ar"
-    nm = "${toolprefix}nm"
-
-     forward_variables_from(invoker, [ "strip" ])
- 
-     toolchain_args = {
+     forward_variables_from(invoker,
+                            [
--- a/www/chromium/files/patch-cc_layers_scrollbarlayerimpl__base.cc
+++ b/www/chromium/files/patch-cc_layers_scrollbarlayerimpl__base.cc
@ -1,6 +1,6 @@
--- cc/layers/scrollbar_layer_impl_base.cc.orig	2017-04-19 19:06:28 UTC
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2017-06-05 19:03:01 UTC
 +++ cc/layers/scrollbar_layer_impl_base.cc
-@@ -174,8 +174,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
+@@ -175,8 +175,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
   int thumb_offset = TrackStart();
   if (maximum > 0) {
     float ratio = clamped_current_pos / maximum;
--- 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-04-19 19:06:28 UTC
+--- cc/trees/property_tree.cc.orig	2017-06-05 19:03:01 UTC
 +++ cc/trees/property_tree.cc
-@@ -1229,13 +1229,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO
+@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
 
   gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
 
--- 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-04-19 19:06:28 UTC
+--- chrome/BUILD.gn.orig	2017-06-05 19:03:01 UTC
 +++ chrome/BUILD.gn
-@@ -142,7 +142,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",
-@@ -223,7 +223,7 @@ if (!is_android && !is_mac) {
+@@ -225,7 +225,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",
-@@ -1647,7 +1647,7 @@ if (enable_resource_whitelist_generation
+@@ -1655,7 +1655,7 @@ if (enable_resource_whitelist_generation) {
   }
 }
 
--- a/www/chromium/files/patch-chrome_app_chromecommandids.h
+++ b/www/chromium/files/patch-chrome_app_chromecommandids.h
@ -1,6 +1,6 @@
--- chrome/app/chrome_command_ids.h.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/chrome_command_ids.h.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chrome_command_ids.h
-@@ -71,7 +71,7 @@
+@@ -67,7 +67,7 @@
 #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
 #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
 
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@ -1,6 +1,6 @@
--- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
+--- chrome/app/chrome_main.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chrome_main.cc
-@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
+@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** argv) {
   ALLOW_UNUSED_LOCAL(command_line);
 #endif
 
@ -15,5 +15,5 @@
 -#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
 +#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
 
- #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+ #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   version_info::Channel channel = chrome::GetChannel();
--- a/www/chromium/files/patch-chrome_app_chromemaindelegate.cc
+++ b/www/chromium/files/patch-chrome_app_chromemaindelegate.cc
@ -1,4 +1,4 @@
--- chrome/app/chrome_main_delegate.cc.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chrome_main_delegate.cc
@@ -89,7 +89,7 @@
 #include "chrome/app/chrome_crash_reporter_client.h"
@ -23,8 +23,8 @@
 #include "base/environment.h"
 #endif
 
-@@ -163,7 +163,7 @@ base::LazyInstance<ChromeContentBrowserC
-     LAZY_INSTANCE_INITIALIZER;
+@@ -164,7 +164,7 @@ base::LazyInstance<ChromeContentBrowserClient>::Destru
+     g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 #endif
 
 -#if defined(OS_POSIX)
@ -32,7 +32,7 @@
 base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
     LAZY_INSTANCE_INITIALIZER;
 #endif
-@@ -280,7 +280,7 @@ static void AdjustLinuxOOMScore(const st
+@@ -284,7 +284,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
 // and resources loaded.
 bool SubprocessNeedsResourceBundle(const std::string& process_type) {
   return
@ -41,7 +41,7 @@
       // The zygote process opens the resources for the renderers.
       process_type == switches::kZygoteProcess ||
 #endif
-@@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::Comm
+@@ -336,7 +336,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
 }
 #endif
 
@ -50,7 +50,7 @@
 void SIGTERMProfilingShutdown(int signal) {
   Profiling::Stop();
   struct sigaction sigact;
-@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command
+@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* 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.
-@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
       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 {
-@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom
+@@ -646,7 +646,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
       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 {
-@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -758,7 +758,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
 
@ -86,7 +86,7 @@
   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
 #endif
 
-@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -888,7 +888,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
   chrome::InitializePDF();
 #endif
 
@ -95,7 +95,7 @@
   // Zygote needs to call InitCrashReporter() in RunZygote().
   if (process_type != switches::kZygoteProcess) {
 #if defined(OS_ANDROID)
-@@ -899,7 +899,7 @@ void ChromeMainDelegate::PreSandboxStart
+@@ -903,7 +903,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
     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.
-@@ -1005,7 +1005,7 @@ bool ChromeMainDelegate::DelaySandboxIni
+@@ -1009,7 +1009,7 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
 #endif
   return process_type == switches::kRelauncherProcess;
 }
--- a/www/chromium/files/patch-chrome_app_chromemaindelegate.h
+++ b/www/chromium/files/patch-chrome_app_chromemaindelegate.h
@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.h.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/chrome_main_delegate.h.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chrome_main_delegate.h
-@@ -42,7 +42,7 @@ class ChromeMainDelegate : public conten
+@@ -42,7 +42,7 @@ class ChromeMainDelegate : public content::ContentMain
       const std::string& process_type) override;
   bool ShouldSendMachPort(const std::string& process_type) override;
   bool DelaySandboxInitialization(const std::string& process_type) override;
--- 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-04-19 19:06:28 UTC
+--- chrome/app/chromium_strings.grd.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/chromium_strings.grd
-@@ -891,7 +891,7 @@ Signing in anyway will merge Chromium in
+@@ -886,7 +886,7 @@ Signing in anyway will merge Chromium information like
       </message>
 
       <!-- ProcessSingleton -->
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@ -1,15 +1,6 @@
--- chrome/app/generated_resources.grd.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/generated_resources.grd.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/generated_resources.grd
-@@ -6535,7 +6535,7 @@ Keep your key file in a safe place. You 
-       <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
-           Right-to-left
-       </message>
-      <if expr="is_win or is_linux">
-+      <if expr="is_win or is_linux or is_bsd">
-         <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
-           Enable Input IME API
-         </message>
-@@ -9629,7 +9629,7 @@ I don't think this site should be blocke
+@@ -8084,7 +8084,7 @@ I don't think this site should be blocked!
       <message name="IDS_APPEARANCE_GROUP_NAME" desc="The title of the appearance group">
         Appearance
       </message>
@ -18,7 +9,7 @@
         <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
           Themes
         </message>
-@@ -9637,7 +9637,7 @@ I don't think this site should be blocke
+@@ -8092,7 +8092,7 @@ I don't think this site should be blocked!
       <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme">
         Reset to default theme
       </message>
@ -27,7 +18,7 @@
         <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme.">
           Use GTK+ theme
         </message>
-@@ -10903,7 +10903,7 @@ Tell us what happened exactly before you
+@@ -9347,7 +9347,7 @@ Tell us what happened exactly before you got the profi
         Set as default
       </message>
 
--- a/www/chromium/files/patch-chrome_app_googlechromestrings.grd
+++ b/www/chromium/files/patch-chrome_app_googlechromestrings.grd
@ -1,6 +1,6 @@
--- chrome/app/google_chrome_strings.grd.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/google_chrome_strings.grd.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/google_chrome_strings.grd
-@@ -892,7 +892,7 @@ Signing in anyway will merge Chrome info
+@@ -887,7 +887,7 @@ Signing in anyway will merge Chrome information like b
       </message>
 
       <!-- ProcessSingleton -->
--- a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
+++ b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
@ -1,6 +1,6 @@
--- chrome/app/mash/mash_runner.cc.orig	2017-04-19 19:06:28 UTC
+--- chrome/app/mash/mash_runner.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/mash/mash_runner.cc
-@@ -263,7 +263,7 @@ int MashMain() {
+@@ -302,7 +302,7 @@ int MashMain() {
   // TODO(sky): wire this up correctly.
   service_manager::InitializeLogging();
 
--- a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd
+++ b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd
@ -1,11 +0,0 @@
--- chrome/app/resources/locale_settings.grd.orig	2017-04-19 19:06:29 UTC
-+++ chrome/app/resources/locale_settings.grd
-@@ -151,7 +151,7 @@
-         55
-       </message>
- 
-      <if expr="is_win or is_linux or chromeos">
-+      <if expr="is_win or is_linux or chromeos or is_bsd">
-         <!-- The width of the ash/ChromeOS system tray menu in pixels. -->
-         <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true">
-           300
--- 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-04-19 19:06:29 UTC
+--- chrome/app/settings_strings.grdp.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/settings_strings.grdp
-@@ -240,7 +240,7 @@
+@@ -278,7 +278,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>
-@@ -254,7 +254,7 @@
+@@ -292,7 +292,7 @@
       Use Classic
     </message>
   </if>
--- a/www/chromium/files/patch-chrome_app_shutdownsignalhandlers__posix.cc
+++ b/www/chromium/files/patch-chrome_app_shutdownsignalhandlers__posix.cc
@ -1,4 +1,4 @@
--- chrome/app/shutdown_signal_handlers_posix.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/app/shutdown_signal_handlers_posix.cc
@@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers(
   g_pipe_pid = getpid();
@ -12,11 +12,11 @@
 #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
 #else
-@@ -191,6 +196,7 @@ void InstallShutdownSignalHandlers(
+@@ -190,6 +195,7 @@ void InstallShutdownSignalHandlers(
+   // shadow stacks) bloat the stack frames, so we need to increase the stack
   // size to avoid hitting the guard page.
   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
- #endif
 +#endif
+ #endif
   ShutdownDetector* detector = new ShutdownDetector(
       g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
-   // PlatformThread does not delete its delegate.
--- 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-04-19 19:06:29 UTC
-+++ chrome/browser/BUILD.gn
-@@ -2219,7 +2219,7 @@ split_static_library("browser") {
+--- chrome/browser/BUILD.gn.orig	2017-06-15 21:03:01.000000000 +0200
+++ chrome/browser/BUILD.gn	2017-06-18 05:06:25.091310000 +0200
+@@ -2296,7 +2296,7 @@
     deps += [ "//device/udev_linux" ]
   }
 
@ -9,7 +9,7 @@
     deps += [ "//third_party/speech-dispatcher" ]
   }
 
-@@ -3606,7 +3606,7 @@ split_static_library("browser") {
+@@ -3721,7 +3721,7 @@
     }
   }
 
@ -18,3 +18,21 @@
     if (use_aura) {
       deps += [ "//build/linux:fontconfig" ]
       if (use_dbus) {
+@@ -3734,7 +3734,7 @@
+     }
+   }
+ 
+-  if (is_linux || is_win || is_mac) {
+  if (is_linux || is_win || is_mac || is_bsd) {
+     sources += [
+       "payments/chrome_payment_request_delegate.cc",
+       "payments/chrome_payment_request_delegate.h",
+@@ -3744,7 +3744,7 @@
+     deps += [ "//components/payments/content" ]
+   }
+ 
+-  if (is_linux || is_win) {
+  if (is_linux || is_win || is_bsd) {
+     sources += [
+       "renderer_context_menu/spelling_options_submenu_observer.cc",
+       "renderer_context_menu/spelling_options_submenu_observer.h",
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@ -1,34 +1,32 @@
--- chrome/browser/about_flags.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/about_flags.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/browser/about_flags.cc
-@@ -856,7 +856,7 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
-      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
-                                switches::kDisableSmoothScrolling)},
-#if defined(USE_AURA) || defined(OS_LINUX)
-+#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD)
-     {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
-      IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
-      // Uses the system preference on Mac (a different implementation).
-@@ -1374,11 +1374,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1588,12 +1588,12 @@ const FeatureEntry kFeatureEntries[] = {
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
                                switches::kDisableTranslateNewUX)},
 #endif  // OS_MACOSX
 -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
-     {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
-      IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
+     {"translate-2016q2-ui", flag_descriptions::kTranslate2016q2UiName,
+      flag_descriptions::kTranslate2016q2UiDescription,
+      kOsCrOS | kOsWin | kOsLinux,
      FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
 -#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS
 +#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS || OS_BSD
-     {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
-      IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
+     {"translate-lang-by-ulp", flag_descriptions::kTranslateLanguageByUlpName,
+      flag_descriptions::kTranslateLanguageByUlpDescription, kOsAll,
      FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
-@@ -1802,7 +1802,7 @@ const FeatureEntry kFeatureEntries[] = {
-      IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
+@@ -2071,12 +2071,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},
 #endif  // ENABLE_EXTENSIONS
 -#if defined(OS_WIN) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-     {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
-      IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux,
+     {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName,
+      flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
+                                switches::kDisableInputImeAPI)},
+-#endif  // OS_WIN || OS_LINUX
+#endif  // OS_WIN || OS_LINUX || OS_BSD
+     {"enable-origin-trials", flag_descriptions::kOriginTrialsName,
+      flag_descriptions::kOriginTrialsDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kOriginTrials)},
--- a/www/chromium/files/patch-chrome_browser_afterstartuptask__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_afterstartuptask__utils.cc
@ -1,6 +1,6 @@
--- chrome/browser/after_startup_task_utils.cc.orig	2017-05-02 19:02:47 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig	2017-06-05 19:03:01 UTC
 +++ chrome/browser/after_startup_task_utils.cc
-@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStar
+@@ -99,7 +99,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue
 
 void SetBrowserStartupIsComplete() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
--- a/www/chromium/files/patch-chrome_browser_browserprocessimpl.cc
+++ b/www/chromium/files/patch-chrome_browser_browserprocessimpl.cc
@ -1,4 +1,4 @@
--- chrome/browser/browser_process_impl.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/browser_process_impl.cc
@@ -171,7 +171,7 @@
 #include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
@ -9,7 +9,7 @@
 #include "chrome/browser/memory/tab_manager.h"
 #endif
 
-@@ -789,7 +789,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_
+@@ -810,7 +810,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() {
 
 memory::TabManager* BrowserProcessImpl::GetTabManager() {
   DCHECK(CalledOnValidThread());
--- a/www/chromium/files/patch-chrome_browser_browserprocessimpl.h
+++ b/www/chromium/files/patch-chrome_browser_browserprocessimpl.h
@ -1,6 +1,6 @@
--- chrome/browser/browser_process_impl.h.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/browser_process_impl.h.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/browser_process_impl.h
-@@ -342,7 +342,7 @@ class BrowserProcessImpl : public Browse
+@@ -343,7 +343,7 @@ class BrowserProcessImpl : public BrowserProcess,
 
   std::unique_ptr<ChromeDeviceClient> device_client_;
 
--- 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-04-19 19:06:29 UTC
+--- chrome/browser/browser_resources.grd.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/browser_resources.grd
-@@ -383,7 +383,7 @@
+@@ -404,7 +404,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>
--- a/www/chromium/files/patch-chrome_browser_chromebrowsermain.cc
+++ b/www/chromium/files/patch-chrome_browser_chromebrowsermain.cc
@ -1,7 +1,7 @@
--- chrome/browser/chrome_browser_main.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -181,7 +181,7 @@
- #include "chrome/browser/lifetime/application_lifetime.h"
+@@ -183,7 +183,7 @@
+ #include "chrome/browser/feedback/feedback_profile_observer.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)
 
-@@ -276,7 +276,7 @@
+@@ -274,7 +274,7 @@
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -18,20 +18,19 @@
 #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
 #endif
 
-@@ -479,10 +479,10 @@ void RegisterComponentsForUpdate() {
+@@ -477,9 +477,9 @@ void RegisterComponentsForUpdate() {
 
 #if !defined(OS_ANDROID)
   RegisterPepperFlashComponent(cus);
 -#if !defined(OS_CHROMEOS)
 +#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
-   RegisterSwiftShaderComponent(cus);
   RegisterWidevineCdmComponent(cus);
 -#endif  // !defined(OS_CHROMEOS)
 +#endif  // !defined(OS_CHROMEOS) && !defined(OS_BSD)
 #endif  // !defined(OS_ANDROID)
 
 #if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
-@@ -764,7 +764,7 @@ void ChromeBrowserMainParts::SetupFieldT
+@@ -761,7 +761,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
   field_trial_synchronizer_ = new FieldTrialSynchronizer();
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
@ -39,8 +38,8 @@
 +    (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
   metrics::DesktopSessionDurationTracker::Initialize();
 #endif
- 
-@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr
+   metrics::RendererUptimeTracker::Initialize();
+@@ -1191,11 +1191,11 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   }
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 
@ -54,7 +53,7 @@
 
   // Initialize tracking synchronizer system.
   tracking_synchronizer_ = new metrics::TrackingSynchronizer(
-@@ -1387,7 +1387,7 @@ void ChromeBrowserMainParts::PreBrowserS
+@@ -1374,7 +1374,7 @@ void ChromeBrowserMainParts::PreBrowserStart() {
 
 // Start the tab manager here so that we give the most amount of time for the
 // other services to start up before we start adjusting the oom priority.
--- a/www/chromium/files/patch-chrome_browser_chromebrowsermain__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chromebrowsermain__linux.cc
@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PrePro
+@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
 void ChromeBrowserMainPartsLinux::PostProfileInit() {
   ChromeBrowserMainPartsPosix::PostProfileInit();
 
@ -16,7 +16,7 @@
   bluez::DBusThreadManagerLinux::Initialize();
   bluez::BluezDBusManager::Initialize(
       bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
-@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMa
+@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
 }
 
 void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
--- a/www/chromium/files/patch-chrome_browser_chromebrowsermain__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chromebrowsermain__posix.cc
@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
-@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMa
+@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
 void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
 #if defined(OS_CHROMEOS)
   NOTREACHED();  // Should not ever happen on ChromeOS.
--- a/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.cc
@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig	2017-04-19 19:06:29 UTC
-+++ chrome/browser/chrome_content_browser_client.cc
-@@ -244,7 +244,7 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig	2017-06-15 21:03:01.000000000 +0200
+++ chrome/browser/chrome_content_browser_client.cc	2017-06-18 04:59:41.793684000 +0200
+@@ -249,7 +249,7 @@
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
@ -9,16 +9,16 @@
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/android/app_hooks.h"
-@@ -265,7 +265,7 @@
+@@ -266,7 +266,7 @@
+ #include "chrome/browser/payments/payment_request_factory.h"
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
 #include "chrome/browser/webshare/share_service_impl.h"
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "base/debug/leak_annotations.h"
- #include "components/crash/content/app/breakpad_linux.h"
- #include "components/crash/content/browser/crash_handler_host_linux.h"
-@@ -289,7 +289,7 @@
+@@ -294,7 +294,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
 
-@@ -700,7 +700,7 @@ bool CertMatchesFilter(const net::X509Ce
+@@ -711,7 +711,7 @@
   return false;
 }
 
@ -36,7 +36,16 @@
 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
     const std::string& process_type) {
   base::FilePath dumps_path;
-@@ -1023,7 +1023,7 @@ content::BrowserMainParts* ChromeContent
+@@ -761,7 +761,7 @@
+ 
+   return -1;
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+@@ -1038,7 +1038,7 @@
   main_parts = new ChromeBrowserMainPartsMac(parameters);
 #elif defined(OS_CHROMEOS)
   main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
@ -45,7 +54,7 @@
   main_parts = new ChromeBrowserMainPartsLinux(parameters);
 #elif defined(OS_ANDROID)
   main_parts = new ChromeBrowserMainPartsAndroid(parameters);
-@@ -1039,7 +1039,7 @@ content::BrowserMainParts* ChromeContent
+@@ -1054,7 +1054,7 @@
   // Construct additional browser parts. Stages are called in the order in
   // which they are added.
 #if defined(TOOLKIT_VIEWS)
@ -54,7 +63,7 @@
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
 #else
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1680,7 +1680,7 @@ void ChromeContentBrowserClient::AppendE
+@@ -1704,7 +1704,7 @@
     command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                     client_info->client_id);
   }
@ -63,7 +72,7 @@
   if (breakpad::IsCrashReporterEnabled()) {
     std::string switch_value;
     std::unique_ptr<metrics::ClientInfo> client_info =
-@@ -2972,7 +2972,7 @@ void ChromeContentBrowserClient::GetAddi
+@@ -2982,7 +2982,7 @@
   }
 }
 
@ -72,7 +81,7 @@
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-@@ -3001,7 +3001,7 @@ void ChromeContentBrowserClient::GetAddi
+@@ -3011,7 +3011,7 @@
   }
 #endif  // defined(OS_ANDROID)
 }
@ -81,12 +90,12 @@
 
 #if defined(OS_WIN)
 base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
-@@ -3193,6 +3193,8 @@ void ChromeContentBrowserClient::Registe
-         base::Bind(&ForwardShareServiceRequest,
-                    web_contents->GetJavaInterfaces()->GetWeakPtr()));
+@@ -3219,7 +3219,7 @@
+   }
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   if (!ChromeOriginTrialPolicy().IsFeatureDisabled("WebShare")) {
+     registry->AddInterface(base::Bind(&ShareServiceImpl::Create));
   }
-+#elif defined(OS_BSD)
-+  NOTREACHED();
- #else
-   if (AreExperimentalWebPlatformFeaturesEnabled() &&
-       base::FeatureList::IsEnabled(features::kWebPayments)) {
--- a/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chromecontentbrowser__client.h
@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -270,12 +270,12 @@ class ChromeContentBrowserClient : publi
+@@ -271,12 +271,12 @@ class ChromeContentBrowserClient : public content::Con
       content::RenderFrameHost* render_frame_host,
       blink::WebPageVisibilityState* visibility_state) override;
 
--- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
+++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
@ -1,6 +1,6 @@
--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.cc
-@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
+@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool success,
       console_->SetColor(color);
       console_->Write(base::ASCIIToUTF16(result));
     }
--- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
+++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
@ -1,6 +1,6 @@
--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/diagnostics/diagnostics_writer.h
-@@ -19,7 +19,7 @@ class DiagnosticsWriter : public Diagnos
+@@ -19,7 +19,7 @@ class DiagnosticsWriter : public DiagnosticsModel::Obs
  public:
   // The type of formatting done by this writer.
   enum FormatType {
--- a/www/chromium/files/patch-chrome_browser_download_chromedownloadmanager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chromedownloadmanager__delegate.cc
@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -828,7 +828,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
         target_info->is_filetype_handled_safely)
       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
 
@ -9,7 +9,7 @@
     if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
 #endif
-@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDo
+@@ -842,7 +842,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
 
 bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
     const base::FilePath& path) {
--- 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-04-19 19:06:29 UTC
+--- chrome/browser/download/download_commands.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/download/download_commands.cc
-@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(
+@@ -219,7 +219,7 @@ bool DownloadCommands::IsCommandChecked(Command comman
       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());
-@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Co
+@@ -263,7 +263,7 @@ void DownloadCommands::ExecuteCommand(Command command)
       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_)
-@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() 
+@@ -376,7 +376,7 @@ Browser* DownloadCommands::GetBrowser() const {
   return browser_displayer.browser();
 }
 
@ -27,7 +27,7 @@
 bool DownloadCommands::IsDownloadPdf() const {
   base::FilePath path = download_item_->GetTargetFilePath();
   return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSyste
+@@ -393,7 +393,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
   return IsDownloadPdf() &&
          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
                                           : true);
--- 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-04-19 19:06:29 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2017-06-05 19:03:02 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
@ -9,7 +9,7 @@
   base::FilePath home_dir = base::GetHomeDir();
   if (download_path == home_dir) {
     return true;
-@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+@@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
                  GetDefaultDownloadDirectoryForProfile()));
 #endif  // defined(OS_CHROMEOS)
 
@ -18,7 +18,7 @@
   should_open_pdf_in_system_reader_ =
       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
 #endif
-@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs
+@@ -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
 }
-@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage
+@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
 }
 
 bool DownloadPrefs::IsAutoOpenUsed() const {
@ -36,7 +36,7 @@
   if (ShouldOpenPdfInSystemReader())
     return true;
 #endif
-@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
+@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
     return false;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);
@ -45,7 +45,7 @@
   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
     return true;
 #endif
-@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased
+@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
   SaveAutoOpenState();
 }
 
@ -54,7 +54,7 @@
 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
   if (should_open_pdf_in_system_reader_ == should_open)
     return;
-@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
+@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {
--- a/www/chromium/files/patch-chrome_browser_download_downloadshelfcontext__menu.cc
+++ b/www/chromium/files/patch-chrome_browser_download_downloadshelfcontext__menu.cc
@ -1,6 +1,6 @@
--- chrome/browser/download/download_shelf_context_menu.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/download/download_shelf_context_menu.cc
-@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu:
+@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
                    : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
           break;
         }
--- a/www/chromium/files/patch-chrome_browser_download_downloadstatusupdater.cc
+++ b/www/chromium/files/patch-chrome_browser_download_downloadstatusupdater.cc
@ -1,4 +1,4 @@
--- chrome/browser/download/download_status_updater.cc.orig	2017-05-02 19:02:47 UTC
+--- chrome/browser/download/download_status_updater.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/download/download_status_updater.cc
@@ -13,7 +13,7 @@
 #include "base/memory/ptr_util.h"
@ -9,7 +9,7 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
-@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUp
+@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(
 #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
 void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
     content::DownloadItem* download) {
--- 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-05-02 19:02:47 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1040,7 +1040,7 @@ static_library("extensions") {
+@@ -1033,7 +1033,7 @@ static_library("extensions") {
     sources -= [ "global_shortcut_listener_ozone.cc" ]
   }
 
@ -9,7 +9,7 @@
     deps += [ "//build/linux:fontconfig" ]
 
     if (use_dbus) {
-@@ -1100,7 +1100,7 @@ static_library("extensions") {
+@@ -1095,7 +1095,7 @@ static_library("extensions") {
     ]
   }
 
@ -18,16 +18,16 @@
     sources += [
       "api/input_ime/input_ime_api.cc",
       "api/input_ime/input_ime_api.h",
-@@ -1133,6 +1133,12 @@ static_library("extensions") {
-     defines += [ "ENABLE_HOTWORDING" ]
-   }
+@@ -1126,6 +1126,12 @@ static_library("extensions") {
 
+   if (enable_hotwording) {
+     defines += [ "ENABLE_HOTWORDING" ]
+  }
+
 +  if (is_bsd) {
 +    sources -= [
 +      "api/image_writer_private/removable_storage_provider_linux.cc",
 +    ]
-+  }
-+
+   }
+ 
   if (enable_service_discovery) {
-     sources += [
-       "api/mdns/dns_sd_delegate.cc",
--- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/activity_log/activity_log.cc
-@@ -48,7 +48,11 @@
+@@ -50,7 +50,11 @@
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/one_shot_event.h"
--- a/www/chromium/files/patch-chrome_browser_extensions_api_imagewriterprivate_imagewriterprivate__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_imagewriterprivate_imagewriterprivate__api.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
-@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDe
+@@ -167,10 +167,12 @@ ImageWriterPrivateListRemovableStorageDevicesFunction:
 }
 
 bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
--- 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-04-19 19:06:29 UTC
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/api/messaging/message_service.cc
-@@ -106,7 +106,7 @@ MessageService::PolicyPermission Message
+@@ -105,7 +105,7 @@ MessageService::PolicyPermission MessageService::IsNat
 
 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[] =
-@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNative
+@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp(
   if (!source)
     return;
 
@ -18,7 +18,7 @@
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(source);
   ExtensionWebContentsObserver* extension_web_contents_observer =
-@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNative
+@@ -446,12 +446,12 @@ void MessageService::OpenChannelToNativeApp(
   channel->opener->IncrementLazyKeepaliveCount();
 
   AddChannel(std::move(channel), receiver_port_id);
--- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chromeruntimeapi__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chromeruntimeapi__delegate.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2017-05-09 19:02:41 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -277,6 +277,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
+@@ -278,6 +278,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
     info->os = extensions::api::runtime::PLATFORM_OS_CROS;
   } else if (strcmp(os, "linux") == 0) {
     info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -84,7 +84,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
       settings_private::PrefType::PREF_TYPE_BOOLEAN;
   (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
       settings_private::PrefType::PREF_TYPE_BOOLEAN;
@ -9,7 +9,7 @@
   (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
       settings_private::PrefType::PREF_TYPE_BOOLEAN;
 #endif
-@@ -93,7 +93,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+@@ -94,7 +94,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
   // Appearance settings.
   (*s_whitelist)[::prefs::kCurrentThemeID] =
       settings_private::PrefType::PREF_TYPE_STRING;
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtcaudioprivate_webrtcaudioprivate__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtcaudioprivate_webrtcaudioprivate__api.cc
@ -0,0 +1,13 @@
+--- chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc.orig	2017-06-05 19:03:02 UTC
+++ chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
+@@ -563,7 +563,10 @@ bool WebrtcAudioPrivateSetAudioExperimentsFunction::Ru
+       return false;
+     }
+ 
+#if BUILDFLAG(ENABLE_WEBRTC)
+    // To workaround side effect of having 'enable_webrtc=false'
+     host->SetEchoCanceller3(*params->audio_experiments.enable_aec3);
+#endif
+   }
+ 
+   SendResponse(true);
--- a/www/chromium/files/patch-chrome_browser_extensions_bookmarkapphelper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_bookmarkapphelper.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/bookmark_app_helper.cc
-@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallati
+@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
 #if !defined(OS_MACOSX)
 #if !defined(USE_ASH)
   web_app::ShortcutLocations creation_locations;
--- a/www/chromium/files/patch-chrome_browser_extensions_browsercontextkeyedservicefactories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browsercontextkeyedservicefactories.cc
@ -1,4 +1,4 @@
--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-05-02 19:02:47 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -63,7 +63,7 @@
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #endif
 
-@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFac
+@@ -107,7 +107,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
 #if defined(OS_CHROMEOS)
   extensions::InputImeAPI::GetFactoryInstance();
   extensions::InputMethodAPI::GetFactoryInstance();
--- a/www/chromium/files/patch-chrome_browser_extensions_externalproviderimpl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_externalproviderimpl.cc
@ -1,6 +1,6 @@
--- chrome/browser/extensions/external_provider_impl.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -638,7 +638,7 @@ void ExternalProviderImpl::CreateExterna
+@@ -655,7 +655,7 @@ void ExternalProviderImpl::CreateExternalProviders(
         Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
         oem_extension_creation_flags));
   }
@ -9,7 +9,7 @@
   if (!profile->IsLegacySupervised()) {
     provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
         service,
-@@ -664,7 +664,7 @@ void ExternalProviderImpl::CreateExterna
+@@ -681,7 +681,7 @@ void ExternalProviderImpl::CreateExternalProviders(
         bundled_extension_creation_flags));
 
     // Define a per-user source of external extensions.
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@ -0,0 +1,19 @@
+--- chrome/browser/flag_descriptions.cc.orig	2017-06-05 19:03:02 UTC
+++ chrome/browser/flag_descriptions.cc
+@@ -1598,14 +1598,14 @@ const char kForceUiDirectionLtr[] = "Left-to-right";
+ 
+ const char kForceUiDirectionRtl[] = "Right-to-left";
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ const char kEnableInputImeApiName[] = "Enable Input IME API";
+ 
+ const char kEnableInputImeApiDescription[] =
+     "Enable the use of chrome.input.ime API.";
+ 
+-#endif  // defined(OS_WIN) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ const char kEnableGroupedHistoryName[] = "Group history by domain";
+ 
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@ -0,0 +1,20 @@
+--- chrome/browser/flag_descriptions.h.orig	2017-06-05 19:03:02 UTC
+++ chrome/browser/flag_descriptions.h
+@@ -1754,7 +1754,7 @@ extern const char kForceUiDirectionLtr[];
+ // Name for the option to force right-to-left UI direction mode.
+ extern const char kForceUiDirectionRtl[];
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // Name of the flag to enable che chrome.input.ime API.
+ extern const char kEnableInputImeApiName[];
+@@ -1762,7 +1762,7 @@ extern const char kEnableInputImeApiName[];
+ // Description of the flag to enable the chrome.input.ime API.
+ extern const char kEnableInputImeApiDescription[];
+ 
+-#endif  // defined(OS_WIN) || defined(OS_LINUX)
+#endif  // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ // Enables grouping websites by domain on chrome://history.
+ extern const char kEnableGroupedHistoryName[];
--- a/www/chromium/files/patch-chrome_browser_interstitials_chromecontrollerclient.cc
+++ b/www/chromium/files/patch-chrome_browser_interstitials_chromecontrollerclient.cc
@ -1,6 +1,6 @@
--- chrome/browser/interstitials/chrome_controller_client.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/interstitials/chrome_controller_client.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/interstitials/chrome_controller_client.cc
-@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre
+@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThread() {
 #if defined(OS_ANDROID)
   chrome::android::OpenDateAndTimeSettings();
 
@ -9,7 +9,7 @@
   struct ClockCommand {
     const char* const pathname;
     const char* const argument;
-@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControlle
+@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControllerClient() {}
 
 bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
--- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtpdevicemap__service.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtpdevicemap__service.cc
@ -1,6 +1,6 @@
--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil
+@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
     // Note that this initializes the delegate asynchronously, but since
     // the delegate will only be used from the IO thread, it is guaranteed
     // to be created before use of it expects it to be there.
--- a/www/chromium/files/patch-chrome_browser_media__galleries_mediafilesystem__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_mediafilesystem__registry.cc
@ -1,6 +1,6 @@
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFile
+@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
 // Constructor in 'private' section because depends on private class definition.
 MediaFileSystemRegistry::MediaFileSystemRegistry()
     : file_system_context_(new MediaFileSystemContextImpl) {
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@ -1,4 +1,4 @@
--- chrome/browser/memory_details.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/memory_details.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/memory_details.cc
@@ -35,7 +35,7 @@
 #include "extensions/features/features.h"
@ -9,7 +9,7 @@
 #include "content/public/browser/zygote_host_linux.h"
 #endif
 
-@@ -337,7 +337,7 @@ void MemoryDetails::CollectChildInfoOnUI
+@@ -344,7 +344,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
       process.titles.push_back(title);
     }
 
--- a/www/chromium/files/patch-chrome_browser_memorydetailslinux.cc
+++ b/www/chromium/files/patch-chrome_browser_memorydetailslinux.cc
@ -0,0 +1,14 @@
+--- chrome/browser/memory_details_linux.cc.orig	2017-06-05 19:03:02 UTC
+++ chrome/browser/memory_details_linux.cc
+@@ -71,9 +71,10 @@ ProcessData GetProcessDataMemoryInformation(
+     std::unique_ptr<base::ProcessMetrics> metrics(
+         base::ProcessMetrics::CreateProcessMetrics(pid));
+     metrics->GetWorkingSetKBytes(&pmi.working_set);
+#if !defined(OS_BSD)
+     pmi.num_open_fds = metrics->GetOpenFdCount();
+     pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit();
+-
+#endif
+     process_data.processes.push_back(pmi);
+   }
+   return process_data;
--- a/www/chromium/files/patch-chrome_browser_metrics_chromebrowsermainextraparts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chromebrowsermainextraparts__metrics.cc
@ -1,6 +1,6 @@
--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -42,12 +42,14 @@
+@@ -39,12 +39,14 @@
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include <gnu/libc-version.h>
--- a/www/chromium/files/patch-chrome_browser_net_asyncdnsfield__trial.cc
+++ b/www/chromium/files/patch-chrome_browser_net_asyncdnsfield__trial.cc
@ -1,6 +1,6 @@
--- chrome/browser/net/async_dns_field_trial.cc.orig	2017-04-19 19:06:29 UTC
+--- chrome/browser/net/async_dns_field_trial.cc.orig	2017-06-05 19:03:02 UTC
 +++ chrome/browser/net/async_dns_field_trial.cc
-@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource sour
+@@ -61,7 +61,7 @@ void HistogramPrefSource(PrefSource source, bool enabl
 }  // namespace
 
 bool ConfigureAsyncDnsFieldTrial() {
--- a/Show more
+++ b/Show more