Index: head/www/chromium/Makefile
===================================================================
--- head/www/chromium/Makefile	(revision 444184)
+++ head/www/chromium/Makefile	(revision 444185)
@@ -1,288 +1,288 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	59.0.3071.104
+PORTVERSION=	59.0.3071.109
 CATEGORIES=	www
 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
 COMMENT=	Google web browser based on WebKit
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gperf:devel/gperf \
 		clang40:devel/llvm40 \
 		yasm:devel/yasm \
 		python:lang/python \
 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
 		bash:shells/bash \
 		flock:sysutils/flock \
 		node:www/node \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
 
 LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libcairo.so:graphics/cairo \
 		libdrm.so:graphics/libdrm \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libxml2.so:textproc/libxml2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf
 
 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 dconf glib20 gtk20 gtk30 libxml2 libxslt
 MAKE_ARGS=	-C out/${BUILDTYPE}
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
 # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	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 \
 		use_gtk3=true \
 		use_lld=true \
 		use_sysroot=false \
 		use_system_libjpeg=true \
 		use_system_sqlite=false   # chrome has additional patches
 # TODO: investigate building with these options:
 # use_system_icu use_system_harfbuzz use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
 
 # FreeBSD Chromium Api Key
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 # Note: these are for FreeBSD use ONLY. For your own distribution,
 # please get your own set of keys.
 GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
 		google_default_client_id="996322985003.apps.googleusercontent.com" \
 		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
 
 SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=	CODECS GCONF KERBEROS DRIVER
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=		AUDIO TESTS
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_GROUP_TESTS=	DEBUG TEST
 
 OPTIONS_DEFAULT=	ALSA CODECS DRIVER GCONF KERBEROS
 OPTIONS_SUB=		yes
 
 GCONF_USE=	GNOME=gconf2
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 DRIVER_MAKE_ARGS=chromedriver
 TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
 GN_ARGS+=	use_alsa=true
 .else
 GN_ARGS+=	use_alsa=false
 .endif
 
 .if ${PORT_OPTIONS:MCODECS}
 GN_ARGS+=	ffmpeg_branding="Chrome"
 GN_ARGS+=	proprietary_codecs=true
 GN_ARGS+=	enable_hevc_demuxing=true
 .else
 GN_ARGS+=	ffmpeg_branding="Chromium"
 GN_ARGS+=	proprietary_codecs=false
 GN_ARGS+=	enable_hevc_demuxing=false
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 BUILDTYPE=	Debug
 GN_ARGS+=	is_debug=true
 GN_BOOTSTRAP_FLAGS+=	--debug
 MAKE_ENV+=	V=1
 .else
 BUILDTYPE=	Release
 GN_ARGS+=	is_debug=false
 GN_ARGS+=	symbol_level=0
 GN_ARGS+=	remove_webcore_debug_symbols=true
 .endif
 
 .if ${PORT_OPTIONS:MGCONF}
 GN_ARGS+=	use_gconf=true
 .else
 GN_ARGS+=	use_gconf=false
 .endif
 
 .if ${PORT_OPTIONS:MKERBEROS}
 GN_ARGS+=	use_kerberos=true
 .else
 GN_ARGS+=	use_kerberos=false
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 GN_ARGS+=	use_pulseaudio=true
 .else
 GN_ARGS+=	use_pulseaudio=false
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
 .include "Makefile.tests"
 ALL_TARGET+=	${TEST_TARGETS}
 .endif
 
 .include <bsd.port.pre.mk>
 
 CC=		clang40
 CXX=		clang++40
 #optionally set AR, LD, NM, READELF ?
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 # TODO: move this big extra to small ones
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 
 # Work around base r261801
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508
 GN_ARGS+=	extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory,"
 .if ${PORT_OPTIONS:MDEBUG}
 	@${ECHO_MSG} "lots of free diskspace (~ 40GB)"
 	@${ECHO_MSG} "and no less then 16GB of memory for linking."
 .else
 	@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
 .endif
 	@${ECHO_MSG}
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shippen ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE}
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 	cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node
 
 test regression-test: build
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .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
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
 .for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \
 	resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \
 	views_mus_resources
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \
 		${STAGEDIR}${DATADIR}
 .endfor
 .for d in icudtl.dat natives_blob.bin snapshot_blob.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${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
 .endif
 
 .include <bsd.port.post.mk>
Index: head/www/chromium/Makefile.tests
===================================================================
--- head/www/chromium/Makefile.tests	(revision 444184)
+++ head/www/chromium/Makefile.tests	(revision 444185)
@@ -1,20 +1,20 @@
 #$FreeBSD$
+#net_unittests : fatal error: 'sys/epoll.h' file not found
 #telemetry_unittests : unknown ninja target
 TEST_TARGETS=	base_unittests \
 		crypto_unittests \
 		cacheinvalidation_unittests \
 		gpu_unittests \
 		printing_unittests \
 		sql_unittests \
 		content_unittests \
 		cc_unittests \
 		url_unittests \
 		compositor_unittests \
 		ipc_tests \
 		dbus_unittests \
-		net_unittests \
 		media_unittests \
 		chromedriver_unittests \
 		chromedriver_tests \
 		browser_tests \
 		unit_tests
Index: head/www/chromium/distinfo
===================================================================
--- head/www/chromium/distinfo	(revision 444184)
+++ head/www/chromium/distinfo	(revision 444185)
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1498132680
+SHA256 (chromium-59.0.3071.109.tar.xz) = 83faeb3537428d83728258b28e907caaee6e6572bcd7d9b9a5f6009e7ea758d9
+SIZE (chromium-59.0.3071.109.tar.xz) = 531839168
+SHA256 (chromium-59.0.3071.109-testdata.tar.xz) = 211447bd78861623329ab39f6611b7caccc69c483d616adcd9610def524699b0
+SIZE (chromium-59.0.3071.109-testdata.tar.xz) = 124235432
Index: head/www/chromium/files/patch-base_logging__unittest.cc
===================================================================
--- head/www/chromium/files/patch-base_logging__unittest.cc	(nonexistent)
+++ head/www/chromium/files/patch-base_logging__unittest.cc	(revision 444185)
@@ -0,0 +1,11 @@
+--- base/logging_unittest.cc.orig	2017-06-21 19:47:24.089128000 +0200
++++ base/logging_unittest.cc	2017-06-21 20:02:08.177123000 +0200
+@@ -272,7 +272,7 @@
+   // need the arch-specific boilerplate below, which is inspired by breakpad.
+   // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
+   uintptr_t crash_addr = 0;
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+   crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
+ #else  // OS_POSIX && !OS_MACOSX
+   struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr);

Property changes on: head/www/chromium/files/patch-base_logging__unittest.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/chromium/files/patch-chrome_test_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-chrome_test_BUILD.gn	(revision 444184)
+++ head/www/chromium/files/patch-chrome_test_BUILD.gn	(revision 444185)
@@ -1,167 +1,174 @@
---- chrome/test/BUILD.gn.orig	2017-06-05 19:03:04 UTC
-+++ chrome/test/BUILD.gn
-@@ -192,7 +192,7 @@ static_library("test_support") {
+--- chrome/test/BUILD.gn.orig	2017-06-15 21:03:02.000000000 +0200
++++ chrome/test/BUILD.gn	2017-06-22 05:09:51.612311000 +0200
+@@ -192,7 +192,7 @@
      ]
    }
  
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      public_deps += [ "//crypto:platform" ]
    }
    if (is_mac) {
-@@ -454,7 +454,7 @@ if (!is_android) {
+@@ -454,7 +454,7 @@
        "$root_out_dir/test_page.css.mock-http-headers",
        "$root_out_dir/ui_test.pak",
      ]
 -    if (is_linux || is_win) {
 +    if (is_linux || is_bsd || is_win) {
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -463,7 +463,7 @@ if (!is_android) {
+@@ -463,7 +463,7 @@
          "$root_out_dir/resources.pak",
        ]
      }
 -    if (is_linux) {
 +    if (is_linux || is_bsd) {
        data += [ "$root_out_dir/libppapi_tests.so" ]
      }
  
-@@ -570,7 +570,7 @@ if (!is_android) {
+@@ -570,7 +570,7 @@
            "base/interactive_test_utils_views.cc",
          ]
        }
 -      if (is_linux) {
 +      if (is_linux || is_bsd) {
          if (!is_chromeos) {
            # Desktop linux.
            sources -= [
-@@ -2044,14 +2044,14 @@ test("browser_tests") {
+@@ -2044,14 +2044,14 @@
          sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ]
          deps += [ "//chrome/browser/chromeos" ]
          data_deps += [ "//third_party/liblouis:liblouis_test_data" ]
 -      } else if (is_linux || is_win) {
 +      } else if (is_linux || is_bsd || is_win) {
          sources += [
            "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc",
            "../browser/ui/views/ime/ime_window_browsertest.cc",
          ]
        }
  
 -      if (is_win || is_linux) {
 +      if (is_win || is_linux || is_bsd) {
          sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ]
          data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ]
        }
-@@ -2063,7 +2063,7 @@ test("browser_tests") {
+@@ -2063,7 +2063,7 @@
          configs +=
              [ "//build/config/win:default_large_module_incremental_linking" ]
        }
 -      if (is_linux) {
 +      if (is_linux || is_bsd) {
          data_deps += [ "//components/nacl/loader:nacl_helper" ]
  
          if (enable_nacl_nonsfi) {
-@@ -2200,7 +2200,7 @@ test("browser_tests") {
+@@ -2200,7 +2200,7 @@
        }
      }
  
 -    if (is_linux && !is_component_build) {
 +    if ((is_linux || is_bsd) && !is_component_build) {
        # Set rpath to find the CDM adapter even in a non-component build.
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
      }
-@@ -2430,7 +2430,7 @@ test("browser_tests") {
+@@ -2430,7 +2430,7 @@
        if (toolkit_views) {
          sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
        }
 -      if (is_win || is_linux) {
 +      if (is_win || is_linux || is_bsd) {
          sources +=
              [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
        }
-@@ -2620,7 +2620,7 @@ test("browser_tests") {
+@@ -2620,7 +2620,7 @@
          "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc",
        ]
      }
 -    if (is_mac || is_win || (is_linux && !is_chromeos)) {
 +    if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) {
        sources += [
          # Tests for non mobile and non CrOS (includes Linux, Win, Mac).
          "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc",
-@@ -2802,7 +2802,7 @@ if (!is_android) {
+@@ -2802,7 +2802,7 @@
        "//testing/xvfb.py",
      ]
  
 -    if (is_linux || is_win) {
 +    if (is_linux || is_bsd || is_win) {
        data += [
          "$root_out_dir/chrome_100_percent.pak",
          "$root_out_dir/chrome_200_percent.pak",
-@@ -3504,7 +3504,7 @@ test("unit_tests") {
+@@ -3504,9 +3504,14 @@
        "$root_out_dir/resources.pak",
      ]
    }
 -  if (is_linux || is_win) {
 +  if (is_linux || is_bsd || is_win) {
      data += [ "$root_out_dir/chrome_200_percent.pak" ]
    }
++
++  if (is_bsd) {
++    sources -= [ "../common/component_flash_hint_file_linux_unittest.cc" ]
++  }
++  
    if (is_win) {
-@@ -4234,7 +4234,7 @@ test("unit_tests") {
+     data_deps += [ "//chrome" ]
+     data += [ "$root_out_dir/chrome.exe" ]
+@@ -4234,7 +4239,7 @@
        "//ui/wm",
      ]
    }
 -  if (!is_chromeos && is_linux) {
 +  if (!is_chromeos && (is_linux || is_bsd)) {
      sources += [
        "../browser/password_manager/native_backend_kwallet_x_unittest.cc",
        "../browser/shell_integration_linux_unittest.cc",
-@@ -4256,7 +4256,7 @@ test("unit_tests") {
+@@ -4256,7 +4261,7 @@
    if (use_gio) {
      deps += [ "//build/linux/libgio" ]
    }
 -  if (!is_chromeos && !use_ozone && is_linux) {
 +  if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) {
      deps += [ "//chrome/browser/ui/libgtkui" ]
    }
  
-@@ -4537,18 +4537,18 @@ test("unit_tests") {
+@@ -4537,18 +4542,18 @@
        "//components/os_crypt:gnome_keyring_direct",
      ]
    }
 -  if (is_linux && !is_chromeos && !use_ozone) {
 +  if ((is_linux || is_bsd) && !is_chromeos && !use_ozone) {
      sources +=
          [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
      deps += [ "//third_party/libsecret" ]
    }
 -  if (is_linux && use_aura) {
 +  if ((is_linux || is_bsd) && use_aura) {
      deps += [ "//ui/aura:test_support" ]
      if (use_dbus) {
        deps += [ "//dbus:test_support" ]
      }
    }
 -  if (is_linux && is_chrome_branded && current_cpu == "x86") {
 +  if ((is_linux || is_bsd)  && is_chrome_branded && current_cpu == "x86") {
      ldflags = [ "-Wl,--strip-debug" ]
    }
    if (is_mac) {
-@@ -5045,7 +5045,7 @@ if (safe_browsing_mode == 1 && is_mac) {
+@@ -5045,7 +5050,7 @@
    }
  }
  
 -if (!is_android) {
 +if (!is_android && !is_bsd) {
    # TODO(609855): Make this compile on Android and run on the bots.
    test("chrome_app_unittests") {
      sources = [
-@@ -5071,7 +5071,7 @@ if (!is_android) {
+@@ -5071,7 +5076,7 @@
    }
  }
  
 -if (!is_android && !is_chromecast) {
 +if (!is_android && !is_chromecast && !is_bsd) {
    test("performance_browser_tests") {
      sources = [
        "../app/chrome_version.rc.version",
Index: head/www/chromium/files/patch-components_os__crypt_os__crypt.h
===================================================================
--- head/www/chromium/files/patch-components_os__crypt_os__crypt.h	(revision 444184)
+++ head/www/chromium/files/patch-components_os__crypt_os__crypt.h	(revision 444185)
@@ -1,20 +1,29 @@
---- components/os_crypt/os_crypt.h.orig	2017-04-19 19:06:32 UTC
-+++ components/os_crypt/os_crypt.h
+--- components/os_crypt/os_crypt.h.orig	2017-06-15 21:03:04.000000000 +0200
++++ components/os_crypt/os_crypt.h	2017-06-21 19:21:25.185823000 +0200
 @@ -13,7 +13,7 @@
  #include "base/strings/string16.h"
  #include "build/build_config.h"
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
  #include "components/os_crypt/key_storage_linux.h"
  #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
  
 @@ -23,7 +23,7 @@
  // true for Linux, if a password management tool is available.
  class OSCrypt {
   public:
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
    // If |store_type| is a known password store, we will attempt to use it.
    // In any other case, we default to auto-detecting the store.
    // This should not be changed after OSCrypt has been used.
+@@ -71,7 +71,7 @@
+   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
+ };
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST)
+ // For unit testing purposes, inject methods to be used.
+ // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
+ // If the provider returns |nullptr|, a hardcoded password will be used.
Index: head/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
===================================================================
--- head/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc	(nonexistent)
+++ head/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc	(revision 444185)
@@ -0,0 +1,20 @@
+--- components/os_crypt/os_crypt_unittest.cc.orig	2017-06-21 19:22:48.122268000 +0200
++++ components/os_crypt/os_crypt_unittest.cc	2017-06-21 19:23:55.247270000 +0200
+@@ -18,7 +18,7 @@
+ #include "components/os_crypt/os_crypt_mocker.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "components/os_crypt/os_crypt_mocker_linux.h"
+ #endif
+ 
+@@ -151,7 +151,7 @@
+ class OSCryptConcurrencyTest : public testing::Test {
+  public:
+   OSCryptConcurrencyTest() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     // Mock the key storage, but not the process of getting the passwords.
+     UseMockKeyStorageForTesting(
+         []() -> KeyStorageLinux* { return OSCryptMockerLinux::GetInstance(); },

Property changes on: head/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/chromium/files/patch-content_test_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-content_test_BUILD.gn	(revision 444184)
+++ head/www/chromium/files/patch-content_test_BUILD.gn	(revision 444185)
@@ -1,38 +1,52 @@
---- content/test/BUILD.gn.orig	2017-06-05 19:03:07 UTC
-+++ content/test/BUILD.gn
-@@ -815,7 +815,7 @@ test("content_browsertests") {
+--- content/test/BUILD.gn.orig	2017-06-15 21:03:05.000000000 +0200
++++ content/test/BUILD.gn	2017-06-22 13:52:52.066701000 +0200
+@@ -815,7 +815,7 @@
      }
    }
  
 -  if (is_android || is_linux || is_mac || is_win) {
 +  if (is_android || is_linux || is_bsd || is_mac || is_win) {
      data += [
        "$root_out_dir/content_shell.pak",
        "data/",
-@@ -1442,7 +1442,7 @@ test("content_unittests") {
-     sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
+@@ -1435,14 +1435,19 @@
+     sources += [ "../common/quarantine/quarantine_unittest.cc" ]
    }
  
++  if (is_bsd) {
++    sources -= [
++      "../browser/memory/test_memory_monitor.cc",
++      "../common/quarantine/quarantine_linux_unittest.cc",
++    ]
++  }
++
+   # ChromeOS also defines linux but their memory-monitors conflict.
+   if (is_chromeos) {
+     sources += [ "../browser/memory/memory_monitor_chromeos_unittest.cc" ]
+-  } else {
+-    sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ]
+   }
+ 
 -  if (is_android || is_linux || is_mac || is_win) {
 +  if (is_android || is_linux || is_bsd || is_mac || is_win) {
      data = [
        "$root_out_dir/content_shell.pak",
        "data/",
-@@ -1657,7 +1657,7 @@ test("content_unittests") {
+@@ -1657,7 +1662,7 @@
        "//ui/shell_dialogs:shell_dialogs",
      ]
  
 -    if (is_linux || is_mac || is_win) {
 +    if (is_linux || is_bsd || is_mac || is_win) {
        sources +=
            [ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
        deps += [ "//third_party/webrtc/modules/desktop_capture" ]
-@@ -1695,7 +1695,7 @@ test("content_unittests") {
+@@ -1695,7 +1700,7 @@
      }
    }
  
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      if (use_dbus) {
        deps += [ "//dbus:test_support" ]
      }
Index: head/www/chromium/files/patch-content_test_suite.cc
===================================================================
--- head/www/chromium/files/patch-content_test_suite.cc	(nonexistent)
+++ head/www/chromium/files/patch-content_test_suite.cc	(revision 444185)
@@ -0,0 +1,18 @@
+--- content/test/content_test_suite.cc.orig	2017-06-22 13:36:32.924786000 +0200
++++ content/test/content_test_suite.cc	2017-06-22 13:39:16.176707000 +0200
+@@ -85,6 +85,7 @@
+   // to initialize GL, so don't do it here.
+   bool is_child_process = base::CommandLine::ForCurrentProcess()->HasSwitch(
+       switches::kTestChildProcess);
++#if !defined(OS_BSD)
+   if (!is_child_process) {
+     gpu::GPUInfo gpu_info;
+     gpu::CollectBasicGraphicsInfo(&gpu_info);
+@@ -92,6 +93,7 @@
+                                       base::CommandLine::ForCurrentProcess());
+     gl::GLSurfaceTestSupport::InitializeOneOff();
+   }
++#endif
+   testing::TestEventListeners& listeners =
+       testing::UnitTest::GetInstance()->listeners();
+   listeners.Append(new TestInitializationListener);

Property changes on: head/www/chromium/files/patch-content_test_suite.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/chromium/files/patch-gpu_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-gpu_BUILD.gn	(revision 444184)
+++ head/www/chromium/files/patch-gpu_BUILD.gn	(revision 444185)
@@ -1,11 +1,22 @@
---- gpu/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/BUILD.gn
-@@ -96,7 +96,7 @@ test("command_buffer_gles2_tests") {
+--- gpu/BUILD.gn.orig	2017-06-15 21:03:06.000000000 +0200
++++ gpu/BUILD.gn	2017-06-22 12:14:14.034866000 +0200
+@@ -96,7 +96,7 @@
      libs += [ "android" ]
      deps += [ "//ui/android:ui_java" ]
    }
 -  if (is_linux && !is_component_build) {
 +  if ((is_linux || is_bsd) && !is_component_build) {
      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
    }
  }
+@@ -321,6 +321,10 @@
+     "ipc/common/struct_traits_unittest.cc",
+     "ipc/host/shader_disk_cache_unittest.cc",
+   ]
++
++  if (is_bsd) {
++    sources -= [ "config/gpu_util_unittest.cc" ]
++  }
+ 
+   if (is_mac) {
+     sources += [ "ipc/client/gpu_memory_buffer_impl_io_surface_unittest.cc" ]
Index: head/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn
===================================================================
--- head/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn	(revision 444184)
+++ head/www/chromium/files/patch-gpu_gles2__conform__support_BUILD.gn	(revision 444185)
@@ -1,20 +1,11 @@
---- gpu/gles2_conform_support/BUILD.gn.orig	2017-04-19 19:06:34 UTC
-+++ gpu/gles2_conform_support/BUILD.gn
-@@ -60,7 +60,7 @@ executable("gles2_conform_support") {
+--- gpu/gles2_conform_support/BUILD.gn.orig	2017-06-21 00:03:18.000000000 +0200
++++ gpu/gles2_conform_support/BUILD.gn	2017-06-22 14:00:33.510247000 +0200
+@@ -60,7 +60,7 @@
      "//gpu/gles2_conform_support/egl",
      "//ui/gl",
    ]
 -  if (is_linux) {
 +  if (is_linux || is_bsd) {
      sources += [
        "native/egl_native_aura.cc",
        "native/egl_native_x11.cc",
-@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) {
-       # Must be done this way for warning flags to be ordered correctly.
-       ":gles2_conform_test_warnings",
-     ]
--    if (is_linux) {
-+    if (is_linux || is_bsd) {
-       if (!is_chromeos) {
-         deps += [ "//build/config/linux/gtk2" ]
-       }