Update to 34.0.1847.132

Obtained from:	https://github.com/gliaskos/freebsd-chromium/
MFH:		2014Q2
Security:	http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html
		http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html

www/chromium/Makefile

@@ -4,8 +4,7 @@
 #TODO eadler: s/python/python2/g on a number of files, chromium does not build with python3
 
 PORTNAME=	chromium
-PORTVERSION=	33.0.1750.152
+PORTVERSION=	34.0.1847.132
-PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -22,7 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		bash:${PORTSDIR}/shells/bash \
 		yasm:${PORTSDIR}/devel/yasm \
 		flock:${PORTSDIR}/sysutils/flock \
-		v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
@@ -134,7 +133,6 @@ ALL_TARGET+=	${TEST_TARGETS}
 DEBUG_MAKE_ENV=	V=1
 .if ${PORT_OPTIONS:MDEBUG}
 BUILDTYPE=	Debug
-GYP_DEFINES+=	remove_webcore_debug_symbols=1
 .else
 BUILDTYPE=	Release
 GYP_DEFINES+=	buildtype=Official
@@ -180,11 +178,7 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
-		${WRKSRC}/base/base.gypi \
-		${WRKSRC}/build/common.gypi \
 		${WRKSRC}/crypto/crypto.gyp \
-		${WRKSRC}/third_party/libvpx/libvpx.gyp \
-		${WRKSRC}/third_party/WebKit/Source/testing/testing.gyp \
 		${WRKSRC}/v8/tools/gyp/v8.gyp \
 		${WRKSRC}/v8/build/toolchain.gypi
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
@@ -192,17 +186,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
 		${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \
 		${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi
-	@${REINPLACE_CMD} -e "s|is_linux|(is_linux or is_bsd)|" \
-		${WRKSRC}/chrome/browser/browser_resources.grd \
-		${WRKSRC}/chrome/app/theme/theme_resources.grd \
-		${WRKSRC}/chrome/browser/resources/task_manager/defines.js \
-		${WRKSRC}/tools/grit/grit/xtb_reader_unittest.py \
-		${WRKSRC}/ui/base/strings/app_locale_settings.grd \
-		${WRKSRC}/ui/base/strings/app_locale_settings_bn.xtb \
-		${WRKSRC}/ui/base/strings/app_locale_settings_ja.xtb \
-		${WRKSRC}/ui/base/strings/app_locale_settings_ko.xtb \
-		${WRKSRC}/ui/base/strings/app_locale_settings_ml.xtb \
-		${WRKSRC}/ui/base/strings/app_locale_settings_th.xtb
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
@@ -220,7 +203,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \
 		${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${STAGEDIR}${DATADIR}
-.for p in chrome chrome_100_percent content_resources resources
+.for p in chrome_100_percent content_resources resources
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR}
 .endfor
 .for f in chrome libffmpegsumo.so protoc

www/chromium/distinfo

@@ -1,4 +1,4 @@
-SHA256 (chromium-33.0.1750.152.tar.xz) = 9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f
+SHA256 (chromium-34.0.1847.132.tar.xz) = e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038
-SIZE (chromium-33.0.1750.152.tar.xz) = 185396116
+SIZE (chromium-34.0.1847.132.tar.xz) = 190164176
-SHA256 (chromium-33.0.1750.152-testdata.tar.xz) = 0367fba6100a0538769955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0
+SHA256 (chromium-34.0.1847.132-testdata.tar.xz) = 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32
-SIZE (chromium-33.0.1750.152-testdata.tar.xz) = 112419292
+SIZE (chromium-34.0.1847.132-testdata.tar.xz) = 108476892

www/chromium/files/extra-patch-clang

@@ -48,7 +48,7 @@
    ASSERT_LT(kFinalTlsValue, *ptr);
 --- base/tracked_objects.cc	2013-07-03 23:39:54.000000000 -0400
 +++ base/tracked_objects.cc	2013-07-19 00:42:10.000000000 -0400
-@@ -346,7 +346,7 @@
+@@ -378,7 +378,7 @@
    }
    // We must NOT do any allocations during this callback.
    // Using the simple linked lists avoids all allocations.
@@ -59,7 +59,7 @@
  }
 --- base/tracked_objects_unittest.cc.orig	2013-08-30 23:09:01.000000000 +0300
 +++ base/tracked_objects_unittest.cc	2013-08-30 23:10:14.000000000 +0300
-@@ -50,9 +50,9 @@
+@@ -53,9 +53,9 @@
      Births* birth = ThreadData::TallyABirthIfActive(location);
 
      if (ThreadData::status() == ThreadData::DEACTIVATED)
@@ -71,7 +71,7 @@
    }
 
    // Helper function to verify the most common test expectations.
-@@ -231,7 +231,7 @@
+@@ -234,7 +234,7 @@
      return;
 
    scoped_ptr<DeathData> data(new DeathData());
@@ -80,7 +80,7 @@
    EXPECT_EQ(data->run_duration_sum(), 0);
    EXPECT_EQ(data->run_duration_sample(), 0);
    EXPECT_EQ(data->queue_duration_sum(), 0);
-@@ -432,7 +432,7 @@
+@@ -435,7 +435,7 @@
    Location location(kFunction, kFile, kLineNumber, NULL);
    // Do not delete |birth|.  We don't own it.
    Births* birth = ThreadData::TallyABirthIfActive(location);
@@ -91,7 +91,7 @@
    const TrackedTime kStartOfRun = TrackedTime() +
 --- chrome/browser/metrics/thread_watcher.cc	2013-07-03 23:45:55.000000000 -0400
 +++ chrome/browser/metrics/thread_watcher.cc	2013-07-19 01:38:45.000000000 -0400
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  MSVC_PUSH_DISABLE_WARNING(4748)
  
  int* NullPointer() {
@@ -102,7 +102,7 @@
  void NullPointerCrash(int line_number) {
 --- chrome/browser/sync/glue/synced_session_tracker.cc	2013-07-03 23:46:07.000000000 -0400
 +++ chrome/browser/sync/glue/synced_session_tracker.cc	2013-07-19 01:50:13.000000000 -0400
-@@ -232,7 +232,7 @@
+@@ -260,7 +260,7 @@
    }
    DCHECK(window_ptr);
    DCHECK_EQ(window_ptr->window_id.id(), window_id);
@@ -113,7 +113,7 @@
  }
 --- media/audio/audio_output_proxy_unittest.cc.orig	2013-08-30 23:23:03.000000000 +0300
 +++ media/audio/audio_output_proxy_unittest.cc	2013-08-30 23:23:54.000000000 +0300
-@@ -427,7 +427,7 @@
+@@ -392,7 +392,7 @@
      // |stream| is closed at this point. Start() should reopen it again.
      EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
          .Times(2)
@@ -124,7 +124,7 @@
          .Times(2);
 --- media/filters/decrypting_video_decoder_unittest.cc.orig	2013-08-30 23:27:39.000000000 +0300
 +++ media/filters/decrypting_video_decoder_unittest.cc	2013-08-30 23:28:27.000000000 +0300
-@@ -482,7 +482,7 @@
+@@ -417,7 +417,7 @@
    // callback to cancel the |decryptor_ready_cb|.
    EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback()))
        .WillOnce(ResetAndRunCallback(&decryptor_ready_cb,
@@ -224,7 +224,7 @@
 
 --- v8/src/runtime.cc.orig	2013-11-08 08:01:04.000000000 +0100
 +++ v8/src/runtime.cc	2013-11-15 13:17:39.000000000 +0100
-@@ -14028,7 +14028,7 @@
+@@ -14043,7 +14043,7 @@
  
    local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
    // Make sure that the pointer to adopted text is NULL.
@@ -235,7 +235,7 @@
        JSObject::SetLocalPropertyIgnoreAttributes(
 --- base/strings/safe_sprintf_unittest.cc.orig	2013-11-08 07:42:08.000000000 +0100
 +++ base/strings/safe_sprintf_unittest.cc	2013-11-15 15:04:45.000000000 +0100
-@@ -733,12 +733,14 @@
+@@ -721,12 +721,14 @@
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wconversion-null"
  #endif
@@ -261,14 +261,20 @@
    }
  
    static Unique<T> CreateImmovable(Handle<T> handle) {
---- content/browser/renderer_host/render_widget_host_view_guest.cc.orig	2014-01-07 21:02:28.000000000 +0100
+--- content/browser/frame_host/render_widget_host_view_guest.cc.orig	2014-03-05 22:24:07.000000000 +0100
-+++ content/browser/renderer_host/render_widget_host_view_guest.cc	2014-01-13 13:48:52.000000000 +0100
++++ content/browser/frame_host/render_widget_host_view_guest.cc	2014-03-09 20:01:20.000000000 +0100
-@@ -254,7 +254,7 @@
+@@ -258,11 +258,11 @@
+ 
  gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
-   if (guest_->GetEmbedderRenderWidgetHostView())
+   if (!guest_)
-     return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
+-    return static_cast<gfx::NativeViewId>(NULL);
--  return static_cast<gfx::NativeViewId>(NULL);
++    return reinterpret_cast<gfx::NativeViewId>(NULL);
-+  return reinterpret_cast<gfx::NativeViewId>(NULL);
+ 
+   RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView();
+   if (!rwhv)
+-    return static_cast<gfx::NativeViewId>(NULL);
++    return reinterpret_cast<gfx::NativeViewId>(NULL);
+   return rwhv->GetNativeViewId();
  }
  
- gfx::NativeViewAccessible RenderWidgetHostViewGuest::GetNativeViewAccessible() {
+-

www/chromium/files/extra-patch-fixup-execinfo

@@ -1,6 +1,6 @@
---- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
+--- v8/src/checks.cc.orig	2014-03-07 23:57:27.000000000 +0100
-+++ v8/src/checks.cc	2014-01-08 01:14:20.000000000 +0100
++++ v8/src/checks.cc	2014-03-08 00:04:14.000000000 +0100
-@@ -41,7 +41,7 @@
+@@ -44,7 +44,7 @@
  static V8_INLINE void DumpBacktrace() {
  #if V8_LIBC_GLIBC || V8_OS_BSD
    void* trace[100];

www/chromium/files/extra-patch-gcc

@@ -1,6 +1,6 @@
 --- base/memory/shared_memory.h.orig	2011-04-01 21:54:26.066717848 +0300
 +++ base/memory/shared_memory.h	2011-04-01 21:55:14.292717813 +0300
-@@ -10,6 +10,7 @@
+@@ -12,6 +12,7 @@
  
  #if defined(OS_POSIX)
  #include <sys/types.h>
@@ -10,7 +10,7 @@
  #endif
 --- third_party/libjingle/source/talk/base/stream.h.orig	2011-04-01 22:16:30.129717654 +0300
 +++ third_party/libjingle/source/talk/base/stream.h	2011-04-01 22:16:48.245715495 +0300
-@@ -28,6 +28,7 @@
+@@ -30,6 +30,7 @@
  #ifndef TALK_BASE_STREAM_H__
  #define TALK_BASE_STREAM_H__
  
@@ -40,7 +40,7 @@
  
 --- third_party/ffmpeg/libavutil/cpu.c.orig	2013-11-16 01:26:14.000000000 +0100
 +++ third_party/ffmpeg/libavutil/cpu.c	2013-11-19 00:24:53.000000000 +0100
-@@ -21,6 +21,9 @@
+@@ -24,6 +24,9 @@
  #include "opt.h"
  #include "common.h"
  

www/chromium/files/patch-base__base.gyp

@@ -1,6 +1,6 @@
---- base/base.gyp.orig	2013-09-26 02:17:34.000000000 +0300
+--- ./base/base.gyp.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/base.gyp	2013-09-26 03:00:53.000000000 +0300
++++ ./base/base.gyp	2014-04-24 23:23:41.000000000 +0200
-@@ -823,6 +823,11 @@
+@@ -820,6 +820,11 @@
              ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
            ],
          }],

www/chromium/files/patch-base__base.gypi

@@ -1,6 +1,6 @@
---- base/base.gypi.orig	2013-09-28 20:09:58.000000000 +0300
+--- ./base/base.gypi.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/base.gypi	2013-09-26 02:24:27.000000000 +0300
++++ ./base/base.gypi	2014-04-24 23:23:41.000000000 +0200
-@@ -872,11 +872,15 @@
+@@ -918,11 +918,15 @@
                'process/memory_stubs.cc',
              ],
              'sources/': [
@@ -15,4 +15,4 @@
 +              ['exclude', '^process/process_metrics_linux\\.cc$'],
              ],
            }],
-           ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
+           # Remove all unnecessary files for build_nexe.py to avoid exceeding

www/chromium/files/patch-base__debug__stack_trace_posix.cc

@@ -1,28 +1,11 @@
---- base/debug/stack_trace_posix.cc.orig	2013-02-05 10:02:11.000000000 +0200
+--- ./base/debug/stack_trace_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/debug/stack_trace_posix.cc	2013-02-13 20:27:44.000000000 +0200
++++ ./base/debug/stack_trace_posix.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -14,6 +14,9 @@
+@@ -471,7 +471,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#if defined(OS_FREEBSD)
-+#include <ucontext.h>
-+#endif
  
- #include <ostream>
- 
-@@ -326,9 +329,15 @@
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
-+#if defined(OS_FREEBSD)
-+  // Disable backtrace for now, libexecinfo crashes in getframeaddr
-+  // in release build / i386.
-+  count_ = 0;
-+#else
    // 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(backtrace(trace_, arraysize(trace_)), 0);
-+#endif
++  count_ = std::max<size_t>(backtrace(trace_, arraysize(trace_)), 0);
  }
  
- void StackTrace::PrintBacktrace() const {
+ void StackTrace::Print() const {

www/chromium/files/patch-base__file_util_posix.cc

@@ -1,6 +1,6 @@
---- base/file_util_posix.cc.orig	2014-02-20 21:28:47.000000000 +0100
+--- ./base/file_util_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/file_util_posix.cc	2014-02-24 15:44:01.000000000 +0100
++++ ./base/file_util_posix.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -673,7 +673,7 @@
+@@ -672,7 +672,7 @@
  #endif  // defined(OS_ANDROID)
    results->is_directory = S_ISDIR(file_info.st_mode);
    results->size = file_info.st_size;

www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc

@@ -1,5 +1,5 @@
---- base/posix/unix_domain_socket_linux_unittest.cc.orig	2013-08-19 02:53:00.000000000 +0300
+--- ./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	2013-08-30 19:34:24.000000000 +0300
++++ ./base/posix/unix_domain_socket_linux_unittest.cc	2014-04-24 23:23:41.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.

www/chromium/files/patch-base__process__internal_linux.h

@@ -1,11 +1,11 @@
---- ./base/process/internal_linux.h.orig	2013-09-03 09:09:03.000000000 +0200
+--- ./base/process/internal_linux.h.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/internal_linux.h	2013-09-07 21:29:08.000000000 +0200
++++ ./base/process/internal_linux.h	2014-04-24 23:23:41.000000000 +0200
-@@ -10,6 +10,8 @@
+@@ -12,6 +12,8 @@
  
  #include "base/files/file_path.h"
  
 +#include <unistd.h> /* pid_t */
 +
  namespace base {
- namespace internal {
  
+ class Time;

www/chromium/files/patch-base__process__memory_unittest.cc

@@ -1,6 +1,6 @@
---- base/process/memory_unittest.cc.orig	2013-09-24 23:49:53.000000000 +0300
+--- ./base/process/memory_unittest.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/process/memory_unittest.cc	2013-09-24 23:50:57.000000000 +0300
++++ ./base/process/memory_unittest.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -153,12 +153,12 @@
+@@ -151,12 +151,12 @@
  
  // Android doesn't implement set_new_handler, so we can't use the
  // OutOfMemoryTest cases.
@@ -15,7 +15,7 @@
      !defined(OS_WIN) && \
      !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
  
-@@ -375,5 +375,5 @@
+@@ -372,5 +372,5 @@
  #endif  // !ARCH_CPU_64_BITS
  #endif  // OS_MACOSX
  

www/chromium/files/patch-base__process__process_handle_freebsd.cc

@@ -1,5 +1,5 @@
---- base/process/process_handle_freebsd.cc.orig	2013-09-20 05:35:17.000000000 +0300
+--- ./base/process/process_handle_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/process/process_handle_freebsd.cc	2013-09-24 20:41:45.000000000 +0300
++++ ./base/process/process_handle_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -6,33 +6,35 @@
  
  #include <sys/sysctl.h>

www/chromium/files/patch-base__process__process_iterator.h

@@ -1,5 +1,5 @@
---- base/process/process_iterator.h.orig	2013-08-16 22:08:02.000000000 +0300
+--- ./base/process/process_iterator.h.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/process/process_iterator.h	2013-08-16 22:08:08.000000000 +0300
++++ ./base/process/process_iterator.h	2014-04-24 23:23:41.000000000 +0200
 @@ -21,6 +21,11 @@
  #include <windows.h>
  #include <tlhelp32.h>

www/chromium/files/patch-base__process__process_iterator_freebsd.cc

@@ -1,5 +1,5 @@
---- ./base/process/process_iterator_freebsd.cc.orig	2013-09-03 09:09:03.000000000 +0200
+--- ./base/process/process_iterator_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/process_iterator_freebsd.cc	2013-09-07 21:31:37.000000000 +0200
++++ ./base/process/process_iterator_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -6,6 +6,10 @@
  
  #include <sys/sysctl.h>

www/chromium/files/patch-base__process__process_metrics.h

@@ -1,8 +1,8 @@
---- base/process/process_metrics.h.orig	2013-08-16 22:01:16.000000000 +0300
+--- ./base/process/process_metrics.h.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/process/process_metrics.h	2013-08-16 22:04:12.000000000 +0300
++++ ./base/process/process_metrics.h	2014-04-24 23:23:41.000000000 +0200
-@@ -15,6 +15,13 @@
+@@ -17,6 +17,13 @@
- #include "base/process.h"
+ #include "base/time/time.h"
- #include "base/time.h"
+ #include "base/values.h"
  
 +#if defined(OS_BSD)
 +#include <kvm.h>

www/chromium/files/patch-base__process__process_metrics_freebsd.cc

@@ -1,5 +1,5 @@
---- ./base/process/process_metrics_freebsd.cc.orig	2013-09-03 09:09:03.000000000 +0200
+--- ./base/process/process_metrics_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/process_metrics_freebsd.cc	2013-09-07 21:30:29.000000000 +0200
++++ ./base/process/process_metrics_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "base/process/process_metrics.h"

www/chromium/files/patch-base__security_unittest.cc

@@ -1,6 +1,6 @@
---- base/security_unittest.cc.orig	2013-09-01 01:12:36.000000000 +0300
+--- ./base/security_unittest.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/security_unittest.cc	2013-09-01 01:13:35.000000000 +0300
++++ ./base/security_unittest.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -161,7 +161,7 @@
+@@ -159,7 +159,7 @@
  // FAILS_ is too clunky.
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
    if (!overflow_detected) {

www/chromium/files/patch-base__strings__safe_sprintf.cc

@@ -1,5 +1,5 @@
---- ./base/strings/safe_sprintf.cc.orig	2014-03-04 03:16:26.000000000 +0100
+--- ./base/strings/safe_sprintf.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ ./base/strings/safe_sprintf.cc	2014-03-07 14:14:55.000000000 +0100
++++ ./base/strings/safe_sprintf.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -107,11 +107,11 @@
        : buffer_(buffer),
          size_(size - 1),  // Account for trailing NUL byte

www/chromium/files/patch-base__sys_info_freebsd.cc

@@ -1,5 +1,5 @@
---- base/sys_info_freebsd.cc.orig	2013-09-28 19:09:58.000000000 +0200
+--- ./base/sys_info_freebsd.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/sys_info_freebsd.cc	2013-10-09 17:13:04.000000000 +0200
++++ ./base/sys_info_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -4,6 +4,7 @@
  
  #include "base/sys_info.h"

www/chromium/files/patch-base__sys_info_posix.cc

@@ -1,11 +1,11 @@
---- base/sys_info_posix.cc.orig	2011-02-07 00:36:57.000000000 +0100
+--- ./base/sys_info_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
-+++ base/sys_info_posix.cc	2011-02-07 00:21:53.000000000 +0100
++++ ./base/sys_info_posix.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -23,7 +23,7 @@
+@@ -49,7 +49,7 @@
  
  namespace base {
  
 -#if !defined(OS_OPENBSD)
 +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
  int SysInfo::NumberOfProcessors() {
-   // It seems that sysconf returns the number of "logical" processors on both
+   return g_lazy_number_of_processors.Get().value();
-   // Mac and Linux.  So we get the number of "online logical" processors.
+ }

www/chromium/files/patch-base__test__expectations__expectation.cc

@@ -1,6 +1,6 @@
---- base/test/expectations/expectation.cc.orig	2013-08-31 23:17:45.000000000 +0300
+--- ./base/test/expectations/expectation.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/test/expectations/expectation.cc	2013-08-31 23:18:59.000000000 +0300
++++ ./base/test/expectations/expectation.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -58,6 +58,7 @@
+@@ -59,6 +59,7 @@
          variant != "64") {
        return false;
      }
@@ -8,7 +8,7 @@
    } else if (name == "ChromeOS") {
      // TODO(rsesek): Figure out what ChromeOS needs.
    } else if (name == "iOS") {
-@@ -119,6 +120,8 @@
+@@ -122,6 +123,8 @@
      platform.variant = "32";
    else if (arch == "x86_64")
      platform.variant = "64";

www/chromium/files/patch-base__test__launcher__test_launcher.cc

@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig	2014-01-07 21:01:10.000000000 +0100
+--- ./base/test/launcher/test_launcher.cc.orig	2014-04-24 22:36:09.000000000 +0200
-+++ base/test/launcher/test_launcher.cc	2014-01-13 01:36:07.000000000 +0100
++++ ./base/test/launcher/test_launcher.cc	2014-04-24 23:23:41.000000000 +0200
-@@ -36,6 +36,10 @@
+@@ -39,6 +39,10 @@
  #include "base/mac/scoped_nsautorelease_pool.h"
  #endif
  

www/chromium/files/patch-base__threading__platform_thread_linux.cc

@@ -1,5 +1,5 @@
---- base/threading/platform_thread_linux.cc.orig	2013-08-17 20:52:20.000000000 +0300
+--- ./base/threading/platform_thread_linux.cc.orig	2014-04-24 22:36:10.000000000 +0200
-+++ base/threading/platform_thread_linux.cc	2013-08-17 20:56:34.000000000 +0300
++++ ./base/threading/platform_thread_linux.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -16,7 +16,9 @@
  #include "base/tracked_objects.h"
  
@@ -10,7 +10,7 @@
  #include <sys/resource.h>
  #include <sys/syscall.h>
  #include <sys/time.h>
-@@ -52,7 +54,7 @@
+@@ -48,7 +50,7 @@
    ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
    tracked_objects::ThreadData::InitializeThreadContext(name);
  

www/chromium/files/patch-breakpad__breakpad.gyp

@@ -1,11 +0,0 @@
---- breakpad/breakpad.gyp.orig	2014-01-07 21:02:21.000000000 +0100
-+++ breakpad/breakpad.gyp	2014-01-12 22:55:47.000000000 +0100
-@@ -334,7 +334,7 @@
-         },
-       ],
-     }],
--    [ 'OS=="linux" or OS=="android"', {
-+    [ 'OS=="linux" or OS=="android" or os_bsd==1', {
-       'conditions': [
-         ['OS=="android"', {
-           'defines': [

www/chromium/files/patch-build__common.gypi

@@ -1,6 +1,6 @@
---- build/common.gypi.orig	2014-02-20 21:28:44.000000000 +0100
+--- ./build/common.gypi.orig	2014-04-24 22:36:09.000000000 +0200
-+++ build/common.gypi	2014-02-24 23:02:26.000000000 +0100
++++ ./build/common.gypi	2014-04-24 23:23:42.000000000 +0200
-@@ -573,7 +573,7 @@
+@@ -565,7 +565,7 @@
          }],
  
          # DBus usage.
@@ -9,7 +9,7 @@
            'use_dbus%': 1,
          }, {
            'use_dbus%': 0,
-@@ -1008,6 +1008,10 @@
+@@ -1002,6 +1002,10 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
@@ -20,16 +20,16 @@
      # 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.
-@@ -1283,7 +1287,7 @@
+@@ -1322,7 +1326,7 @@
-       }],
+           # TODO(jungshik): Turn this on on Android.
-       ['os_posix==1 and OS!="mac" and OS!="ios"', {
+           # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
-         # Figure out the python architecture to decide if we build pyauto.
+           # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
--        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
+-          ['OS!="android"', {
-+        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)',
++          ['OS!="android" and os_bsd!=1', {
-         'conditions': [
+             'icu_use_data_file_flag%': 1,
-           ['target_arch=="mipsel"', {
+           }],
-             'werror%': '',
+         ],
-@@ -3610,6 +3614,13 @@
+@@ -3701,6 +3705,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],

www/chromium/files/patch-build__gyp_chromium

@@ -1,14 +1,14 @@
---- build/gyp_chromium.orig	2014-02-20 21:28:44.000000000 +0100
+--- ./build/gyp_chromium.orig	2014-04-24 22:36:09.000000000 +0200
-+++ build/gyp_chromium	2014-02-25 21:48:32.000000000 +0100
++++ ./build/gyp_chromium	2014-04-24 23:23:42.000000000 +0200
-@@ -245,8 +245,9 @@
+@@ -477,8 +477,9 @@
+     args.append('--check')
  
    supplemental_includes = GetSupplementalFiles()
- 
 -  if not RunGN(supplemental_includes):
 -    sys.exit(1)
 +  #TODO port GN to FreeBSD
 +  #if not RunGN(supplemental_includes):
 +  #  sys.exit(1)
- 
    args.extend(
        ['-I' + i for i in additional_include_files(supplemental_includes, args)])
+ 

www/chromium/files/patch-cc__layers__layer.cc

@@ -0,0 +1,22 @@
+--- ./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 @@
+   DCHECK(current_layer);
+   DCHECK(current_layer->id() == scroll_clip_layer_id_);
+ 
+-  gfx::Vector2dF max_offset(
++  // (rene) prevent name collission with /usr/include/vm/vm_map.h on FreeBSD
++  // which also defines max_offset
++  gfx::Vector2dF _max_offset(
+       scaled_scroll_bounds.width() - current_layer->bounds().width(),
+       scaled_scroll_bounds.height() - current_layer->bounds().height());
+   // We need the final scroll offset to be in CSS coords.
+-  max_offset.Scale(1.f / scale_factor);
+-  max_offset.SetToMax(gfx::Vector2dF());
+-  return gfx::ToFlooredVector2d(max_offset);
++  _max_offset.Scale(1.f / scale_factor);
++  _max_offset.SetToMax(gfx::Vector2dF());
++  return gfx::ToFlooredVector2d(_max_offset);
+ }
+ 
+ void Layer::SetScrollClipLayerId(int clip_layer_id) {

www/chromium/files/patch-cc__layers__layer_impl.cc

@@ -0,0 +1,32 @@
+--- ./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 @@
+   scaled_scroll_bounds.SetSize(scale_factor * scaled_scroll_bounds.width(),
+                                scale_factor * scaled_scroll_bounds.height());
+ 
+-  gfx::Vector2dF max_offset(
++  // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
++  // which also defines max_offset
++  gfx::Vector2dF _max_offset(
+       scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(),
+       scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height());
+   // We need the final scroll offset to be in CSS coords.
+-  max_offset.Scale(1 / scale_factor);
+-  max_offset.SetToMax(gfx::Vector2dF());
+-  return gfx::ToFlooredVector2d(max_offset);
++  _max_offset.Scale(1 / scale_factor);
++  _max_offset.SetToMax(gfx::Vector2dF());
++  return gfx::ToFlooredVector2d(_max_offset);
+ }
+ 
+ gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() {
+-  gfx::Vector2dF max_offset = MaxScrollOffset();
++  gfx::Vector2dF _max_offset = MaxScrollOffset();
+   gfx::Vector2dF old_offset = TotalScrollOffset();
+   gfx::Vector2dF clamped_offset = old_offset;
+ 
+-  clamped_offset.SetToMin(max_offset);
++  clamped_offset.SetToMin(_max_offset);
+   clamped_offset.SetToMax(gfx::Vector2d());
+   gfx::Vector2dF delta = clamped_offset - old_offset;
+   if (!delta.IsZero())

www/chromium/files/patch-chrome__app__chrome_main_delegate.cc

@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2014-02-20 21:27:29.000000000 +0100
+--- ./chrome/app/chrome_main_delegate.cc.orig	2014-04-24 22:34:55.000000000 +0200
-+++ chrome/app/chrome_main_delegate.cc	2014-02-25 01:39:55.000000000 +0100
++++ ./chrome/app/chrome_main_delegate.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -97,7 +97,7 @@
+@@ -95,7 +95,7 @@
  #include "ui/base/x/x11_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/breakpad/app/breakpad_linux.h"
  #endif
  
-@@ -115,7 +115,7 @@
+@@ -121,7 +121,7 @@
      g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
  #endif
  
@@ -18,16 +18,16 @@
  base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
      g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
  #endif
-@@ -235,7 +235,7 @@
+@@ -243,7 +243,7 @@
-       // Mac needs them for the plugin process name.
+       // Needed for scrollbar related images.
-       process_type == switches::kPluginProcess ||
+       process_type == switches::kWorkerProcess ||
  #endif
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -392,7 +392,7 @@
+@@ -457,7 +457,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -36,7 +36,7 @@
        } else if (format_str == "log") {
          format = diagnostics::DiagnosticsWriter::LOG;
        } else {
-@@ -433,7 +433,7 @@
+@@ -498,7 +498,7 @@
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
        if (format_str == "machine") {
@@ -45,7 +45,7 @@
        } else if (format_str == "human") {
          format = diagnostics::DiagnosticsWriter::HUMAN;
        } else {
-@@ -564,7 +564,7 @@
+@@ -629,7 +629,7 @@
    std::string process_type =
        command_line.GetSwitchValueASCII(switches::kProcessType);
  
@@ -54,7 +54,7 @@
    breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
  #endif
  
-@@ -703,7 +703,7 @@
+@@ -747,7 +747,7 @@
  #endif
    }
  
@@ -63,7 +63,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
  #if defined(OS_ANDROID)
-@@ -715,7 +715,7 @@
+@@ -759,7 +759,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.
-@@ -800,7 +800,7 @@
+@@ -844,7 +844,7 @@
    return process_type == switches::kNaClLoaderProcess ||
        process_type == switches::kRelauncherProcess;
  }

www/chromium/files/patch-chrome__app__chrome_main_delegate.h

@@ -1,5 +1,5 @@
---- chrome/app/chrome_main_delegate.h.orig	2014-02-20 21:27:29.000000000 +0100
+--- ./chrome/app/chrome_main_delegate.h.orig	2014-04-24 22:34:55.000000000 +0200
-+++ chrome/app/chrome_main_delegate.h	2014-02-25 01:45:34.000000000 +0100
++++ ./chrome/app/chrome_main_delegate.h	2014-04-24 23:23:42.000000000 +0200
 @@ -31,7 +31,7 @@
    virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
    virtual bool DelaySandboxInitialization(

www/chromium/files/patch-chrome__browser__about_flags.cc

@@ -1,11 +1,11 @@
---- chrome/browser/about_flags.cc.orig	2012-01-18 11:12:44.000000000 +0200
+--- ./chrome/browser/about_flags.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/about_flags.cc	2012-01-29 14:51:40.000000000 +0200
++++ ./chrome/browser/about_flags.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -674,7 +674,7 @@
+@@ -2320,7 +2320,7 @@
    return kOsWin;
  #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
    return kOsCrOS;
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    return kOsLinux;
- #else
+ #elif defined(OS_ANDROID)
- #error Unknown platform
+   return kOsAndroid;

www/chromium/files/patch-chrome__browser__browser_process_impl.cc

@@ -1,38 +1,11 @@
---- chrome/browser/browser_process_impl.cc.orig	2013-09-25 23:32:28.000000000 +0300
+--- ./chrome/browser/browser_process_impl.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/browser_process_impl.cc	2013-09-25 23:34:24.000000000 +0300
++++ ./chrome/browser/browser_process_impl.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -244,7 +244,7 @@
+@@ -261,7 +261,7 @@
  
    ExtensionRendererState::GetInstance()->Shutdown();
  
 -#if !defined(OS_ANDROID) && !defined(OS_IOS)
 +#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
    media_file_system_registry_.reset();
-   // Delete |storage_monitor_| now. Otherwise the FILE thread would be gone
+   // Remove the global instance of the Storage Monitor now. Otherwise the
-   // when we try to release it in the dtor and Valgrind would report a
+   // FILE thread would be gone when we try to release it in the dtor and
-@@ -618,7 +618,7 @@
- }
- 
- StorageMonitor* BrowserProcessImpl::storage_monitor() {
--#if defined(OS_ANDROID) || defined(OS_IOS)
-+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_BSD)
-   return NULL;
- #else
-   return storage_monitor_.get();
-@@ -627,7 +627,7 @@
- 
- void BrowserProcessImpl::set_storage_monitor_for_test(
-     scoped_ptr<StorageMonitor> monitor) {
--#if !defined(OS_ANDROID) && !defined(OS_IOS)
-+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
-   storage_monitor_ = monitor.Pass();
- #endif
- }
-@@ -923,7 +923,7 @@
-   }
- #endif
- 
--#if !defined(OS_ANDROID) && !defined(OS_IOS)
-+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD)
-   storage_monitor_.reset(StorageMonitor::Create());
- #endif
- 

www/chromium/files/patch-chrome__browser__chrome_browser_main.cc

@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main.cc.orig	2012-05-19 23:45:48.797106216 +0300
+--- ./chrome/browser/chrome_browser_main.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/chrome_browser_main.cc	2012-05-19 23:45:56.878106198 +0300
++++ ./chrome/browser/chrome_browser_main.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -1298,7 +1298,7 @@
+@@ -973,7 +973,7 @@
-   // just changed it to include experiments.
+   }
-   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
+ #endif
  
 -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
 +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
    // Set the product channel for crash reports.
-   child_process_logging::SetChannel(
+   base::debug::SetCrashKeyValue(crash_keys::kChannel,
        chrome::VersionInfo::GetVersionStringModifier());

www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2013-02-28 10:15:23.000000000 +0200
+--- ./chrome/browser/chrome_browser_main_posix.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/chrome_browser_main_posix.cc	2013-03-06 20:31:24.000000000 +0200
++++ ./chrome/browser/chrome_browser_main_posix.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -310,6 +310,11 @@
+@@ -314,6 +314,11 @@
      g_pipe_pid = getpid();
      g_shutdown_pipe_read_fd = pipefd[0];
      g_shutdown_pipe_write_fd = pipefd[1];
@@ -10,9 +10,9 @@
 +    const size_t kShutdownDetectorThreadStackSize = 0;
 +#else
  #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
-     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
+     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
  #else
-@@ -318,6 +323,7 @@
+@@ -322,6 +327,7 @@
      // size to avoid hitting the guard page.
      const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
  #endif

www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2014-01-07 21:01:57.000000000 +0100
+--- ./chrome/browser/chrome_content_browser_client.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/chrome_content_browser_client.cc	2014-01-11 01:50:13.000000000 +0100
++++ ./chrome/browser/chrome_content_browser_client.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -486,7 +486,7 @@
+@@ -493,7 +493,7 @@
    }
  }
  
@@ -9,16 +9,16 @@
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -543,7 +543,7 @@
+@@ -549,7 +549,7 @@
  
    return -1;
  }
 -#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 +#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  #endif  // !defined(OS_ANDROID)
-
+ 
  #if !defined(OS_CHROMEOS)
-@@ -1389,7 +1389,7 @@
+@@ -1449,7 +1449,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);
-@@ -2525,7 +2525,7 @@
+@@ -2587,7 +2587,7 @@
-           Profile::FromBrowserContext(browser_context)));
+   }
  }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ -36,7 +36,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const CommandLine& command_line,
      int child_process_id,
-@@ -2580,7 +2580,7 @@
+@@ -2642,7 +2642,7 @@
    }
  #endif  // defined(OS_ANDROID)
  }

www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h

@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2013-09-25 22:20:01.000000000 +0300
+--- ./chrome/browser/chrome_content_browser_client.h.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/chrome_content_browser_client.h	2013-09-25 22:20:17.000000000 +0300
++++ ./chrome/browser/chrome_content_browser_client.h	2014-04-24 23:23:42.000000000 +0200
-@@ -248,7 +248,7 @@
+@@ -255,7 +255,7 @@
        const base::FilePath& storage_partition_path,
        ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
  

www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc

@@ -1,8 +1,8 @@
---- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2013-11-08 07:40:50.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ chrome/browser/diagnostics/diagnostics_writer.cc	2013-11-16 11:31:52.000000000 +0100
++++ ./chrome/browser/diagnostics/diagnostics_writer.cc	2014-04-24 23:23:42.000000000 +0200
 @@ -268,7 +268,7 @@
        console_->SetColor(color);
-       console_->Write(ASCIIToUTF16(result));
+       console_->Write(base::ASCIIToUTF16(result));
      }
 -    if (format_ == MACHINE) {
 +    if (format_ == THEMACHINE) {

www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h

@@ -1,5 +1,5 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2013-11-08 07:40:50.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-04-24 22:35:10.000000000 +0200
-+++ chrome/browser/diagnostics/diagnostics_writer.h	2013-11-16 11:29:16.000000000 +0100
++++ ./chrome/browser/diagnostics/diagnostics_writer.h	2014-04-24 23:23:42.000000000 +0200
 @@ -18,7 +18,7 @@
   public:
    // The type of formatting done by this writer.

www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc

@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2013-11-16 01:16:39.000000000 +0100
+--- ./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	2013-11-17 23:32:59.000000000 +0100
++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -149,10 +149,12 @@
+@@ -166,10 +166,12 @@
  }
  
  bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() {

www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h

@@ -1,11 +0,0 @@
---- chrome/browser/extensions/api/image_writer_private/operation.h.orig	2013-11-08 07:40:50.000000000 +0100
-+++ chrome/browser/extensions/api/image_writer_private/operation.h	2013-11-15 20:19:03.000000000 +0100
-@@ -107,7 +107,7 @@
-   friend class base::RefCountedThreadSafe<Operation>;
- 
-   // TODO(haven): Clean up these switches. http://crbug.com/292956
--#if defined(OS_LINUX) && !defined(CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(CHROMEOS)
-   void WriteRun();
-   void WriteChunk(scoped_ptr<image_writer_utils::ImageReader> reader,
-                   scoped_ptr<image_writer_utils::ImageWriter> writer,

www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc

@@ -1,5 +1,5 @@
---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2014-02-20 21:27:39.000000000 +0100
+--- ./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-02-28 11:05:01.000000000 +0100
++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2014-04-24 23:23:42.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
@@ -11,7 +11,7 @@
  #include <sys/socket.h>  // Must be included before ifaddrs.h.
  #include <ifaddrs.h>
  #include <net/if.h>
-@@ -100,11 +104,33 @@
+@@ -102,11 +106,33 @@
                          const char* prefixes[],
                          size_t prefixes_count) {
      const int MAC_LENGTH = 6;
@@ -46,7 +46,7 @@
      int sd = socket(AF_INET, SOCK_DGRAM, 0);
      int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
      close(sd);
-@@ -114,11 +140,17 @@
+@@ -116,11 +142,17 @@
  
      const char* mac_address =
          static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);

www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc

@@ -0,0 +1,19 @@
+--- ./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 @@
+ 
+ void SerialGetDevicesFunction::Work() {
+   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+-
++#if !defined(OS_FREEBSD) //XXX(rene) quick hack
+   device::SerialDeviceInfoList devices;
+   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
+       device::SerialDeviceEnumerator::Create();
+@@ -105,6 +105,7 @@
+   }
+ 
+   results_ = serial::GetDevices::Results::Create(out_devices);
++#endif
+ }
+ 
+ SerialConnectFunction::SerialConnectFunction() {}

www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc

@@ -1,5 +1,5 @@
---- chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig	2014-02-20 21:27:38.000000000 +0100
+--- ./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-02-24 16:10:53.000000000 +0100
++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc	2014-04-24 23:23:42.000000000 +0200
 @@ -36,7 +36,7 @@
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)

www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc

@@ -1,5 +1,5 @@
---- chrome/browser/gpu/gl_string_manager.cc.orig	2013-09-02 20:59:56.000000000 +0300
+--- ./chrome/browser/gpu/gl_string_manager.cc.orig	2014-04-24 22:35:12.000000000 +0200
-+++ chrome/browser/gpu/gl_string_manager.cc	2013-09-02 21:01:13.000000000 +0300
++++ ./chrome/browser/gpu/gl_string_manager.cc	2014-04-24 23:23:42.000000000 +0200
 @@ -25,7 +25,7 @@
  
  void GLStringManager::Initialize() {

www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc

@@ -1,6 +1,6 @@
---- chrome/browser/gpu/gpu_feature_checker.cc.orig
+--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-04-24 22:35:12.000000000 +0200
-+++ chrome/browser/gpu/gpu_feature_checker.cc
++++ ./chrome/browser/gpu/gpu_feature_checker.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -33,7 +33,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() {
+@@ -33,7 +33,7 @@
    CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
  
    bool finalized = true;

www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc

@@ -1,11 +1,11 @@
---- chrome/browser/media/webrtc_log_uploader.cc.orig	2013-08-17 21:10:06.000000000 +0300
+--- ./chrome/browser/media/webrtc_log_uploader.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ chrome/browser/media/webrtc_log_uploader.cc	2013-08-17 21:10:45.000000000 +0300
++++ ./chrome/browser/media/webrtc_log_uploader.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -102,6 +102,8 @@
+@@ -155,6 +155,8 @@
    const char product[] = "Chrome_Android";
  #elif defined(OS_CHROMEOS)
    const char product[] = "Chrome_ChromeOS";
 +#elif defined(OS_FREEBSD)
 +  const char product[] = "Chrome_FreeBSD";
  #else
-   // This file should not be compiled for other platforms.
+ #error Platform not supported.
-   COMPILE_ASSERT(false);
+ #endif

www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc

@@ -1,5 +1,5 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2014-01-07 21:01:47.000000000 +0100
+--- ./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-01-13 17:44:02.000000000 +0100
++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc	2014-04-24 23:23:42.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

www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc

@@ -1,6 +1,6 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-02-03 15:15:11.000000000 -0500
+--- ./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-02-24 20:57:03.060309366 -0500
++++ ./chrome/browser/media_galleries/media_file_system_registry.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -591,7 +591,10 @@
+@@ -631,7 +631,10 @@
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl(this)) {

www/chromium/files/patch-chrome__browser__memory_details.cc

@@ -1,6 +1,6 @@
---- chrome/browser/memory_details.cc.orig	2012-10-31 21:02:26.000000000 +0200
+--- ./chrome/browser/memory_details.cc.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/browser/memory_details.cc	2012-11-07 17:28:28.000000000 +0200
++++ ./chrome/browser/memory_details.cc	2014-04-24 23:23:42.000000000 +0200
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
  #include "grit/generated_resources.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -9,7 +9,7 @@
  #include "content/public/browser/zygote_host_linux.h"
  #endif
  
-@@ -195,7 +195,7 @@
+@@ -204,7 +204,7 @@
  void MemoryDetails::CollectChildInfoOnUIThread() {
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
  
@@ -18,12 +18,12 @@
    const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
    const pid_t sandbox_helper_pid =
        content::ZygoteHost::GetInstance()->GetSandboxHelperPid();
-@@ -335,7 +335,7 @@
+@@ -345,7 +345,7 @@
        }
      }
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
      if (process.pid == zygote_pid) {
-       process.type = content::PROCESS_TYPE_ZYGOTE;
+       process.process_type = content::PROCESS_TYPE_ZYGOTE;
      } else if (process.pid == sandbox_helper_pid) {

www/chromium/files/patch-chrome__browser__net__connection_tester.cc

@@ -1,6 +1,6 @@
---- chrome/browser/net/connection_tester.cc.orig	2012-01-18 11:12:39.000000000 +0200
+--- ./chrome/browser/net/connection_tester.cc.orig	2014-04-24 22:35:02.000000000 +0200
-+++ chrome/browser/net/connection_tester.cc	2012-01-29 15:24:02.000000000 +0200
++++ ./chrome/browser/net/connection_tester.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -212,7 +212,7 @@
+@@ -217,7 +217,7 @@
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {

www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc

@@ -0,0 +1,11 @@
+--- ./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
+@@ -29,6 +29,8 @@
+     "linux";
+ #elif defined(OS_OPENBSD)
+     "openbsd";
++#elif defined(OS_FREEBSD)
++    "freebsd";
+ #else
+ #error "unknown os"
+ #endif

www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc

@@ -1,6 +1,6 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig	2013-01-03 16:15:04.489512557 +0200
+--- ./chrome/browser/plugins/plugins_resource_service.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ chrome/browser/plugins/plugins_resource_service.cc	2013-01-03 16:16:48.346512702 +0200
++++ ./chrome/browser/plugins/plugins_resource_service.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
    std::string filename;
  #if defined(OS_WIN)
    filename = "plugins_win.json";

www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc

@@ -1,18 +0,0 @@
---- chrome/browser/storage_monitor/storage_monitor.cc.orig	2013-08-23 15:58:31.000000000 +0300
-+++ chrome/browser/storage_monitor/storage_monitor.cc	2013-08-23 15:59:02.000000000 +0300
-@@ -63,6 +63,7 @@
- 
- void StorageMonitor::EnsureInitialized(base::Closure callback) {
-   DCHECK(thread_checker_.CalledOnValidThread());
-+#if !defined(OS_BSD)
-   if (initialized_) {
-     if (!callback.is_null())
-       callback.Run();
-@@ -78,6 +79,7 @@
- 
-   initializing_ = true;
-   Init();
-+#endif
- }
- 
- bool StorageMonitor::IsInitialized() {

www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h

@@ -1,6 +1,6 @@
---- chrome/browser/ui/gtk/accelerators_gtk.h.orig	2013-09-28 19:10:31.000000000 +0200
+--- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig	2014-04-24 22:34:59.000000000 +0200
-+++ chrome/browser/ui/gtk/accelerators_gtk.h	2013-10-11 13:42:01.000000000 +0200
++++ ./chrome/browser/ui/gtk/accelerators_gtk.h	2014-04-24 23:23:43.000000000 +0200
-@@ -8,6 +8,8 @@
+@@ -10,6 +10,8 @@
  #include "base/containers/hash_tables.h"
  #include "ui/base/accelerators/accelerator.h"
  

www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/gtk/first_run_dialog.cc.orig	2013-09-25 23:01:19.000000000 +0300
+--- ./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	2013-09-25 23:11:03.000000000 +0300
++++ ./chrome/browser/ui/gtk/first_run_dialog.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -160,6 +160,7 @@
+@@ -132,6 +132,7 @@
    if (dialog_)
      gtk_widget_hide_all(dialog_);
  
@@ -8,7 +8,7 @@
    // Check if user has opted into reporting.
    if (report_crashes_ &&
        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(report_crashes_))) {
-@@ -168,6 +169,9 @@
+@@ -140,6 +141,9 @@
    } else {
      GoogleUpdateSettings::SetCollectStatsConsent(false);
    }

www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig	2013-02-28 10:15:18.000000000 +0200
+--- ./chrome/browser/ui/webui/about_ui.cc.orig	2014-04-24 22:35:00.000000000 +0200
-+++ chrome/browser/ui/webui/about_ui.cc	2013-03-06 20:47:33.000000000 +0200
++++ ./chrome/browser/ui/webui/about_ui.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -740,7 +740,7 @@
+@@ -768,7 +768,7 @@
    return data;
  }
  
@@ -9,7 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data, 0,
-@@ -756,6 +756,7 @@
+@@ -784,6 +784,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>");
-@@ -818,6 +819,7 @@
+@@ -850,6 +851,7 @@
    return data;
  }
  #endif
@@ -25,7 +25,7 @@
  
  // AboutMemoryHandler ----------------------------------------------------------
  
-@@ -986,7 +988,7 @@
+@@ -1015,7 +1017,7 @@
    } else if (source_name_ == chrome::kChromeUIDNSHost) {
      AboutDnsHandler::Start(profile(), callback);
      return;

www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-01-07 21:01:49.000000000 +0100
+--- ./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-01-13 15:16:24.000000000 +0100
++++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -228,7 +228,7 @@
+@@ -229,7 +229,7 @@
    if (cert_index < 0)
      return;
  

www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2012-11-27 10:02:11.000000000 +0200
+--- ./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	2012-11-28 21:02:24.000000000 +0200
++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -366,7 +366,7 @@
+@@ -466,7 +466,7 @@
        url.host() == chrome::kChromeUIMemoryRedirectHost ||
        url.host() == chrome::kChromeUIStatsHost ||
        url.host() == chrome::kChromeUITermsHost

www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc

@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2013-08-30 06:46:19.000000000 +0300
+--- ./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	2013-09-03 21:15:44.092633766 +0300
++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -322,7 +322,8 @@
+@@ -313,7 +313,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 },
-@@ -596,7 +597,8 @@
+@@ -620,7 +621,8 @@
        "requestProfilesInfo",
        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                   base::Unretained(this)));
@@ -20,7 +20,7 @@
    web_ui()->RegisterMessageCallback(
        "themesSetNative",
        base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1323,7 +1325,8 @@
+@@ -1204,7 +1206,8 @@
    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
    bool is_native_theme = false;
  
@@ -30,13 +30,13 @@
    bool profile_is_managed = profile->IsManaged();
    is_native_theme = theme_service->UsingNativeTheme();
    base::FundamentalValue native_theme_enabled(!is_native_theme &&
-@@ -1345,7 +1348,8 @@
+@@ -1226,7 +1229,8 @@
    ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
  }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
 +    !defined(OS_ANDROID)
- void BrowserOptionsHandler::ThemesSetNative(const ListValue* args) {
+ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
    content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
    Profile* profile = Profile::FromWebUI(web_ui());

www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h

@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2013-09-03 21:22:36.851628387 +0300
+--- ./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	2013-09-03 21:23:09.395628553 +0300
++++ ./chrome/browser/ui/webui/options/browser_options_handler.h	2014-04-24 23:23:43.000000000 +0200
-@@ -193,7 +193,8 @@
+@@ -168,7 +168,8 @@
  
    void ObserveThemeChanged();
    void ThemesReset(const base::ListValue* args);

www/chromium/files/patch-chrome__browser__usb__usb_context.cc

@@ -1,6 +1,6 @@
---- chrome/browser/usb/usb_context.cc.orig	2013-10-08 21:07:13.000000000 +0300
+--- ./chrome/browser/usb/usb_context.cc.orig	2014-04-24 22:35:11.000000000 +0200
-+++ chrome/browser/usb/usb_context.cc	2013-10-08 22:04:50.000000000 +0300
++++ ./chrome/browser/usb/usb_context.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -44,7 +44,9 @@
+@@ -43,7 +43,9 @@
    running_ = false;
    // Spreading running_ to the UsbEventHandler thread.
    base::subtle::MemoryBarrier();

www/chromium/files/patch-chrome__browser__web_applications__web_app.cc

@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app.cc.orig	2013-11-16 01:16:28.000000000 +0100
+--- ./chrome/browser/web_applications/web_app.cc.orig	2014-04-24 22:35:10.000000000 +0200
-+++ chrome/browser/web_applications/web_app.cc	2013-11-17 21:13:42.000000000 +0100
++++ ./chrome/browser/web_applications/web_app.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -228,7 +228,7 @@
+@@ -226,7 +226,7 @@
  }
  #endif
  
@@ -8,4 +8,4 @@
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
  std::string GetWMClassFromAppName(std::string app_name) {
    file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
-   TrimString(app_name, "_", &app_name);
+   base::TrimString(app_name, "_", &app_name);

www/chromium/files/patch-chrome__browser__web_applications__web_app.h

@@ -1,5 +1,5 @@
---- chrome/browser/web_applications/web_app.h.orig	2013-11-08 07:40:41.000000000 +0100
+--- ./chrome/browser/web_applications/web_app.h.orig	2014-04-24 22:35:10.000000000 +0200
-+++ chrome/browser/web_applications/web_app.h	2013-11-15 23:02:30.000000000 +0100
++++ ./chrome/browser/web_applications/web_app.h	2014-04-24 23:23:43.000000000 +0200
 @@ -97,7 +97,7 @@
                    IconInfoList* icons);
  #endif

www/chromium/files/patch-chrome__chrome_browser.gypi

@@ -1,6 +1,6 @@
---- chrome/chrome_browser.gypi.orig	2013-09-20 05:36:07.000000000 +0300
+--- ./chrome/chrome_browser.gypi.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/chrome_browser.gypi	2013-09-23 20:34:16.000000000 +0300
++++ ./chrome/chrome_browser.gypi	2014-04-24 23:23:43.000000000 +0200
-@@ -2735,7 +2735,7 @@
+@@ -2949,7 +2949,7 @@
              '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
            ],
          }],
@@ -9,17 +9,17 @@
            'dependencies': [
              '../build/linux/system.gyp:libspeechd',
            ],
-@@ -2859,7 +2859,7 @@
+@@ -3077,7 +3077,7 @@
-             ],
+             '../build/linux/system.gyp:xscrnsaver',
-           },
+           ],
          }],
 -        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
 +        ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
            'sources': [
-             'app/breakpad_linux.cc',
+             'app/chrome_breakpad_client.cc',
-             'app/breakpad_linux.h',
+             'app/chrome_breakpad_client.h',
-@@ -3104,6 +3104,25 @@
+@@ -3345,6 +3345,25 @@
-             ['exclude', '^browser/usb/'],
+             ['exclude', '^third_party/mozilla_security_manager/'],
            ],
          }],
 +        ['os_bsd==1', {
@@ -42,5 +42,5 @@
 +          ],
 +        }],
          ['OS=="mac"', {
-           'sources!': [
+           'dependencies': [
-             'browser/automation/automation_provider_list_generic.cc',
+             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',

www/chromium/files/patch-chrome__chrome_browser_extensions.gypi

@@ -1,6 +1,6 @@
---- chrome/chrome_browser_extensions.gypi.orig	2013-11-16 01:17:16.000000000 +0100
+--- ./chrome/chrome_browser_extensions.gypi.orig	2014-04-24 22:35:13.000000000 +0200
-+++ chrome/chrome_browser_extensions.gypi	2013-11-17 17:09:41.000000000 +0100
++++ ./chrome/chrome_browser_extensions.gypi	2014-04-24 23:23:43.000000000 +0200
-@@ -854,6 +854,11 @@
+@@ -922,6 +922,11 @@
          'browser/extensions/window_controller_list_observer.h',
        ],
        'conditions': [

www/chromium/files/patch-chrome__common__chrome_paths.cc

@@ -1,7 +1,7 @@
---- chrome/common/chrome_paths.cc.orig	2013-02-28 10:15:52.000000000 +0200
+--- ./chrome/common/chrome_paths.cc.orig	2014-04-24 22:34:45.000000000 +0200
-+++ chrome/common/chrome_paths.cc	2013-03-06 21:25:36.000000000 +0200
++++ ./chrome/common/chrome_paths.cc	2014-04-24 23:23:48.000000000 +0200
-@@ -441,10 +441,12 @@
+@@ -440,10 +440,12 @@
-       if (!file_util::PathExists(cur))  // We don't want to create this
+       if (!base::PathExists(cur))  // We don't want to create this
          return false;
        break;
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
@@ -14,3 +14,21 @@
  #else
        cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
  #endif
+@@ -507,7 +509,7 @@
+ #endif
+       break;
+ 
+-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+     case chrome::DIR_NATIVE_MESSAGING:
+ #if defined(OS_MACOSX)
+ #if defined(GOOGLE_CHROME_BUILD)
+@@ -533,7 +535,7 @@
+         return false;
+       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
+       break;
+-#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#endif  // defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+ 
+     default:
+       return false;

www/chromium/files/patch-chrome__common__chrome_paths.h

@@ -0,0 +1,11 @@
+--- ./chrome/common/chrome_paths.h.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/chrome_paths.h	2014-04-24 23:23:43.000000000 +0200
+@@ -109,7 +109,7 @@
+                                    // files to be installed when managed user
+                                    // session starts.
+ 
+-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
++#if defined(OS_LINUX) || defined(OS_FREEBSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
+   DIR_NATIVE_MESSAGING,         // System directory where native messaging host
+                                 // manifest files are stored.
+   DIR_USER_NATIVE_MESSAGING,    // Directory with Native Messaging Hosts

www/chromium/files/patch-chrome__common__chrome_switches.cc

@@ -1,18 +1,20 @@
---- chrome/common/chrome_switches.cc.orig	2013-11-08 07:41:00.000000000 +0100
+--- ./chrome/common/chrome_switches.cc.orig	2014-04-24 22:34:45.000000000 +0200
-+++ chrome/common/chrome_switches.cc	2013-11-16 01:18:01.000000000 +0100
++++ ./chrome/common/chrome_switches.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -1563,13 +1563,13 @@
+@@ -1587,7 +1587,7 @@
+ const char kPasswordStore[]                 = "password-store";
  #endif
- #endif  // OS_POSIX
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
  // Triggers migration of user data directory to another directory
  // specified as a parameter. The migration is done under singleton lock,
  // and sanity checks are made to avoid corrupting the profile.
- // The browser exits after migration is complete.
+@@ -1598,7 +1598,7 @@
- const char kMigrateDataDirForSxS[]          = "migrate-data-dir-for-sxs";
+ // Linux speech service. Because it's buggy, the user must explicitly
+ // enable it so that visiting a random webpage can't cause instability.
+ const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher";
 -#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#endif  // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
  
  #if defined(OS_MACOSX)
- // Forcibly disables Lion-style on newer OSes, to allow developers to test the
+ // Disables the creation and launch of app shims for platform apps.

www/chromium/files/patch-chrome__common__chrome_switches.h

@@ -1,11 +1,11 @@
---- chrome/common/chrome_switches.h.orig	2013-11-08 07:41:00.000000000 +0100
+--- ./chrome/common/chrome_switches.h.orig	2014-04-24 22:34:45.000000000 +0200
-+++ chrome/common/chrome_switches.h	2013-11-16 01:20:25.000000000 +0100
++++ ./chrome/common/chrome_switches.h	2014-04-24 23:23:43.000000000 +0200
-@@ -435,7 +435,7 @@
+@@ -440,7 +440,7 @@
- #endif
+ extern const char kPasswordStore[];
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
+ extern const char kEnableSpeechDispatcher[];
  extern const char kMigrateDataDirForSxS[];
  #endif
- 

www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc

@@ -1,11 +0,0 @@
---- chrome/common/omaha_query_params/omaha_query_params.cc.orig	2013-05-07 22:43:58.000000000 +0300
-+++ chrome/common/omaha_query_params/omaha_query_params.cc	2013-05-07 22:44:41.000000000 +0300
-@@ -28,6 +28,8 @@
-   "linux";
- #elif defined(OS_OPENBSD)
-   "openbsd";
-+#elif defined(OS_FREEBSD)
-+  "freebsd";
- #else
-     #error "unknown os"
- #endif

www/chromium/files/patch-chrome__common__pref_names.cc

@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig	2013-08-17 21:26:00.000000000 +0300
+--- ./chrome/common/pref_names.cc.orig	2014-04-24 22:34:45.000000000 +0200
-+++ chrome/common/pref_names.cc	2013-08-17 21:26:43.000000000 +0300
++++ ./chrome/common/pref_names.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -955,7 +955,7 @@
+@@ -963,7 +963,7 @@
  // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
  const char kForceSafeSearch[] = "settings.force_safesearch";
  

www/chromium/files/patch-chrome__common__pref_names.h

@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig	2013-08-17 20:35:53.000000000 +0300
+--- ./chrome/common/pref_names.h.orig	2014-04-24 22:34:45.000000000 +0200
-+++ chrome/common/pref_names.h	2013-08-17 20:36:25.000000000 +0300
++++ ./chrome/common/pref_names.h	2014-04-24 23:23:43.000000000 +0200
-@@ -341,7 +341,7 @@
+@@ -306,7 +306,7 @@
  extern const char kForceSafeSearch[];
  extern const char kDeleteTimePeriod[];
  extern const char kLastClearBrowsingDataTime[];

www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc

@@ -1,5 +1,5 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2013-07-15 20:44:54.000000000 +0300
+--- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2014-04-24 22:34:56.000000000 +0200
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2013-07-15 20:45:49.000000000 +0300
++++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc	2014-04-24 23:23:43.000000000 +0200
 @@ -13,7 +13,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
  #include "ppapi/proxy/serialized_structs.h"
@@ -9,7 +9,7 @@
  #include "content/public/common/child_process_sandbox_support_linux.h"
  #endif
  
-@@ -28,12 +28,12 @@
+@@ -26,12 +26,12 @@
      : ResourceHost(host->GetPpapiHost(), instance, resource),
        renderer_ppapi_host_(host),
        fd_(-1) {
@@ -24,7 +24,7 @@
  }
  
  PepperFlashFontFileHost::~PepperFlashFontFileHost() {
-@@ -54,7 +54,7 @@
+@@ -52,7 +52,7 @@
      uint32_t table) {
    std::string contents;
    int32_t result = PP_ERROR_FAILED;
@@ -33,7 +33,7 @@
    if (fd_ != -1) {
      size_t length = 0;
      if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) {
-@@ -69,7 +69,7 @@
+@@ -67,7 +67,7 @@
        }
      }
    }

www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h

@@ -1,6 +1,6 @@
---- chrome/renderer/printing/print_web_view_helper.h.orig	2013-08-30 06:47:03.000000000 +0300
+--- ./chrome/renderer/printing/print_web_view_helper.h.orig	2014-04-24 22:34:55.000000000 +0200
-+++ chrome/renderer/printing/print_web_view_helper.h	2013-09-03 21:39:51.232633592 +0300
++++ ./chrome/renderer/printing/print_web_view_helper.h	2014-04-24 23:23:43.000000000 +0200
-@@ -231,7 +231,7 @@
+@@ -214,7 +214,7 @@
    void FinishFramePrinting();
  
    // Prints the page listed in |params|.
@@ -8,4 +8,4 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX)
    void PrintPageInternal(const PrintMsg_PrintPage_Params& params,
                           const gfx::Size& canvas_size,
-                          WebKit::WebFrame* frame,
+                          blink::WebFrame* frame,

www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc

@@ -1,13 +1,13 @@
---- chrome/test/base/in_process_browser_test.cc.orig	2011-11-01 10:43:07.000000000 +0200
+--- ./chrome/test/base/in_process_browser_test.cc.orig	2014-04-24 22:34:34.000000000 +0200
-+++ chrome/test/base/in_process_browser_test.cc	2011-11-19 19:32:51.000000000 +0200
++++ ./chrome/test/base/in_process_browser_test.cc	2014-04-24 23:23:43.000000000 +0200
-@@ -41,6 +41,10 @@
+@@ -72,6 +72,10 @@
- #include "chrome/browser/chromeos/audio_handler.h"
+ 
- #endif
+ namespace {
  
 +#if defined(OS_FREEBSD)
 +#include <signal.h>
 +#endif
 +
  // Passed as value of kTestType.
- static const char kBrowserTestType[] = "browser";
+ const char kBrowserTestType[] = "browser";
  

www/chromium/files/patch-chrome__test__base__testing_browser_process.h

@@ -1,8 +1,8 @@
---- chrome/test/base/testing_browser_process.h.orig	2011-11-01 10:43:07.000000000 +0200
+--- ./chrome/test/base/testing_browser_process.h.orig	2014-04-24 22:34:34.000000000 +0200
-+++ chrome/test/base/testing_browser_process.h	2011-11-19 19:35:37.000000000 +0200
++++ ./chrome/test/base/testing_browser_process.h	2014-04-24 23:23:43.000000000 +0200
-@@ -110,7 +110,7 @@
+@@ -101,7 +101,7 @@
+   virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
    virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
-   virtual bool plugin_finder_disabled() const OVERRIDE;
  
 -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)

www/chromium/files/patch-chrome__test__perf__perf_test.cc

@@ -1,5 +1,5 @@
---- chrome/test/perf/perf_test.cc.orig	2013-08-19 21:01:58.000000000 +0300
+--- ./chrome/test/perf/perf_test.cc.orig	2014-04-24 22:34:37.000000000 +0200
-+++ chrome/test/perf/perf_test.cc	2013-08-19 21:03:16.000000000 +0300
++++ ./chrome/test/perf/perf_test.cc	2014-04-24 23:23:43.000000000 +0200
 @@ -352,7 +352,7 @@
    AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
                 total_working_set_size, "bytes",

www/chromium/files/patch-chrome__test__ui__ui_test.cc

@@ -1,5 +1,5 @@
---- ./chrome/test/ui/ui_test.cc.orig	2010-12-16 02:12:11.000000000 +0100
+--- ./chrome/test/ui/ui_test.cc.orig	2014-04-24 22:34:34.000000000 +0200
-+++ ./chrome/test/ui/ui_test.cc	2010-12-20 20:15:08.000000000 +0100
++++ ./chrome/test/ui/ui_test.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -68,7 +68,7 @@
      L"NOTE: This test is expected to fail if crash_service.exe is not "
      L"running. Start it manually before running this test (see the build "

www/chromium/files/patch-chrome__tools__build__linux__sed.sh

@@ -1,8 +1,8 @@
---- ./chrome/tools/build/linux/sed.sh.orig	2010-12-16 02:11:59.000000000 +0100
+--- ./chrome/tools/build/linux/sed.sh.orig	2014-04-24 22:34:55.000000000 +0200
-+++ ./chrome/tools/build/linux/sed.sh	2010-12-20 20:15:08.000000000 +0100
++++ ./chrome/tools/build/linux/sed.sh	2014-04-24 23:23:44.000000000 +0200
 @@ -1,4 +1,4 @@
--#!/bin/bash
+-#!/bin/sh
 +#!/usr/bin/env bash
  
- # Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ # Copyright (c) 2011 The Chromium Authors. All rights reserved.
  # Use of this source code is governed by a BSD-style license that can be

www/chromium/files/patch-components__policy__resources__policy_templates.json

@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig	2013-09-24 21:57:03.000000000 +0300
+--- ./components/policy/resources/policy_templates.json.orig	2014-04-24 22:35:25.000000000 +0200
-+++ components/policy/resources/policy_templates.json	2013-09-24 21:59:32.000000000 +0300
++++ ./components/policy/resources/policy_templates.json	2014-04-24 23:23:44.000000000 +0200
-@@ -1366,7 +1366,7 @@
+@@ -1421,7 +1421,7 @@
            'name': 'GSSAPILibraryName',
            'type': 'string',
            'schema': { 'type': 'string' },
@@ -9,7 +9,7 @@
            'features': {
              'dynamic_refresh': False,
              'per_profile': False,
-@@ -3339,7 +3339,7 @@
+@@ -3543,7 +3543,7 @@
        'name': 'RequireOnlineRevocationChecksForLocalAnchors',
        'type': 'main',
        'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
        'features': {
          'dynamic_refresh': True,
          'per_profile': False,
-@@ -3976,7 +3976,7 @@
+@@ -4202,7 +4202,7 @@
        'name': 'BackgroundModeEnabled',
        'type': 'main',
        'schema': { 'type': 'boolean' },

www/chromium/files/patch-components__policy__tools__generate_policy_source.py

@@ -1,5 +1,5 @@
---- components/policy/tools/generate_policy_source.py.orig	2013-09-24 21:55:28.000000000 +0300
+--- ./components/policy/tools/generate_policy_source.py.orig	2014-04-24 22:35:24.000000000 +0200
-+++ components/policy/tools/generate_policy_source.py	2013-09-24 21:56:43.000000000 +0300
++++ ./components/policy/tools/generate_policy_source.py	2014-04-24 23:23:44.000000000 +0200
 @@ -64,7 +64,7 @@
        if platform.startswith('chrome.'):
          platform_sub = platform[7:]

www/chromium/files/patch-components__storage_monitor.gypi

@@ -0,0 +1,40 @@
+--- ./components/storage_monitor.gypi.orig	2014-04-24 22:35:26.000000000 +0200
++++ ./components/storage_monitor.gypi	2014-04-24 23:23:44.000000000 +0200
+@@ -20,10 +20,10 @@
+         'storage_monitor/image_capture_device_manager.mm',
+         'storage_monitor/media_storage_util.cc',
+         'storage_monitor/media_storage_util.h',
+-        'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
+-        'storage_monitor/media_transfer_protocol_device_observer_linux.h',
+-        'storage_monitor/mtab_watcher_linux.cc',
+-        'storage_monitor/mtab_watcher_linux.h',
++        #'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
++        #'storage_monitor/media_transfer_protocol_device_observer_linux.h',
++        #'storage_monitor/mtab_watcher_linux.cc',
++        #'storage_monitor/mtab_watcher_linux.h',
+         'storage_monitor/portable_device_watcher_win.cc',
+         'storage_monitor/portable_device_watcher_win.h',
+         'storage_monitor/removable_device_constants.cc',
+@@ -35,16 +35,18 @@
+         'storage_monitor/storage_monitor.h',
+         'storage_monitor/storage_monitor_chromeos.cc',
+         'storage_monitor/storage_monitor_chromeos.h',
+-        'storage_monitor/storage_monitor_linux.cc',
+-        'storage_monitor/storage_monitor_linux.h',
++        #'storage_monitor/storage_monitor_linux.cc',
++        #'storage_monitor/storage_monitor_linux.h',
++        'storage_monitor/storage_monitor_freebsd.cc',
++        'storage_monitor/storage_monitor_freebsd.h',
+         'storage_monitor/storage_monitor_mac.h',
+         'storage_monitor/storage_monitor_mac.mm',
+         'storage_monitor/storage_monitor_win.cc',
+         'storage_monitor/storage_monitor_win.h',
+         'storage_monitor/transient_device_ids.cc',
+         'storage_monitor/transient_device_ids.h',
+-        'storage_monitor/udev_util_linux.cc',
+-        'storage_monitor/udev_util_linux.h',
++        #'storage_monitor/udev_util_linux.cc',
++        #'storage_monitor/udev_util_linux.h',
+         'storage_monitor/volume_mount_watcher_win.cc',
+         'storage_monitor/volume_mount_watcher_win.h',
+       ],

www/chromium/files/patch-components__storage_monitor__storage_monitor.cc

@@ -0,0 +1,18 @@
+--- ./components/storage_monitor/storage_monitor.cc.orig	2014-04-24 22:35:25.000000000 +0200
++++ ./components/storage_monitor/storage_monitor.cc	2014-04-24 23:23:44.000000000 +0200
+@@ -83,6 +83,7 @@
+ 
+ void StorageMonitor::EnsureInitialized(base::Closure callback) {
+   DCHECK(thread_checker_.CalledOnValidThread());
++//#if !defined(OS_BSD) //XXX(rene) why disabled?
+   if (initialized_) {
+     if (!callback.is_null())
+       callback.Run();
+@@ -98,6 +99,7 @@
+ 
+   initializing_ = true;
+   Init();
++//#endif
+ }
+ 
+ bool StorageMonitor::IsInitialized() const {

www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc

@@ -0,0 +1,101 @@
+--- ./components/storage_monitor/storage_monitor_freebsd.cc.orig	2014-04-24 23:23:44.000000000 +0200
++++ ./components/storage_monitor/storage_monitor_freebsd.cc	2014-04-24 23:23:44.000000000 +0200
+@@ -0,0 +1,98 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// StorageMonitorFreeBSD implementation.
++
++#include "components/storage_monitor/storage_monitor_freebsd.h"
++
++#include <stdio.h>
++
++#include <list>
++
++#include "base/basictypes.h"
++#include "base/bind.h"
++#include "base/metrics/histogram.h"
++#include "base/process/kill.h"
++#include "base/process/launch.h"
++#include "base/stl_util.h"
++#include "base/strings/string_number_conversions.h"
++#include "base/strings/string_util.h"
++#include "base/strings/utf_string_conversions.h"
++#include "components/storage_monitor/media_storage_util.h"
++#include "components/storage_monitor/removable_device_constants.h"
++#include "components/storage_monitor/storage_info.h"
++
++using content::BrowserThread;
++
++namespace {
++
++// udev device property constants.
++const char kBlockSubsystemKey[] = "block";
++const char kDiskDeviceTypeKey[] = "disk";
++const char kFsUUID[] = "ID_FS_UUID";
++const char kLabel[] = "ID_FS_LABEL";
++const char kModel[] = "ID_MODEL";
++const char kModelID[] = "ID_MODEL_ID";
++const char kRemovableSysAttr[] = "removable";
++const char kSerialShort[] = "ID_SERIAL_SHORT";
++const char kSizeSysAttr[] = "size";
++const char kVendor[] = "ID_VENDOR";
++const char kVendorID[] = "ID_VENDOR_ID";
++
++StorageMonitor::EjectStatus EjectPathOnFileThread(
++    const base::FilePath& path,
++    const base::FilePath& device) {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
++
++  static const char kUmountBinary[] = "/sbin/umount";
++  std::vector<std::string> command;
++  command.push_back(kUmountBinary);
++  command.push_back(path.value());
++
++  base::LaunchOptions options;
++  base::ProcessHandle handle;
++  if (!base::LaunchProcess(command, options, &handle))
++    return StorageMonitor::EJECT_FAILURE;
++
++  int exit_code = -1;
++  if (!base::WaitForExitCodeWithTimeout(handle, &exit_code,
++      base::TimeDelta::FromMilliseconds(3000))) {
++    base::KillProcess(handle, -1, false);
++    base::EnsureProcessTerminated(handle);
++    return StorageMonitor::EJECT_FAILURE;
++  }
++
++  // TODO(gbillock): Make sure this is found in documentation
++  // somewhere. Experimentally it seems to hold that exit code
++  // 1 means device is in use.
++  if (exit_code == 1)
++    return StorageMonitor::EJECT_IN_USE;
++  if (exit_code != 0)
++    return StorageMonitor::EJECT_FAILURE;
++
++  return StorageMonitor::EJECT_OK;
++}
++
++}  // namespace
++
++StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++StorageMonitorFreeBSD::~StorageMonitorFreeBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++void StorageMonitorFreeBSD::Init() {
++}
++
++bool StorageMonitorFreeBSD::GetStorageInfoForPath(
++    const base::FilePath& path,
++    StorageInfo* device_info) const {
++  return false; // TODO
++}
++
++StorageMonitor* StorageMonitor::CreateInternal() {
++  return new StorageMonitorFreeBSD();
++}

www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h

@@ -0,0 +1,46 @@
+--- ./components/storage_monitor/storage_monitor_freebsd.h.orig	2014-04-24 23:23:44.000000000 +0200
++++ ./components/storage_monitor/storage_monitor_freebsd.h	2014-04-24 23:23:44.000000000 +0200
+@@ -0,0 +1,43 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// StorageMonitorFreeBSD processes mount point change events, notifies listeners
++// about the addition and deletion of media devices, and answers queries about
++// mounted devices.
++// StorageMonitorFreeBSD lives on the UI thread, and uses ???
++// the FILE thread to get mount point change events.
++
++#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++
++#include <map>
++#include <string>
++
++#include "base/basictypes.h"
++#include "base/compiler_specific.h"
++#include "base/files/file_path.h"
++#include "base/files/file_path_watcher.h"
++#include "base/memory/scoped_ptr.h"
++#include "base/memory/weak_ptr.h"
++#include "components/storage_monitor/storage_monitor.h"
++#include "content/public/browser/browser_thread.h"
++
++class StorageMonitorFreeBSD : public StorageMonitor {
++ public:
++  // Should only be called by browser start up code.
++  // Use StorageMonitor::GetInstance() instead.
++  explicit StorageMonitorFreeBSD();
++  virtual ~StorageMonitorFreeBSD();
++
++  // Must be called for StorageMonitorFreeBSD to work.
++  virtual void Init() OVERRIDE;
++ private:
++  // StorageMonitor implementation.
++  virtual bool GetStorageInfoForPath(const base::FilePath& path,
++                                     StorageInfo* device_info) const OVERRIDE;
++
++  DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
++};
++
++#endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_

www/chromium/files/patch-content__app__content_main_runner.cc

@@ -1,6 +1,6 @@
---- content/app/content_main_runner.cc.orig	2013-07-15 19:05:22.000000000 +0300
+--- ./content/app/content_main_runner.cc.orig	2014-04-24 22:35:46.000000000 +0200
-+++ content/app/content_main_runner.cc	2013-07-15 19:11:30.000000000 +0300
++++ ./content/app/content_main_runner.cc	2014-04-24 23:23:44.000000000 +0200
-@@ -78,10 +78,10 @@
+@@ -86,10 +86,10 @@
  #include "base/posix/global_descriptors.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -13,7 +13,7 @@
  #include "content/zygote/zygote_main.h"
  #endif
  
-@@ -323,7 +323,8 @@
+@@ -339,7 +339,8 @@
    int (*function)(const MainFunctionParams&);
  };
  
@@ -23,7 +23,7 @@
  // On platforms that use the zygote, we have a special subset of
  // subprocesses that are launched via the zygote.  This function
  // fills in some process-launching bits around ZygoteMain().
-@@ -432,7 +433,8 @@
+@@ -475,7 +476,8 @@
      }
    }
  

www/chromium/files/patch-content__browser__browser_main_loop.cc

@@ -1,5 +1,5 @@
---- content/browser/browser_main_loop.cc.orig	2014-02-20 21:28:24.000000000 +0100
+--- ./content/browser/browser_main_loop.cc.orig	2014-04-24 22:35:48.000000000 +0200
-+++ content/browser/browser_main_loop.cc	2014-02-24 20:28:45.000000000 +0100
++++ ./content/browser/browser_main_loop.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -102,7 +102,7 @@
  #include "ui/gfx/gtk_util.h"
  #endif
@@ -9,7 +9,7 @@
  #include <sys/stat.h>
  
  #include "content/browser/renderer_host/render_sandbox_host_linux.h"
-@@ -125,7 +125,7 @@
+@@ -129,7 +129,7 @@
  namespace content {
  namespace {
  
@@ -18,7 +18,7 @@
  void SetupSandbox(const CommandLine& parsed_command_line) {
    TRACE_EVENT0("startup", "SetupSandbox");
    // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this
-@@ -346,7 +346,7 @@
+@@ -353,7 +353,7 @@
  void BrowserMainLoop::EarlyInitialization() {
    TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
  
@@ -27,7 +27,7 @@
    // No thread should be created before this call, as SetupSandbox()
    // will end-up using fork().
    SetupSandbox(parsed_command_line_);
-@@ -784,7 +784,7 @@
+@@ -777,7 +777,7 @@
    }
  #endif
  

www/chromium/files/patch-content__browser__child_process_launcher.cc

@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher.cc.orig	2012-11-27 10:01:25.000000000 +0200
+--- ./content/browser/child_process_launcher.cc.orig	2014-04-24 22:35:48.000000000 +0200
-+++ content/browser/child_process_launcher.cc	2012-12-09 17:02:22.000000000 +0200
++++ ./content/browser/child_process_launcher.cc	2014-04-24 23:23:44.000000000 +0200
-@@ -53,7 +53,7 @@
+@@ -58,7 +58,7 @@
          termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION),
          exit_code_(RESULT_CODE_NORMAL_EXIT),
          starting_(true)
@@ -9,16 +9,16 @@
          , zygote_(false)
  #endif
          {
-@@ -196,7 +196,7 @@
+@@ -245,7 +245,7 @@
-         FileDescriptorInfo(kPrimaryIPCChannel,
+     // child termination.
-                                     base::FileDescriptor(ipcfd, false)));
+     file_util::ScopedFD ipcfd_closer(&ipcfd);
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
      GetContentClient()->browser()->
          GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
                                                  &files_to_register);
-@@ -217,7 +217,7 @@
+@@ -266,7 +266,7 @@
                  base::GlobalDescriptors::kBaseDescriptor));
        }
  
@@ -27,7 +27,7 @@
        if (process_type == switches::kRendererProcess) {
          const int sandbox_fd =
              RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -269,7 +269,7 @@
+@@ -320,7 +320,7 @@
        base::Bind(
            &Context::Notify,
            this_object.get(),
@@ -36,7 +36,7 @@
            use_zygote,
  #endif
            handle));
-@@ -277,7 +277,7 @@
+@@ -328,7 +328,7 @@
    }
  
    void Notify(
@@ -45,7 +45,7 @@
        bool zygote,
  #endif
        base::ProcessHandle handle) {
-@@ -290,7 +290,7 @@
+@@ -341,7 +341,7 @@
      if (!handle)
        LOG(ERROR) << "Failed to launch child process";
  
@@ -54,7 +54,7 @@
      zygote_ = zygote;
  #endif
      if (client_) {
-@@ -313,7 +313,7 @@
+@@ -368,7 +368,7 @@
          BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
          base::Bind(
              &Context::TerminateInternal,
@@ -63,7 +63,7 @@
              zygote_,
  #endif
              process_.handle()));
-@@ -327,7 +327,7 @@
+@@ -382,7 +382,7 @@
    }
  
    static void TerminateInternal(
@@ -72,7 +72,7 @@
        bool zygote,
  #endif
        base::ProcessHandle handle) {
-@@ -341,7 +341,7 @@
+@@ -396,7 +396,7 @@
      process.Terminate(RESULT_CODE_NORMAL_EXIT);
      // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -81,7 +81,7 @@
      if (zygote) {
        // If the renderer was created via a zygote, we have to proxy the reaping
        // through the zygote process.
-@@ -368,7 +368,7 @@
+@@ -423,7 +423,7 @@
  #if defined(OS_ANDROID)
    // The fd to close after creating the process.
    int ipcfd_;
@@ -90,7 +90,7 @@
    bool zygote_;
  #endif
  };
-@@ -423,7 +423,7 @@
+@@ -481,7 +481,7 @@
        *exit_code = context_->exit_code_;
      return context_->termination_status_;
    }
@@ -98,4 +98,4 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
    if (context_->zygote_) {
      context_->termination_status_ = ZygoteHostImpl::GetInstance()->
-         GetTerminationStatus(handle, &context_->exit_code_);
+         GetTerminationStatus(handle, known_dead, &context_->exit_code_);

www/chromium/files/patch-content__browser__download__base_file.cc

@@ -1,6 +1,6 @@
---- content/browser/download/base_file.cc.orig	2013-08-18 21:43:48.000000000 +0300
+--- ./content/browser/download/base_file.cc.orig	2014-04-24 22:35:46.000000000 +0200
-+++ content/browser/download/base_file.cc	2013-08-18 21:44:22.000000000 +0300
++++ ./content/browser/download/base_file.cc	2014-04-24 23:23:44.000000000 +0200
-@@ -212,7 +212,8 @@
+@@ -216,7 +216,8 @@
  }
  
  // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.

www/chromium/files/patch-content__browser__download__base_file_linux.cc

@@ -1,5 +1,5 @@
---- content/browser/download/base_file_linux.cc.orig	2013-08-21 09:50:31.000000000 +0300
+--- ./content/browser/download/base_file_linux.cc.orig	2014-04-24 22:35:46.000000000 +0200
-+++ content/browser/download/base_file_linux.cc	2013-08-21 09:51:22.000000000 +0300
++++ ./content/browser/download/base_file_linux.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -13,7 +13,9 @@
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
    DCHECK(!detached_);

www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc

@@ -1,35 +0,0 @@
---- content/browser/fileapi/file_system_dir_url_request_job_unittest.cc.orig	2014-01-07 21:02:28.000000000 +0100
-+++ content/browser/fileapi/file_system_dir_url_request_job_unittest.cc	2014-01-13 16:18:14.000000000 +0100
-@@ -248,7 +248,7 @@
- 
-   std::istringstream in(delegate_->data_received());
-   std::string line;
--  EXPECT_TRUE(std::getline(in, line));
-+  /*EXPECT_TRUE*/(std::getline(in, line));
- 
- #if defined(OS_WIN)
-   EXPECT_EQ("<script>start(\"foo\\\\bar\");</script>", line);
-@@ -256,10 +256,10 @@
-   EXPECT_EQ("<script>start(\"/foo/bar\");</script>", line);
- #endif
- 
--  EXPECT_TRUE(std::getline(in, line));
-+  /*EXPECT_TRUE*/(std::getline(in, line));
-   VerifyListingEntry(line, "hoge", "hoge", false, 10);
- 
--  EXPECT_TRUE(std::getline(in, line));
-+  /*EXPECT_TRUE*/(std::getline(in, line));
-   VerifyListingEntry(line, "baz", "baz", true, 0);
- }
- 
-@@ -307,8 +307,8 @@
- 
-   std::istringstream in(delegate_->data_received());
-   std::string line;
--  EXPECT_TRUE(std::getline(in, line));
--  EXPECT_FALSE(std::getline(in, line));
-+  /*EXPECT_TRUE*/(std::getline(in, line));
-+  /*EXPECT_FALSE*/(std::getline(in, line));
- 
-   TestRequestWithContext(CreateFileSystemURL("foo"),
-                          file_system_context.get());

www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc

@@ -1,5 +1,5 @@
---- content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-01-07 21:02:28.000000000 +0100
+--- ./content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-04-24 22:35:46.000000000 +0200
-+++ content/browser/geolocation/location_arbitrator_impl.cc	2014-01-13 16:30:21.000000000 +0100
++++ ./content/browser/geolocation/location_arbitrator_impl.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -160,7 +160,7 @@
  }
  

www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc

@@ -1,5 +1,5 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2013-11-15 12:34:18.000000000 +0100
+--- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2014-04-24 23:23:44.000000000 +0200
-+++ content/browser/geolocation/wifi_data_provider_freebsd.cc	2013-11-15 22:09:52.000000000 +0100
++++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -0,0 +1,200 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -148,7 +148,7 @@
 +			}
 +			strncpy(ssid, id, idlen);
 +			ssid[idlen] = '\0';
-+			apd.ssid = UTF8ToUTF16(ssid);
++			apd.ssid = base::UTF8ToUTF16(ssid);
 +			apd.mac_address = MacAddressAsString16(isr->isr_bssid);
 +			apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise;
 +			apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise;

www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h

@@ -1,5 +1,5 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2013-11-15 12:34:18.000000000 +0100
+--- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2014-04-24 23:23:44.000000000 +0200
-+++ content/browser/geolocation/wifi_data_provider_freebsd.h	2013-11-15 22:08:05.000000000 +0100
++++ ./content/browser/geolocation/wifi_data_provider_freebsd.h	2014-04-24 23:23:44.000000000 +0200
 @@ -0,0 +1,31 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be

www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc

@@ -1,19 +0,0 @@
---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig	2014-02-20 21:28:22.000000000 +0100
-+++ content/browser/renderer_host/pepper/pepper_file_io_host.cc	2014-02-24 22:13:44.000000000 +0100
-@@ -308,10 +308,12 @@
-     int64_t actual_offset =
-         (open_flags_ & PP_FILEOPENFLAG_APPEND) ? max_written_offset_ : offset;
- 
--    uint64_t max_offset = actual_offset + buffer.size();
--    if (max_offset > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))
--      return PP_ERROR_FAILED;  // max_offset overflows.
--    int64_t amount = static_cast<int64_t>(max_offset) - max_written_offset_;
-+    // (rene) rename 'max_offset' to '_max_offset' to avoid a conflict with
-+    // /usr/include/vm/vm_map.h on FreeBSD 10.0
-+    uint64_t _max_offset = actual_offset + buffer.size();
-+    if (_max_offset > static_cast<uint64_t>(std::numeric_limits<int64_t>::max()))
-+      return PP_ERROR_FAILED;  // _max_offset overflows.
-+    int64_t amount = static_cast<int64_t>(_max_offset) - max_written_offset_;
- 
-     // Quota request amounts are restricted to 32 bits so we can use atomics
-     // when we move this code to the plugin side of the proxy.

www/chromium/files/patch-content__common__set_process_title_linux.cc

@@ -1,5 +1,5 @@
---- content/common/set_process_title_linux.cc.orig	2011-03-20 22:02:04.226737055 +0200
+--- ./content/common/set_process_title_linux.cc.orig	2014-04-24 22:35:41.000000000 +0200
-+++ content/common/set_process_title_linux.cc	2011-03-20 22:02:04.407737434 +0200
++++ ./content/common/set_process_title_linux.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -48,6 +48,8 @@
  extern char** environ;
  

www/chromium/files/patch-content__common__set_process_title_linux.h

@@ -1,8 +1,8 @@
---- content/common/set_process_title_linux.h.orig	2011-03-20 22:02:04.219736445 +0200
+--- ./content/common/set_process_title_linux.h.orig	2014-04-24 22:35:41.000000000 +0200
-+++ content/common/set_process_title_linux.h	2011-03-20 22:02:04.404739287 +0200
++++ ./content/common/set_process_title_linux.h	2014-04-24 23:23:44.000000000 +0200
-@@ -6,6 +6,9 @@
+@@ -5,6 +5,9 @@
- #define CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
- #pragma once
+ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
  
 +#include "build/build_config.h"
 +
@@ -10,7 +10,7 @@
  // Set the process title that will show in "ps" and similar tools. Takes
  // printf-style format string and arguments. After calling setproctitle()
  // the original main() argv[] array should not be used. By default, the
-@@ -15,6 +18,7 @@
+@@ -14,6 +17,7 @@
  // This signature and naming is to be compatible with most other Unix
  // implementations of setproctitle().
  void setproctitle(const char* fmt, ...);

www/chromium/files/patch-content__content_browser.gypi

@@ -1,6 +1,6 @@
---- ./content/content_browser.gypi.orig	2014-02-20 21:28:25.000000000 +0100
+--- ./content/content_browser.gypi.orig	2014-04-24 22:35:48.000000000 +0200
-+++ ./content/content_browser.gypi	2014-02-24 23:00:37.000000000 +0100
++++ ./content/content_browser.gypi	2014-04-24 23:23:44.000000000 +0200
-@@ -586,6 +586,8 @@
+@@ -596,6 +596,8 @@
      'browser/geolocation/wifi_data_provider_common_win.cc',
      'browser/geolocation/wifi_data_provider_common_win.h',
      'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
@@ -9,7 +9,7 @@
      'browser/geolocation/wifi_data_provider_linux.cc',
      'browser/geolocation/wifi_data_provider_linux.h',
      'browser/geolocation/wifi_data_provider_mac.cc',
-@@ -1543,8 +1545,18 @@
+@@ -1564,8 +1566,18 @@
        ],
      }],
      ['os_bsd==1', {
@@ -29,8 +29,8 @@
 +        'browser/udev_linux.cc',
        ],
      }],
-     ['use_aura!=1 and OS!="win"', {
+     ['use_aura!=1 and OS!="android"', {
-@@ -1635,7 +1647,7 @@
+@@ -1647,7 +1659,7 @@
          'browser/geolocation/empty_wifi_data_provider.cc',
        ],
      }],

www/chromium/files/patch-content__content_common.gypi

@@ -1,6 +1,6 @@
---- content/content_common.gypi.orig	2014-02-20 21:28:25.000000000 +0100
+--- ./content/content_common.gypi.orig	2014-04-24 22:35:48.000000000 +0200
-+++ content/content_common.gypi	2014-02-24 20:59:04.000000000 +0100
++++ ./content/content_common.gypi	2014-04-24 23:23:44.000000000 +0200
-@@ -482,6 +482,21 @@
+@@ -479,6 +479,21 @@
          'content.gyp:common_aidl',
        ],
      }],