svn commit: r354687 - in head/www/chromium: . files

Rene Ladan rene at FreeBSD.org
Tue May 20 20:47:31 UTC 2014 

Author: rene
Date: Tue May 20 20:47:17 2014
New Revision: 354687
URL: http://svnweb.freebsd.org/changeset/ports/354687
QAT: https://qat.redports.org/buildarchive/r354687/

Log:
  Update to 35.0.1916.114
  
  Changes include:
  - More developer control over touch input
  - New JavaScript features
  - Unprefixed Shadow DOM
  - A number of new apps/extension APIs
  - Lots of under the hood changes for stability and performance
  
  MFH:		2014Q2
  Security:	http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html

Added:
  head/www/chromium/files/patch-chrome__app__chromium_strings.grd   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h   (contents, props changed)
  head/www/chromium/files/patch-chrome__chrome_tests.gypi   (contents, props changed)
  head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi   (contents, props changed)
  head/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-base__file_util_posix.cc
  head/www/chromium/files/patch-base__process__process_handle_freebsd.cc
  head/www/chromium/files/patch-base__process__process_iterator.h
  head/www/chromium/files/patch-build__gyp_chromium
  head/www/chromium/files/patch-net__quic__congestion_control__tcp_cubic_sender.cc
  head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
Modified:
  head/www/chromium/Makefile
  head/www/chromium/Makefile.tests
  head/www/chromium/distinfo
  head/www/chromium/files/patch-base__base.gyp
  head/www/chromium/files/patch-base__base.gypi
  head/www/chromium/files/patch-base__debug__stack_trace_posix.cc
  head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
  head/www/chromium/files/patch-base__process__internal_linux.h
  head/www/chromium/files/patch-base__process__memory_unittest.cc
  head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
  head/www/chromium/files/patch-base__process__process_metrics.h
  head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
  head/www/chromium/files/patch-base__security_unittest.cc
  head/www/chromium/files/patch-base__strings__safe_sprintf.cc
  head/www/chromium/files/patch-base__sys_info_freebsd.cc
  head/www/chromium/files/patch-base__sys_info_posix.cc
  head/www/chromium/files/patch-base__test__expectations__expectation.cc
  head/www/chromium/files/patch-base__test__launcher__test_launcher.cc
  head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
  head/www/chromium/files/patch-build__common.gypi
  head/www/chromium/files/patch-cc__layers__layer.cc
  head/www/chromium/files/patch-cc__layers__layer_impl.cc
  head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
  head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
  head/www/chromium/files/patch-chrome__browser__about_flags.cc
  head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
  head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
  head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
  head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
  head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
  head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
  head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
  head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
  head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
  head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
  head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
  head/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
  head/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
  head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
  head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
  head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
  head/www/chromium/files/patch-chrome__browser__memory_details.cc
  head/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
  head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
  head/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
  head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
  head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
  head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
  head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
  head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
  head/www/chromium/files/patch-chrome__chrome_browser.gypi
  head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
  head/www/chromium/files/patch-chrome__common__chrome_paths.cc
  head/www/chromium/files/patch-chrome__common__chrome_paths.h
  head/www/chromium/files/patch-chrome__common__chrome_switches.cc
  head/www/chromium/files/patch-chrome__common__chrome_switches.h
  head/www/chromium/files/patch-chrome__common__pref_names.cc
  head/www/chromium/files/patch-chrome__common__pref_names.h
  head/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
  head/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
  head/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
  head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
  head/www/chromium/files/patch-chrome__test__perf__perf_test.cc
  head/www/chromium/files/patch-chrome__test__ui__ui_test.cc
  head/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
  head/www/chromium/files/patch-components__policy__resources__policy_templates.json
  head/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
  head/www/chromium/files/patch-components__storage_monitor.gypi
  head/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
  head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
  head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
  head/www/chromium/files/patch-content__app__content_main_runner.cc
  head/www/chromium/files/patch-content__browser__browser_main_loop.cc
  head/www/chromium/files/patch-content__browser__child_process_launcher.cc
  head/www/chromium/files/patch-content__browser__download__base_file.cc
  head/www/chromium/files/patch-content__browser__download__base_file_linux.cc
  head/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
  head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
  head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
  head/www/chromium/files/patch-content__common__set_process_title_linux.cc
  head/www/chromium/files/patch-content__common__set_process_title_linux.h
  head/www/chromium/files/patch-content__content_browser.gypi
  head/www/chromium/files/patch-content__content_common.gypi
  head/www/chromium/files/patch-content__content_tests.gypi
  head/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
  head/www/chromium/files/patch-content__public__test__browser_test_base.cc
  head/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
  head/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
  head/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
  head/www/chromium/files/patch-content__renderer__render_process_impl.cc
  head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
  head/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
  head/www/chromium/files/patch-crypto__nss_util.cc
  head/www/chromium/files/patch-device__hid__hid.gyp
  head/www/chromium/files/patch-device__serial__serial.gyp
  head/www/chromium/files/patch-gpu__config__gpu_control_list.cc
  head/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
  head/www/chromium/files/patch-gpu__config__gpu_test_config.cc
  head/www/chromium/files/patch-gpu__gpu_config.gypi
  head/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
  head/www/chromium/files/patch-media__base__audio_splicer.cc
  head/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
  head/www/chromium/files/patch-media__media.gyp
  head/www/chromium/files/patch-native_client__build__common.gypi
  head/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
  head/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
  head/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
  head/www/chromium/files/patch-net__base__dns_reloader.cc
  head/www/chromium/files/patch-net__base__mime_util_unittest.cc
  head/www/chromium/files/patch-net__base__net_util.h
  head/www/chromium/files/patch-net__base__network_change_notifier.cc
  head/www/chromium/files/patch-net__dns__address_sorter_posix.cc
  head/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
  head/www/chromium/files/patch-net__dns__dns_session.cc
  head/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
  head/www/chromium/files/patch-net__net.gyp
  head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
  head/www/chromium/files/patch-net__proxy__proxy_service.cc
  head/www/chromium/files/patch-net__socket__socks5_client_socket.cc
  head/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
  head/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
  head/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
  head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
  head/www/chromium/files/patch-printing__printing.gyp
  head/www/chromium/files/patch-skia__skia_common.gypi
  head/www/chromium/files/patch-sync__util__get_session_name.cc
  head/www/chromium/files/patch-sync__util__get_session_name_linux.cc
  head/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
  head/www/chromium/files/patch-testing__gtest__src__gtest.cc
  head/www/chromium/files/patch-third_party__WebKit__Source__config.h
  head/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
  head/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
  head/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
  head/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
  head/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
  head/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
  head/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
  head/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
  head/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
  head/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
  head/www/chromium/files/patch-third_party__libusb__libusb.gyp
  head/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
  head/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
  head/www/chromium/files/patch-third_party__webrtc__build__common.gypi
  head/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
  head/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
  head/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
  head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
  head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
  head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
  head/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
  head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
  head/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
  head/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
  head/www/chromium/files/patch-ui__events__event_switches.cc
  head/www/chromium/files/patch-ui__events__event_switches.h
  head/www/chromium/files/patch-ui__gl__gl.gyp
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/Makefile	Tue May 20 20:47:17 2014	(r354687)
@@ -4,7 +4,7 @@
 #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3
 
 PORTNAME=	chromium
-PORTVERSION=	34.0.1847.137
+PORTVERSION=	35.0.1916.114
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -172,7 +172,7 @@ pre-everything::
 .if ${PORT_OPTIONS:MDEBUG}
 	@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
 .else
-	@${ECHO_MSG} "and a fair amount of free diskspace (~ 2.4GB)."
+	@${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)."
 .endif
 	@${ECHO_MSG}
 

Modified: head/www/chromium/Makefile.tests
==============================================================================
--- head/www/chromium/Makefile.tests	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/Makefile.tests	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
 #$FreeBSD$
-
+#telemetry_unittests : unknown ninja target
 TEST_TARGETS=	base_unittests \
 		crypto_unittests \
 		cacheinvalidation_unittests \
@@ -15,9 +15,8 @@ TEST_TARGETS=	base_unittests \
 		ipc_tests \
 		dbus_unittests \
 		net_unittests \
-		media_unittests
-# browser_tests: missing test file?
-# unit_tests: missing test file?
-# chromedriver_unittests: does not build
-# chromedriver_tests: does not build
-# telemetry_unittests: unknown ninja target
+		media_unittests \
+		chromedriver_unittests \
+		chromedriver_tests \
+		browser_tests \
+		unit_tests

Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/distinfo	Tue May 20 20:47:17 2014	(r354687)
@@ -1,4 +1,4 @@
-SHA256 (chromium-34.0.1847.137.tar.xz) = 938bf0e673101bb1aeec4c3e2e75df372cebe3d2ee93e9f4669d64ce92656027
-SIZE (chromium-34.0.1847.137.tar.xz) = 190173736
-SHA256 (chromium-34.0.1847.137-testdata.tar.xz) = 386899a35d55e490d9119955f87eb2fa0249258ffb56f2892b0ad63ad1683d85
-SIZE (chromium-34.0.1847.137-testdata.tar.xz) = 108472204
+SHA256 (chromium-35.0.1916.114.tar.xz) = 566fcdc05d53c551d142ac9742ef69ba7c6d5a450d8ec41c0efd4fc8249f77af
+SIZE (chromium-35.0.1916.114.tar.xz) = 206243256
+SHA256 (chromium-35.0.1916.114-testdata.tar.xz) = 122977c93e1d211abfe92af2ccad359af83de277e89c89d1259928f0b1a04ea1
+SIZE (chromium-35.0.1916.114-testdata.tar.xz) = 109106164

Modified: head/www/chromium/files/patch-base__base.gyp
==============================================================================
--- head/www/chromium/files/patch-base__base.gyp	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__base.gyp	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./base/base.gyp.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/base.gyp	2014-04-24 23:23:41.000000000 +0200
-@@ -820,6 +820,11 @@
+--- ./base/base.gyp.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/base.gyp	2014-05-04 14:38:46.000000000 +0200
+@@ -803,6 +803,11 @@
              ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
            ],
          }],

Modified: head/www/chromium/files/patch-base__base.gypi
==============================================================================
--- head/www/chromium/files/patch-base__base.gypi	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__base.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./base/base.gypi.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/base.gypi	2014-04-24 23:23:41.000000000 +0200
-@@ -918,11 +918,15 @@
+--- ./base/base.gypi.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/base.gypi	2014-05-04 14:38:46.000000000 +0200
+@@ -915,11 +915,15 @@
                'process/memory_stubs.cc',
              ],
              'sources/': [

Modified: head/www/chromium/files/patch-base__debug__stack_trace_posix.cc
==============================================================================
--- head/www/chromium/files/patch-base__debug__stack_trace_posix.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__debug__stack_trace_posix.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,11 +1,21 @@
---- ./base/debug/stack_trace_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/debug/stack_trace_posix.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -471,7 +471,7 @@
+--- ./base/debug/stack_trace_posix.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/debug/stack_trace_posix.cc	2014-05-04 15:46:56.000000000 +0200
+@@ -586,6 +586,10 @@
+   // for the modules that are loaded in the current process.
+   // Returns true on success.
+   bool CacheMemoryRegions() {
++#if defined(OS_FREEBSD)
++    // TODO (rene) avoid link error, implement something?
++    return false;
++#else
+     // Reads /proc/self/maps.
+     std::string contents;
+     if (!ReadProcMaps(&contents)) {
+@@ -601,6 +605,7 @@
  
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
--  count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+  count_ = std::max<size_t>(backtrace(trace_, arraysize(trace_)), 0);
- }
+     is_initialized_ = true;
+     return true;
++#endif
+   }
  
- void StackTrace::Print() const {
+   // Opens all object files and caches their file descriptors.

Modified: head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/posix/unix_domain_socket_linux_unittest.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig	2014-04-30 22:41:41.000000000 +0200
++++ ./base/posix/unix_domain_socket_linux_unittest.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -2,8 +2,13 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.

Modified: head/www/chromium/files/patch-base__process__internal_linux.h
==============================================================================
--- head/www/chromium/files/patch-base__process__internal_linux.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__process__internal_linux.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/process/internal_linux.h.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/internal_linux.h	2014-04-24 23:23:41.000000000 +0200
+--- ./base/process/internal_linux.h.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/internal_linux.h	2014-05-04 14:38:46.000000000 +0200
 @@ -12,6 +12,8 @@
  
  #include "base/files/file_path.h"

Modified: head/www/chromium/files/patch-base__process__memory_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__memory_unittest.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__process__memory_unittest.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/process/memory_unittest.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/memory_unittest.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/process/memory_unittest.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/memory_unittest.cc	2014-05-04 16:09:01.000000000 +0200
 @@ -151,12 +151,12 @@
  
  // Android doesn't implement set_new_handler, so we can't use the
@@ -15,9 +15,9 @@
      !defined(OS_WIN) && \
      !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
  
-@@ -372,5 +372,5 @@
- #endif  // !ARCH_CPU_64_BITS
- #endif  // OS_MACOSX
+@@ -427,5 +427,5 @@
+   EXPECT_TRUE(value_ == NULL);
+ }
  
 -#endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
 +#endif  // !defined(OS_ANDROID) && !defined(OS_BSD) &&

Modified: head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__process__process_iterator_freebsd.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,8 +1,8 @@
---- ./base/process/process_iterator_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/process_iterator_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -6,6 +6,10 @@
- 
+--- ./base/process/process_iterator_freebsd.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/process_iterator_freebsd.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -8,6 +8,10 @@
  #include <sys/sysctl.h>
+ #include <unistd.h>
  
 +/* getuid() */
 +#include <unistd.h>

Modified: head/www/chromium/files/patch-base__process__process_metrics.h
==============================================================================
--- head/www/chromium/files/patch-base__process__process_metrics.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__process__process_metrics.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/process/process_metrics.h.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/process_metrics.h	2014-04-24 23:23:41.000000000 +0200
+--- ./base/process/process_metrics.h.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/process_metrics.h	2014-05-04 14:38:46.000000000 +0200
 @@ -17,6 +17,13 @@
  #include "base/time/time.h"
  #include "base/values.h"

Modified: head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__process__process_metrics_freebsd.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,11 +1,9 @@
---- ./base/process/process_metrics_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/process_metrics_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -4,6 +4,10 @@
+--- ./base/process/process_metrics_freebsd.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/process_metrics_freebsd.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -10,6 +10,8 @@
  
- #include "base/process/process_metrics.h"
+ #include "base/sys_info.h"
  
-+#include "base/sys_info.h"
-+
 +#include <unistd.h> /* getpagesize() */
 +
  namespace base {

Modified: head/www/chromium/files/patch-base__security_unittest.cc
==============================================================================
--- head/www/chromium/files/patch-base__security_unittest.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__security_unittest.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/security_unittest.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/security_unittest.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/security_unittest.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/security_unittest.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -159,7 +159,7 @@
  // FAILS_ is too clunky.
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {

Modified: head/www/chromium/files/patch-base__strings__safe_sprintf.cc
==============================================================================
--- head/www/chromium/files/patch-base__strings__safe_sprintf.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__strings__safe_sprintf.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/strings/safe_sprintf.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/strings/safe_sprintf.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/strings/safe_sprintf.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/strings/safe_sprintf.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -107,11 +107,11 @@
        : buffer_(buffer),
          size_(size - 1),  // Account for trailing NUL byte

Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-base__sys_info_freebsd.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__sys_info_freebsd.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/sys_info_freebsd.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/sys_info_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/sys_info_freebsd.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/sys_info_freebsd.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -4,6 +4,7 @@
  
  #include "base/sys_info.h"

Modified: head/www/chromium/files/patch-base__sys_info_posix.cc
==============================================================================
--- head/www/chromium/files/patch-base__sys_info_posix.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__sys_info_posix.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/sys_info_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ ./base/sys_info_posix.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/sys_info_posix.cc.orig	2014-04-30 22:41:43.000000000 +0200
++++ ./base/sys_info_posix.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -49,7 +49,7 @@
  
  namespace base {

Modified: head/www/chromium/files/patch-base__test__expectations__expectation.cc
==============================================================================
--- head/www/chromium/files/patch-base__test__expectations__expectation.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__test__expectations__expectation.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/test/expectations/expectation.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/test/expectations/expectation.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/test/expectations/expectation.cc.orig	2014-04-30 22:41:42.000000000 +0200
++++ ./base/test/expectations/expectation.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -59,6 +59,7 @@
          variant != "64") {
        return false;

Modified: head/www/chromium/files/patch-base__test__launcher__test_launcher.cc
==============================================================================
--- head/www/chromium/files/patch-base__test__launcher__test_launcher.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__test__launcher__test_launcher.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./base/test/launcher/test_launcher.cc.orig	2014-04-24 22:36:09.000000000 +0200
-+++ ./base/test/launcher/test_launcher.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -39,6 +39,10 @@
+--- ./base/test/launcher/test_launcher.cc.orig	2014-04-30 22:41:42.000000000 +0200
++++ ./base/test/launcher/test_launcher.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -40,6 +40,10 @@
  #include "base/mac/scoped_nsautorelease_pool.h"
  #endif
  

Modified: head/www/chromium/files/patch-base__threading__platform_thread_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__threading__platform_thread_linux.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-base__threading__platform_thread_linux.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./base/threading/platform_thread_linux.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/threading/platform_thread_linux.cc	2014-04-24 23:23:41.000000000 +0200
+--- ./base/threading/platform_thread_linux.cc.orig	2014-04-30 22:41:42.000000000 +0200
++++ ./base/threading/platform_thread_linux.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -16,7 +16,9 @@
  #include "base/tracked_objects.h"
  

Modified: head/www/chromium/files/patch-build__common.gypi
==============================================================================
--- head/www/chromium/files/patch-build__common.gypi	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-build__common.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./build/common.gypi.orig	2014-04-24 22:36:09.000000000 +0200
-+++ ./build/common.gypi	2014-04-24 23:23:42.000000000 +0200
-@@ -565,7 +565,7 @@
+--- ./build/common.gypi.orig	2014-04-30 22:43:21.000000000 +0200
++++ ./build/common.gypi	2014-05-04 14:43:03.000000000 +0200
+@@ -615,7 +615,7 @@
          }],
  
          # DBus usage.
@@ -9,27 +9,26 @@
            'use_dbus%': 1,
          }, {
            'use_dbus%': 0,
-@@ -1002,6 +1002,10 @@
+@@ -878,7 +878,7 @@
+         # By default, use ICU data file (icudtl.dat) on all platforms
+         # except when building Android WebView.
+         # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
+-        ['android_webview_build==0', {
++        ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', {
+           'icu_use_data_file_flag%' : 1,
+         }, {
+           'icu_use_data_file_flag%' : 0,
+@@ -1076,6 +1076,9 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
 +    'os_ver%': 0,
-+    'prefix_dir%': '/usr',
 +    'use_system_libjpeg%': 0,
 +
      # The release channel that this build targets. This is used to restrict
      # channel-specific build options, like which installer packages to create.
      # The default is 'all', which does no channel-specific filtering.
-@@ -1322,7 +1326,7 @@
-           # TODO(jungshik): Turn this on on Android.
-           # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
-           # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
--          ['OS!="android"', {
-+          ['OS!="android" and os_bsd!=1', {
-             'icu_use_data_file_flag%': 1,
-           }],
-         ],
-@@ -3701,6 +3705,13 @@
+@@ -3894,6 +3897,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],

Modified: head/www/chromium/files/patch-cc__layers__layer.cc
==============================================================================
--- head/www/chromium/files/patch-cc__layers__layer.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-cc__layers__layer.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./cc/layers/layer.cc.orig	2014-04-24 22:35:51.000000000 +0200
-+++ ./cc/layers/layer.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -726,13 +726,15 @@
+--- ./cc/layers/layer.cc.orig	2014-04-30 22:41:25.000000000 +0200
++++ ./cc/layers/layer.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -720,13 +720,15 @@
    DCHECK(current_layer);
    DCHECK(current_layer->id() == scroll_clip_layer_id_);
  

Modified: head/www/chromium/files/patch-cc__layers__layer_impl.cc
==============================================================================
--- head/www/chromium/files/patch-cc__layers__layer_impl.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-cc__layers__layer_impl.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./cc/layers/layer_impl.cc.orig	2014-04-24 22:35:51.000000000 +0200
-+++ ./cc/layers/layer_impl.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -1222,21 +1222,23 @@
+--- ./cc/layers/layer_impl.cc.orig	2014-04-30 22:41:25.000000000 +0200
++++ ./cc/layers/layer_impl.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -1190,21 +1190,23 @@
    scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(),
                                 scale_factor * scaled_scroll_bounds.height());
  

Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/app/chrome_main_delegate.cc.orig	2014-04-24 22:34:55.000000000 +0200
-+++ ./chrome/app/chrome_main_delegate.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/app/chrome_main_delegate.cc.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -95,7 +95,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -629,7 +629,7 @@
+@@ -630,7 +630,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,7 +54,7 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -747,7 +747,7 @@
+@@ -748,7 +748,7 @@
  #endif
    }
  
@@ -63,7 +63,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -759,7 +759,7 @@
+@@ -760,7 +760,7 @@
      breakpad::InitCrashReporter(process_type);
  #endif  // defined(OS_ANDROID)
    }
@@ -72,7 +72,7 @@
  
    // After all the platform Breakpads have been initialized, store the command
    // line for crash reporting.
-@@ -844,7 +844,7 @@
+@@ -845,7 +845,7 @@
    return process_type == switches::kNaClLoaderProcess ||
        process_type == switches::kRelauncherProcess;
  }

Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/app/chrome_main_delegate.h.orig	2014-04-24 22:34:55.000000000 +0200
-+++ ./chrome/app/chrome_main_delegate.h	2014-04-24 23:23:42.000000000 +0200
-@@ -31,7 +31,7 @@
+--- ./chrome/app/chrome_main_delegate.h.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.h	2014-05-04 14:38:46.000000000 +0200
+@@ -35,7 +35,7 @@
    virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
    virtual bool DelaySandboxInitialization(
        const std::string& process_type) OVERRIDE;

Added: head/www/chromium/files/patch-chrome__app__chromium_strings.grd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__app__chromium_strings.grd	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,11 @@
+--- ./chrome/app/chromium_strings.grd.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/app/chromium_strings.grd	2014-05-05 13:13:16.000000000 +0200
+@@ -1115,7 +1115,7 @@
+       </message>
+ 
+       <!-- ProcessSingleton -->
+-      <if expr="is_linux">
++      <if expr="is_linux or is_bsd">
+         <message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
+           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
+         </message>

Modified: head/www/chromium/files/patch-chrome__browser__about_flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__about_flags.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__about_flags.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/about_flags.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/about_flags.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -2320,7 +2320,7 @@
+--- ./chrome/browser/about_flags.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/about_flags.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -2153,7 +2153,7 @@
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;

Modified: head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__browser_process_impl.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/browser_process_impl.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/browser_process_impl.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -261,7 +261,7 @@
+--- ./chrome/browser/browser_process_impl.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/browser_process_impl.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -256,7 +256,7 @@
  
    ExtensionRendererState::GetInstance()->Shutdown();
  

Modified: head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/chrome_browser_main.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/chrome_browser_main.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -973,7 +973,7 @@
+--- ./chrome/browser/chrome_browser_main.cc.orig	2014-04-30 22:42:18.000000000 +0200
++++ ./chrome/browser/chrome_browser_main.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -972,7 +972,7 @@
    }
  #endif
  

Modified: head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/chrome_browser_main_posix.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/chrome_browser_main_posix.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/chrome_browser_main_posix.cc.orig	2014-04-30 22:42:18.000000000 +0200
++++ ./chrome/browser/chrome_browser_main_posix.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -314,6 +314,11 @@
      g_pipe_pid = getpid();
      g_shutdown_pipe_read_fd = pipefd[0];

Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/chrome_content_browser_client.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/chrome_content_browser_client.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -493,7 +493,7 @@
+--- ./chrome/browser/chrome_content_browser_client.cc.orig	2014-04-30 22:42:18.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -501,7 +501,7 @@
    }
  }
  
@@ -9,7 +9,7 @@
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -549,7 +549,7 @@
+@@ -557,7 +557,7 @@
  
    return -1;
  }
@@ -18,7 +18,7 @@
  #endif  // !defined(OS_ANDROID)
  
  #if !defined(OS_CHROMEOS)
-@@ -1449,7 +1449,7 @@
+@@ -1460,7 +1460,7 @@
  
  void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
      CommandLine* command_line, int child_process_id) {
@@ -27,8 +27,8 @@
    if (breakpad::IsCrashReporterEnabled()) {
      std::string enable_crash_reporter;
      GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter);
-@@ -2587,7 +2587,7 @@
-   }
+@@ -2610,7 +2610,7 @@
+ #endif
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +36,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const CommandLine& command_line,
      int child_process_id,
-@@ -2642,7 +2642,7 @@
+@@ -2664,7 +2664,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }

Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,11 +1,11 @@
---- ./chrome/browser/chrome_content_browser_client.h.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/chrome_content_browser_client.h	2014-04-24 23:23:42.000000000 +0200
-@@ -255,7 +255,7 @@
+--- ./chrome/browser/chrome_content_browser_client.h.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.h	2014-05-04 14:38:46.000000000 +0200
+@@ -267,7 +267,7 @@
        const base::FilePath& storage_partition_path,
        ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    virtual void GetAdditionalMappedFilesForChildProcess(
-       const CommandLine& command_line,
+       const base::CommandLine& command_line,
        int child_process_id,

Modified: head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/diagnostics/diagnostics_writer.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-04-30 22:42:03.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -268,7 +268,7 @@
        console_->SetColor(color);
        console_->Write(base::ASCIIToUTF16(result));

Modified: head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/diagnostics/diagnostics_writer.h	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-04-30 22:42:03.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.h	2014-05-04 14:38:46.000000000 +0200
 @@ -18,7 +18,7 @@
   public:
    // The type of formatting done by this writer.

Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-04-24 22:35:08.000000000 +0200
-+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -166,10 +166,12 @@
+--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-04-30 22:41:59.000000000 +0200
++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -167,10 +167,12 @@
  }
  
  bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() {

Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2014-04-24 22:35:09.000000000 +0200
-+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2014-04-30 22:42:00.000000000 +0200
++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "chrome/browser/extensions/api/music_manager_private/device_id.h"

Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig	2014-04-24 22:35:08.000000000 +0200
-+++ ./chrome/browser/extensions/api/serial/serial_api.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -83,7 +83,7 @@
+--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig	2014-04-30 22:42:00.000000000 +0200
++++ ./chrome/browser/extensions/api/serial/serial_api.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -84,7 +84,7 @@
  
  void SerialGetDevicesFunction::Work() {
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ -9,7 +9,7 @@
    device::SerialDeviceInfoList devices;
    scoped_ptr<device::SerialDeviceEnumerator> enumerator =
        device::SerialDeviceEnumerator::Create();
-@@ -105,6 +105,7 @@
+@@ -106,6 +106,7 @@
    }
  
    results_ = serial::GetDevices::Results::Create(out_devices);

Modified: head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig	2014-04-24 22:35:08.000000000 +0200
-+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig	2014-04-30 22:42:00.000000000 +0200
++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -36,7 +36,7 @@
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)

Modified: head/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/gpu/gl_string_manager.cc.orig	2014-04-24 22:35:12.000000000 +0200
-+++ ./chrome/browser/gpu/gl_string_manager.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/gpu/gl_string_manager.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/gpu/gl_string_manager.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -25,7 +25,7 @@
  
  void GLStringManager::Initialize() {

Modified: head/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-04-24 22:35:12.000000000 +0200
-+++ ./chrome/browser/gpu/gpu_feature_checker.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/gpu/gpu_feature_checker.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -33,7 +33,7 @@
    CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
  

Modified: head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/media/webrtc_log_uploader.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ ./chrome/browser/media/webrtc_log_uploader.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -155,6 +155,8 @@
+--- ./chrome/browser/media/webrtc_log_uploader.cc.orig	2014-04-30 22:42:02.000000000 +0200
++++ ./chrome/browser/media/webrtc_log_uploader.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -196,6 +196,8 @@
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";

Modified: head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-04-30 22:42:13.000000000 +0200
++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -33,9 +33,11 @@
      // Note that this initializes the delegate asynchronously, but since
      // the delegate will only be used from the IO thread, it is guaranteed

Modified: head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ ./chrome/browser/media_galleries/media_file_system_registry.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -631,7 +631,10 @@
+--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-04-30 22:42:13.000000000 +0200
++++ ./chrome/browser/media_galleries/media_file_system_registry.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -635,7 +635,10 @@
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl(this)) {

Added: head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,15 @@
+--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig	2014-04-30 22:42:13.000000000 +0200
++++ ./chrome/browser/media_galleries/media_folder_finder.cc	2014-05-05 11:50:29.000000000 +0200
+@@ -50,10 +50,10 @@
+   chrome::DIR_USER_APPLICATIONS,
+   chrome::DIR_USER_LIBRARY,
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::DIR_CACHE,
+ #endif
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   base::DIR_TEMP,
+ #endif
+ };

Modified: head/www/chromium/files/patch-chrome__browser__memory_details.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__memory_details.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__memory_details.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/memory_details.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/browser/memory_details.cc	2014-04-24 23:23:42.000000000 +0200
+--- ./chrome/browser/memory_details.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/memory_details.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -32,7 +32,7 @@
  #include "grit/generated_resources.h"
  #include "ui/base/l10n/l10n_util.h"

Modified: head/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__net__connection_tester.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__net__connection_tester.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/net/connection_tester.cc.orig	2014-04-24 22:35:02.000000000 +0200
-+++ ./chrome/browser/net/connection_tester.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -217,7 +217,7 @@
+--- ./chrome/browser/net/connection_tester.cc.orig	2014-04-30 22:41:58.000000000 +0200
++++ ./chrome/browser/net/connection_tester.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -213,7 +213,7 @@
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {

Modified: head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig	2014-04-30 22:42:02.000000000 +0200
++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -29,6 +29,8 @@
      "linux";
  #elif defined(OS_OPENBSD)

Modified: head/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/plugins/plugins_resource_service.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/plugins/plugins_resource_service.cc	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/plugins/plugins_resource_service.cc.orig	2014-04-30 22:42:06.000000000 +0200
++++ ./chrome/browser/plugins/plugins_resource_service.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -33,7 +33,7 @@
    std::string filename;
  #if defined(OS_WIN)

Added: head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig	2014-04-30 22:41:58.000000000 +0200
++++ ./chrome/browser/policy/policy_prefs_browsertest.cc	2014-05-05 18:09:24.000000000 +0200
+@@ -162,6 +162,8 @@
+     const std::string os("chromeos");
+ #elif defined(OS_LINUX)
+     const std::string os("linux");
++#elif defined(OS_FREEBSD)
++    const std::string os("freebsd");
+ #else
+ #error "Unknown platform"
+ #endif

Modified: head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig	2014-04-24 22:34:59.000000000 +0200
-+++ ./chrome/browser/ui/gtk/accelerators_gtk.h	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig	2014-04-30 22:42:07.000000000 +0200
++++ ./chrome/browser/ui/gtk/accelerators_gtk.h	2014-05-04 14:38:46.000000000 +0200
 @@ -10,6 +10,8 @@
  #include "base/containers/hash_tables.h"
  #include "ui/base/accelerators/accelerator.h"

Modified: head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig	2014-04-24 22:34:59.000000000 +0200
-+++ ./chrome/browser/ui/gtk/first_run_dialog.cc	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig	2014-04-30 22:42:07.000000000 +0200
++++ ./chrome/browser/ui/gtk/first_run_dialog.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -132,6 +132,7 @@
    if (dialog_)
      gtk_widget_hide_all(dialog_);

Added: head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__gtk__tabs__dragged_tab_controller_gtk.h	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h.orig	2014-04-30 22:42:07.000000000 +0200
++++ ./chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h	2014-05-04 20:49:17.000000000 +0200
+@@ -92,7 +92,7 @@
+                               const gfx::Rect& initial_pos,
+                               bool user_gesture,
+                               bool* was_blocked) OVERRIDE;
+-  virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
++  virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/;
+   virtual content::JavaScriptDialogManager*
+       GetJavaScriptDialogManager() OVERRIDE;
+   virtual void RequestMediaAccessPermission(

Added: head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__gtk__web_dialog_gtk.h	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,11 @@
+--- ./chrome/browser/ui/gtk/web_dialog_gtk.h.orig	2014-04-30 22:42:07.000000000 +0200
++++ ./chrome/browser/ui/gtk/web_dialog_gtk.h	2014-05-04 20:50:58.000000000 +0200
+@@ -62,7 +62,7 @@
+                               const gfx::Rect& initial_pos,
+                               bool user_gesture,
+                               bool* was_blocked) OVERRIDE;
+-  virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
++  virtual void LoadingStateChanged(content::WebContents* source) /*OVERRIDE*/;
+ 
+  private:
+   CHROMEGTK_CALLBACK_1(WebDialogGtk, void, OnResponse, int);

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/about_ui.cc.orig	2014-04-24 22:35:00.000000000 +0200
-+++ ./chrome/browser/ui/webui/about_ui.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -768,7 +768,7 @@
+--- ./chrome/browser/ui/webui/about_ui.cc.orig	2014-04-30 22:42:10.000000000 +0200
++++ ./chrome/browser/ui/webui/about_ui.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -762,7 +762,7 @@
    return data;
  }
  
@@ -9,7 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -784,6 +784,7 @@
+@@ -778,6 +778,7 @@
    return data;
  }
  
@@ -17,7 +17,7 @@
  void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id,
                       bool good) {
    data->append("<tr><td>");
-@@ -850,6 +851,7 @@
+@@ -848,6 +849,7 @@
    return data;
  }
  #endif
@@ -25,7 +25,7 @@
  
  // AboutMemoryHandler ----------------------------------------------------------
  
-@@ -1015,7 +1017,7 @@
+@@ -1013,7 +1015,7 @@
    } else if (source_name_ == chrome::kChromeUIDNSHost) {
      AboutDnsHandler::Start(profile(), callback);
      return;

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,11 +1,11 @@
---- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-04-24 22:35:00.000000000 +0200
-+++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -229,7 +229,7 @@
+--- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-04-30 22:42:10.000000000 +0200
++++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-05-04 20:57:59.000000000 +0200
+@@ -274,7 +274,7 @@
    if (cert_index < 0)
      return;
  
 -  NativeWebContentsModalDialog window =
 +  _GtkWindow* window =
-       platform_util::GetTopLevel(dialog_->dialog()->GetNativeDialog());
+       platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog());
    ShowCertExportDialog(web_ui()->GetWebContents(),
                         window,

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-04-24 22:35:00.000000000 +0200
-+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -466,7 +466,7 @@
+--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-04-30 22:42:10.000000000 +0200
++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -473,7 +473,7 @@
        url.host() == chrome::kChromeUIMemoryRedirectHost ||
        url.host() == chrome::kChromeUIStatsHost ||
        url.host() == chrome::kChromeUITermsHost

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-04-24 22:35:00.000000000 +0200
-+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -313,7 +313,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-04-30 22:42:10.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc	2014-05-04 14:38:46.000000000 +0200
+@@ -328,7 +328,8 @@
      { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
      { "translateEnableTranslate",
        IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
@@ -10,7 +10,7 @@
      { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
      { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
      { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-@@ -620,7 +621,8 @@
+@@ -648,7 +649,8 @@
        "requestProfilesInfo",
        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                   base::Unretained(this)));
@@ -20,7 +20,7 @@
    web_ui()->RegisterMessageCallback(
        "themesSetNative",
        base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1204,7 +1206,8 @@
+@@ -1298,7 +1300,8 @@
    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
    bool is_native_theme = false;
  
@@ -30,7 +30,7 @@
    bool profile_is_managed = profile->IsManaged();
    is_native_theme = theme_service->UsingNativeTheme();
    base::FundamentalValue native_theme_enabled(!is_native_theme &&
-@@ -1226,7 +1229,8 @@
+@@ -1320,7 +1323,8 @@
    ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
  }
  

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-04-24 22:35:00.000000000 +0200
-+++ ./chrome/browser/ui/webui/options/browser_options_handler.h	2014-04-24 23:23:43.000000000 +0200
-@@ -168,7 +168,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-04-30 22:42:10.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.h	2014-05-04 14:38:46.000000000 +0200
+@@ -183,7 +183,8 @@
  
    void ObserveThemeChanged();
    void ThemesReset(const base::ListValue* args);

Modified: head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__usb__usb_context.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/usb/usb_context.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ ./chrome/browser/usb/usb_context.cc	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/usb/usb_context.cc.orig	2014-04-30 22:42:13.000000000 +0200
++++ ./chrome/browser/usb/usb_context.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -43,7 +43,9 @@
    running_ = false;
    // Spreading running_ to the UsbEventHandler thread.

Modified: head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/web_applications/web_app.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/web_applications/web_app.cc	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/web_applications/web_app.cc.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/web_applications/web_app.cc	2014-05-04 14:38:46.000000000 +0200
 @@ -226,7 +226,7 @@
  }
  #endif

Modified: head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__browser__web_applications__web_app.h	Tue May 20 20:47:17 2014	(r354687)
@@ -1,5 +1,5 @@
---- ./chrome/browser/web_applications/web_app.h.orig	2014-04-24 22:35:10.000000000 +0200
-+++ ./chrome/browser/web_applications/web_app.h	2014-04-24 23:23:43.000000000 +0200
+--- ./chrome/browser/web_applications/web_app.h.orig	2014-04-30 22:42:17.000000000 +0200
++++ ./chrome/browser/web_applications/web_app.h	2014-05-04 14:38:46.000000000 +0200
 @@ -97,7 +97,7 @@
                    IconInfoList* icons);
  #endif

Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser.gypi	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__chrome_browser.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,17 @@
---- ./chrome/chrome_browser.gypi.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/chrome_browser.gypi	2014-04-24 23:23:43.000000000 +0200
-@@ -2949,7 +2949,7 @@
+--- ./chrome/chrome_browser.gypi.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/chrome_browser.gypi	2014-05-05 20:38:00.000000000 +0200
+@@ -1209,8 +1209,8 @@
+         'browser/media_galleries/imported_media_gallery_registry.h',
+         'browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc',
+         'browser/media_galleries/linux/mtp_device_delegate_impl_linux.h',
+-        'browser/media_galleries/linux/mtp_device_object_enumerator.cc',
+-        'browser/media_galleries/linux/mtp_device_object_enumerator.h',
++        #'browser/media_galleries/linux/mtp_device_object_enumerator.cc',
++        #'browser/media_galleries/linux/mtp_device_object_enumerator.h',
+         'browser/media_galleries/linux/mtp_device_task_helper.cc',
+         'browser/media_galleries/linux/mtp_device_task_helper.h',
+         'browser/media_galleries/linux/mtp_device_task_helper_map_service.cc',
+@@ -3025,7 +3025,7 @@
              '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
            ],
          }],
@@ -9,7 +20,7 @@
            'dependencies': [
              '../build/linux/system.gyp:libspeechd',
            ],
-@@ -3077,7 +3077,7 @@
+@@ -3166,7 +3166,7 @@
              '../build/linux/system.gyp:xscrnsaver',
            ],
          }],
@@ -18,7 +29,7 @@
            'sources': [
              'app/chrome_breakpad_client.cc',
              'app/chrome_breakpad_client.h',
-@@ -3345,6 +3345,25 @@
+@@ -3434,6 +3434,25 @@
              ['exclude', '^third_party/mozilla_security_manager/'],
            ],
          }],

Modified: head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi	Tue May 20 20:36:39 2014	(r354686)
+++ head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -1,6 +1,6 @@
---- ./chrome/chrome_browser_extensions.gypi.orig	2014-04-24 22:35:13.000000000 +0200
-+++ ./chrome/chrome_browser_extensions.gypi	2014-04-24 23:23:43.000000000 +0200
-@@ -922,6 +922,11 @@
+--- ./chrome/chrome_browser_extensions.gypi.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/chrome_browser_extensions.gypi	2014-05-04 14:38:46.000000000 +0200
+@@ -885,6 +885,11 @@
          'browser/extensions/window_controller_list_observer.h',
        ],
        'conditions': [

Added: head/www/chromium/files/patch-chrome__chrome_tests.gypi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__chrome_tests.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,11 @@
+--- ./chrome/chrome_tests.gypi.orig	2014-04-30 22:42:53.000000000 +0200
++++ ./chrome/chrome_tests.gypi	2014-05-05 18:29:40.000000000 +0200
+@@ -1628,7 +1628,7 @@
+         'test/remoting/remote_desktop_browsertest.h',
+         'test/remoting/waiter.cc',
+         'test/remoting/waiter.h',
+-        'test/security_tests/sandbox_browsertest_linux.cc',
++        #'test/security_tests/sandbox_browsertest_linux.cc',
+         'test/security_tests/sandbox_browsertest_win.cc',
+         # TODO(craig): Rename this and run from base_unittests when the test
+         # is safe to run there. See http://crbug.com/78722 for details.

Added: head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi	Tue May 20 20:47:17 2014	(r354687)
@@ -0,0 +1,36 @@

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list