MFH: r352803

Update to 34.0.1847.132 Obtained from: https://github.com/gliaskos/freebsd-chromium/ Security: http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html Approved by: portmgr (erwin)
author: Rene Ladan <rene@FreeBSD.org> 2014-05-03 10:02:35 +0000
committer: Rene Ladan <rene@FreeBSD.org> 2014-05-03 10:02:35 +0000
commit: d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553 (patch)
tree: 843b721a512771c94d9cdb6e645e07d46c0d648a
parent: 9d7947dfa95a2c447839c24edc6f59935ece1ebf (diff)
download: ports-d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553.tar.gz
ports-d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553.zip
192 files changed, 1124 insertions, 952 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 070a31dc54dc..3c64e7878501 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -4,7 +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
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -21,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 \
@@ -133,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
@@ -179,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}|" \
@@ -191,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} \
@@ -219,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
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 65ea37df68c3..d64861fde4f0 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-33.0.1750.152.tar.xz) = 9fd462840bee3ae205b0548e8a483f7589beecdb7c6309d4d65425cbf710cc2f
-SIZE (chromium-33.0.1750.152.tar.xz) = 185396116
-SHA256 (chromium-33.0.1750.152-testdata.tar.xz) = 0367fba6100a0538769955bad02cc17d3a6919d3dd391777283fb5a2fe4f56b0
-SIZE (chromium-33.0.1750.152-testdata.tar.xz) = 112419292
+SHA256 (chromium-34.0.1847.132.tar.xz) = e8930a43d2cff3cd98d4772f6b7a527b363fa9567afbe86a4c0574dc25886038
+SIZE (chromium-34.0.1847.132.tar.xz) = 190164176
+SHA256 (chromium-34.0.1847.132-testdata.tar.xz) = 0c3c9894cd1a16bfcfc122d40d38bf1c6986087e17d22d86de9d3624c404eb32
+SIZE (chromium-34.0.1847.132-testdata.tar.xz) = 108476892
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index 9fefe7e121cd..6373e21396c8 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/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/renderer_host/render_widget_host_view_guest.cc	2014-01-13 13:48:52.000000000 +0100
-@@ -254,7 +254,7 @@
+--- content/browser/frame_host/render_widget_host_view_guest.cc.orig	2014-03-05 22:24:07.000000000 +0100
++++ content/browser/frame_host/render_widget_host_view_guest.cc	2014-03-09 20:01:20.000000000 +0100
+@@ -258,11 +258,11 @@
+ 
  gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
-   if (guest_->GetEmbedderRenderWidgetHostView())
-     return guest_->GetEmbedderRenderWidgetHostView()->GetNativeViewId();
--  return static_cast<gfx::NativeViewId>(NULL);
-+  return reinterpret_cast<gfx::NativeViewId>(NULL);
+   if (!guest_)
+-    return static_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() {
+-
diff --git a/www/chromium/files/extra-patch-fixup-execinfo b/www/chromium/files/extra-patch-fixup-execinfo
index e4c97fdbe1c4..b008d7190fa7 100644
--- a/www/chromium/files/extra-patch-fixup-execinfo
+++ b/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	2014-01-08 01:14:20.000000000 +0100
-@@ -41,7 +41,7 @@
+--- v8/src/checks.cc.orig	2014-03-07 23:57:27.000000000 +0100
++++ v8/src/checks.cc	2014-03-08 00:04:14.000000000 +0100
+@@ -44,7 +44,7 @@
  static V8_INLINE void DumpBacktrace() {
  #if V8_LIBC_GLIBC || V8_OS_BSD
    void* trace[100];
diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc
index 6b10f5d0b02c..f825d9309fde 100644
--- a/www/chromium/files/extra-patch-gcc
+++ b/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"
  
diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp
index 72821c3caebb..111b08dc82d2 100644
--- a/www/chromium/files/patch-base__base.gyp
+++ b/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	2013-09-26 03:00:53.000000000 +0300
-@@ -823,6 +823,11 @@
+--- ./base/base.gyp.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/base.gyp	2014-04-24 23:23:41.000000000 +0200
+@@ -820,6 +820,11 @@
              ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
            ],
          }],
diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi
index b99ffcbec49b..f9ef459d1c84 100644
--- a/www/chromium/files/patch-base__base.gypi
+++ b/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	2013-09-26 02:24:27.000000000 +0300
-@@ -872,11 +872,15 @@
+--- ./base/base.gypi.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/base.gypi	2014-04-24 23:23:41.000000000 +0200
+@@ -918,11 +918,15 @@
                '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
diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
index 679a54696ef1..50c330dd148e 100644
--- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc
+++ b/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	2013-02-13 20:27:44.000000000 +0200
-@@ -14,6 +14,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#if defined(OS_FREEBSD)
-+#include <ucontext.h>
-+#endif
+--- ./base/debug/stack_trace_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/debug/stack_trace_posix.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -471,7 +471,7 @@
  
- #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);
-+#endif
+-  count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
++  count_ = std::max<size_t>(backtrace(trace_, arraysize(trace_)), 0);
  }
  
- void StackTrace::PrintBacktrace() const {
+ void StackTrace::Print() const {
diff --git a/www/chromium/files/patch-base__file_util_posix.cc b/www/chromium/files/patch-base__file_util_posix.cc
index 98f73fff2ee2..327ec2a231ee 100644
--- a/www/chromium/files/patch-base__file_util_posix.cc
+++ b/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	2014-02-24 15:44:01.000000000 +0100
-@@ -673,7 +673,7 @@
+--- ./base/file_util_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/file_util_posix.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -672,7 +672,7 @@
  #endif  // defined(OS_ANDROID)
    results->is_directory = S_ISDIR(file_info.st_mode);
    results->size = file_info.st_size;
diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
index 20a1e3b3a153..2071c5fdc835 100644
--- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
+++ b/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	2013-08-30 19:34:24.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	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.
diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h
index 29e84f5728c6..a30872db026f 100644
--- a/www/chromium/files/patch-base__process__internal_linux.h
+++ b/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	2013-09-07 21:29:08.000000000 +0200
-@@ -10,6 +10,8 @@
+--- ./base/process/internal_linux.h.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/internal_linux.h	2014-04-24 23:23:41.000000000 +0200
+@@ -12,6 +12,8 @@
  
  #include "base/files/file_path.h"
  
 +#include <unistd.h> /* pid_t */
 +
  namespace base {
- namespace internal {
  
+ class Time;
diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc
index 8308d692fd87..67821949cc81 100644
--- a/www/chromium/files/patch-base__process__memory_unittest.cc
+++ b/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	2013-09-24 23:50:57.000000000 +0300
-@@ -153,12 +153,12 @@
+--- ./base/process/memory_unittest.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/memory_unittest.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -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
  
diff --git a/www/chromium/files/patch-base__process__process_handle_freebsd.cc b/www/chromium/files/patch-base__process__process_handle_freebsd.cc
index 986db4039918..5ba22f391793 100644
--- a/www/chromium/files/patch-base__process__process_handle_freebsd.cc
+++ b/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	2013-09-24 20:41:45.000000000 +0300
+--- ./base/process/process_handle_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/process_handle_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -6,33 +6,35 @@
  
  #include <sys/sysctl.h>
diff --git a/www/chromium/files/patch-base__process__process_iterator.h b/www/chromium/files/patch-base__process__process_iterator.h
index 69a99084c15b..0c5af4969be5 100644
--- a/www/chromium/files/patch-base__process__process_iterator.h
+++ b/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	2013-08-16 22:08:08.000000000 +0300
+--- ./base/process/process_iterator.h.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/process_iterator.h	2014-04-24 23:23:41.000000000 +0200
 @@ -21,6 +21,11 @@
  #include <windows.h>
  #include <tlhelp32.h>
diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
index ecea4cd107a3..6675de452f33 100644
--- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
+++ b/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	2013-09-07 21:31:37.000000000 +0200
+--- ./base/process/process_iterator_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/process_iterator_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -6,6 +6,10 @@
  
  #include <sys/sysctl.h>
diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h
index 916c92d0046f..e7d6b8030e3e 100644
--- a/www/chromium/files/patch-base__process__process_metrics.h
+++ b/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	2013-08-16 22:04:12.000000000 +0300
-@@ -15,6 +15,13 @@
- #include "base/process.h"
- #include "base/time.h"
+--- ./base/process/process_metrics.h.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/process_metrics.h	2014-04-24 23:23:41.000000000 +0200
+@@ -17,6 +17,13 @@
+ #include "base/time/time.h"
+ #include "base/values.h"
  
 +#if defined(OS_BSD)
 +#include <kvm.h>
diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
index 42cfa6ebe860..74bff548350f 100644
--- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
+++ b/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	2013-09-07 21:30:29.000000000 +0200
+--- ./base/process/process_metrics_freebsd.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/process/process_metrics_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "base/process/process_metrics.h"
diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc
index 4a4e4ef69e14..c5204339c145 100644
--- a/www/chromium/files/patch-base__security_unittest.cc
+++ b/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	2013-09-01 01:13:35.000000000 +0300
-@@ -161,7 +161,7 @@
+--- ./base/security_unittest.cc.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/security_unittest.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -159,7 +159,7 @@
  // FAILS_ is too clunky.
  void OverflowTestsSoftExpectTrue(bool overflow_detected) {
    if (!overflow_detected) {
diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc
index 023027f05962..20eeacd535a3 100644
--- a/www/chromium/files/patch-base__strings__safe_sprintf.cc
+++ b/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	2014-03-07 14:14:55.000000000 +0100
+--- ./base/strings/safe_sprintf.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/strings/safe_sprintf.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -107,11 +107,11 @@
        : buffer_(buffer),
          size_(size - 1),  // Account for trailing NUL byte
diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc
index c0f0fae341ff..9dca90861a43 100644
--- a/www/chromium/files/patch-base__sys_info_freebsd.cc
+++ b/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	2013-10-09 17:13:04.000000000 +0200
+--- ./base/sys_info_freebsd.cc.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/sys_info_freebsd.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -4,6 +4,7 @@
  
  #include "base/sys_info.h"
diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc
index 02d2c218a428..bef84a4fc3b5 100644
--- a/www/chromium/files/patch-base__sys_info_posix.cc
+++ b/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	2011-02-07 00:21:53.000000000 +0100
-@@ -23,7 +23,7 @@
+--- ./base/sys_info_posix.cc.orig	2014-04-24 22:36:11.000000000 +0200
++++ ./base/sys_info_posix.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -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
-   // Mac and Linux.  So we get the number of "online logical" processors.
+   return g_lazy_number_of_processors.Get().value();
+ }
diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc
index 92cf91885525..1f6acfe4e4ac 100644
--- a/www/chromium/files/patch-base__test__expectations__expectation.cc
+++ b/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	2013-08-31 23:18:59.000000000 +0300
-@@ -58,6 +58,7 @@
+--- ./base/test/expectations/expectation.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/test/expectations/expectation.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -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";
diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc
index 927504d800b4..004d9342559c 100644
--- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc
+++ b/www/chromium/files/patch-base__test__launcher__test_launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig	2014-01-07 21:01:10.000000000 +0100
-+++ base/test/launcher/test_launcher.cc	2014-01-13 01:36:07.000000000 +0100
-@@ -36,6 +36,10 @@
+--- ./base/test/launcher/test_launcher.cc.orig	2014-04-24 22:36:09.000000000 +0200
++++ ./base/test/launcher/test_launcher.cc	2014-04-24 23:23:41.000000000 +0200
+@@ -39,6 +39,10 @@
  #include "base/mac/scoped_nsautorelease_pool.h"
  #endif
  
diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc
index 81d771e5685d..e8c3e3837014 100644
--- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc
+++ b/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	2013-08-17 20:56:34.000000000 +0300
+--- ./base/threading/platform_thread_linux.cc.orig	2014-04-24 22:36:10.000000000 +0200
++++ ./base/threading/platform_thread_linux.cc	2014-04-24 23:23:41.000000000 +0200
 @@ -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);
  
diff --git a/www/chromium/files/patch-breakpad__breakpad.gyp b/www/chromium/files/patch-breakpad__breakpad.gyp
deleted file mode 100644
index ad1e7cd13b78..000000000000
--- a/www/chromium/files/patch-breakpad__breakpad.gyp
+++ /dev/null
@@ -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': [
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index 245b46e767a0..1f43a64d8a63 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/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	2014-02-24 23:02:26.000000000 +0100
-@@ -573,7 +573,7 @@
+--- ./build/common.gypi.orig	2014-04-24 22:36:09.000000000 +0200
++++ ./build/common.gypi	2014-04-24 23:23:42.000000000 +0200
+@@ -565,7 +565,7 @@
          }],
  
          # 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 @@
-       }],
-       ['os_posix==1 and OS!="mac" and OS!="ios"', {
-         # Figure out the python architecture to decide if we build pyauto.
--        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
-+        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)',
-         'conditions': [
-           ['target_arch=="mipsel"', {
-             'werror%': '',
-@@ -3610,6 +3614,13 @@
+@@ -1322,7 +1326,7 @@
+           # TODO(jungshik): Turn this on on Android.
+           # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
+           # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
+-          ['OS!="android"', {
++          ['OS!="android" and os_bsd!=1', {
+             'icu_use_data_file_flag%': 1,
+           }],
+         ],
+@@ -3701,6 +3705,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],
diff --git a/www/chromium/files/patch-build__gyp_chromium b/www/chromium/files/patch-build__gyp_chromium
index 557bf51e0741..2fe6f0f26faa 100644
--- a/www/chromium/files/patch-build__gyp_chromium
+++ b/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	2014-02-25 21:48:32.000000000 +0100
-@@ -245,8 +245,9 @@
+--- ./build/gyp_chromium.orig	2014-04-24 22:36:09.000000000 +0200
++++ ./build/gyp_chromium	2014-04-24 23:23:42.000000000 +0200
+@@ -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)])
+ 
diff --git a/www/chromium/files/patch-cc__layers__layer.cc b/www/chromium/files/patch-cc__layers__layer.cc
new file mode 100644
index 000000000000..6ffa36ce0cbd
--- /dev/null
+++ b/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) {
diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc
new file mode 100644
index 000000000000..b93e6c1d6c8c
--- /dev/null
+++ b/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())
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
index f93d59ccd4b8..fceb46b86668 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
+++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2014-02-20 21:27:29.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc	2014-02-25 01:39:55.000000000 +0100
-@@ -97,7 +97,7 @@
+--- ./chrome/app/chrome_main_delegate.cc.orig	2014-04-24 22:34:55.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -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 @@
-       // Mac needs them for the plugin process name.
-       process_type == switches::kPluginProcess ||
+@@ -243,7 +243,7 @@
+       // Needed for scrollbar related images.
+       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;
  }
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
index 4b34ff5c3d58..abfc6343c87b 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
+++ b/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	2014-02-25 01:45:34.000000000 +0100
+--- ./chrome/app/chrome_main_delegate.h.orig	2014-04-24 22:34:55.000000000 +0200
++++ ./chrome/app/chrome_main_delegate.h	2014-04-24 23:23:42.000000000 +0200
 @@ -31,7 +31,7 @@
    virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
    virtual bool DelaySandboxInitialization(
diff --git a/www/chromium/files/patch-chrome__browser__about_flags.cc b/www/chromium/files/patch-chrome__browser__about_flags.cc
index 718c713918bd..23341c559643 100644
--- a/www/chromium/files/patch-chrome__browser__about_flags.cc
+++ b/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	2012-01-29 14:51:40.000000000 +0200
-@@ -674,7 +674,7 @@
+--- ./chrome/browser/about_flags.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/about_flags.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -2320,7 +2320,7 @@
    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
- #error Unknown platform
+ #elif defined(OS_ANDROID)
+   return kOsAndroid;
diff --git a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc b/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
index 1a01213c5db3..0ed743884343 100644
--- a/www/chromium/files/patch-chrome__browser__browser_process_impl.cc
+++ b/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	2013-09-25 23:34:24.000000000 +0300
-@@ -244,7 +244,7 @@
+--- ./chrome/browser/browser_process_impl.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/browser_process_impl.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -261,7 +261,7 @@
  
    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
-   // when we try to release it in the dtor and Valgrind would report a
-@@ -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
- 
+   // Remove the global instance of the Storage Monitor now. Otherwise the
+   // FILE thread would be gone when we try to release it in the dtor and
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
index 6ed998892b95..423e4b989107 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
+++ b/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	2012-05-19 23:45:56.878106198 +0300
-@@ -1298,7 +1298,7 @@
-   // just changed it to include experiments.
-   child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
+--- ./chrome/browser/chrome_browser_main.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/chrome_browser_main.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -973,7 +973,7 @@
+   }
+ #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());
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
index 39b6a5f2acf8..22f1069ea9e9 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
+++ b/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	2013-03-06 20:31:24.000000000 +0200
-@@ -310,6 +310,11 @@
+--- ./chrome/browser/chrome_browser_main_posix.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/chrome_browser_main_posix.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -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
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
index f0b22cbc289e..e6c39c322e96 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2014-01-07 21:01:57.000000000 +0100
-+++ chrome/browser/chrome_content_browser_client.cc	2014-01-11 01:50:13.000000000 +0100
-@@ -486,7 +486,7 @@
+--- ./chrome/browser/chrome_content_browser_client.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -493,7 +493,7 @@
    }
  }
  
@@ -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 @@
-           Profile::FromBrowserContext(browser_context)));
+@@ -2587,7 +2587,7 @@
+   }
  }
  
 -#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)
  }
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
index 2c97b162d0a5..bd34a097de23 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
+++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
@@ -1,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	2013-09-25 22:20:17.000000000 +0300
-@@ -248,7 +248,7 @@
+--- ./chrome/browser/chrome_content_browser_client.h.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/chrome_content_browser_client.h	2014-04-24 23:23:42.000000000 +0200
+@@ -255,7 +255,7 @@
        const base::FilePath& storage_partition_path,
        ScopedVector<fileapi::FileSystemBackend>* additional_backends) OVERRIDE;
  
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
index b2bd0e46231e..2705fd514da3 100644
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
+++ b/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	2013-11-16 11:31:52.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-04-24 22:35:10.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.cc	2014-04-24 23:23:42.000000000 +0200
 @@ -268,7 +268,7 @@
        console_->SetColor(color);
-       console_->Write(ASCIIToUTF16(result));
+       console_->Write(base::ASCIIToUTF16(result));
      }
 -    if (format_ == MACHINE) {
 +    if (format_ == THEMACHINE) {
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
index 460dcd4176bf..6bdba7bf291f 100644
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
+++ b/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	2013-11-16 11:29:16.000000000 +0100
+--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-04-24 22:35:10.000000000 +0200
++++ ./chrome/browser/diagnostics/diagnostics_writer.h	2014-04-24 23:23:42.000000000 +0200
 @@ -18,7 +18,7 @@
   public:
    // The type of formatting done by this writer.
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
index 21696b0a8973..f5df16858f29 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
+++ b/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	2013-11-17 23:32:59.000000000 +0100
-@@ -149,10 +149,12 @@
+--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-04-24 22:35:08.000000000 +0200
++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -166,10 +166,12 @@
  }
  
  bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunImpl() {
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h
deleted file mode 100644
index 6bc78533f959..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__operation.h
+++ /dev/null
@@ -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,
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
index fbacc011b063..89a00ba30fca 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
+++ b/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	2014-02-28 11:05:01.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-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);
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc
new file mode 100644
index 000000000000..9042b9795b10
--- /dev/null
+++ b/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() {}
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc b/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
index 904207906092..34ac85bc6abd 100644
--- a/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc
+++ b/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	2014-02-24 16:10:53.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-04-24 23:23:42.000000000 +0200
 @@ -36,7 +36,7 @@
      BITRATE_TO_SPEED_CASE(9600)
      BITRATE_TO_SPEED_CASE(19200)
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
index 05dea9daeb4c..d06d13849f23 100644
--- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
+++ b/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	2013-09-02 21:01:13.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	2014-04-24 23:23:42.000000000 +0200
 @@ -25,7 +25,7 @@
  
  void GLStringManager::Initialize() {
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
index a6335513508b..aabeccaccb17 100644
--- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
+++ b/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
-@@ -33,7 +33,7 @@ void GPUFeatureChecker::CheckGPUFeatureAvailability() {
+--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-04-24 22:35:12.000000000 +0200
++++ ./chrome/browser/gpu/gpu_feature_checker.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -33,7 +33,7 @@
    CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
  
    bool finalized = true;
diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
index f8838d1dd8ba..9ff2f56909df 100644
--- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
+++ b/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	2013-08-17 21:10:45.000000000 +0300
-@@ -102,6 +102,8 @@
+--- ./chrome/browser/media/webrtc_log_uploader.cc.orig	2014-04-24 22:35:11.000000000 +0200
++++ ./chrome/browser/media/webrtc_log_uploader.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -155,6 +155,8 @@
    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.
-   COMPILE_ASSERT(false);
+ #error Platform not supported.
+ #endif
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
index b171587550ff..8f49c3a1a76e 100644
--- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
+++ b/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	2014-01-13 17:44:02.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-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
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
index 26c43da07511..d5e512a0cb62 100644
--- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
+++ b/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	2014-02-24 20:57:03.060309366 -0500
-@@ -591,7 +591,10 @@
+--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-04-24 22:35:11.000000000 +0200
++++ ./chrome/browser/media_galleries/media_file_system_registry.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -631,7 +631,10 @@
  // Constructor in 'private' section because depends on private class definition.
  MediaFileSystemRegistry::MediaFileSystemRegistry()
      : file_system_context_(new MediaFileSystemContextImpl(this)) {
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc
index 1f6144d75f67..0bab4e127c85 100644
--- a/www/chromium/files/patch-chrome__browser__memory_details.cc
+++ b/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	2012-11-07 17:28:28.000000000 +0200
-@@ -31,7 +31,7 @@
+--- ./chrome/browser/memory_details.cc.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/browser/memory_details.cc	2014-04-24 23:23:42.000000000 +0200
+@@ -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) {
diff --git a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc b/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
index 594398cb0f73..eb157992b5b8 100644
--- a/www/chromium/files/patch-chrome__browser__net__connection_tester.cc
+++ b/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	2012-01-29 15:24:02.000000000 +0200
-@@ -212,7 +212,7 @@
+--- ./chrome/browser/net/connection_tester.cc.orig	2014-04-24 22:35:02.000000000 +0200
++++ ./chrome/browser/net/connection_tester.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -217,7 +217,7 @@
    // Otherwise returns a network error code.
    int CreateSystemProxyConfigService(
        scoped_ptr<net::ProxyConfigService>* config_service) {
diff --git a/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc
new file mode 100644
index 000000000000..788b09688dc3
--- /dev/null
+++ b/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
diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
index 6632d003ba21..14e4b6cc48ae 100644
--- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
+++ b/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	2013-01-03 16:16:48.346512702 +0200
-@@ -31,7 +31,7 @@
+--- ./chrome/browser/plugins/plugins_resource_service.cc.orig	2014-04-24 22:35:10.000000000 +0200
++++ ./chrome/browser/plugins/plugins_resource_service.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -33,7 +33,7 @@
    std::string filename;
  #if defined(OS_WIN)
    filename = "plugins_win.json";
diff --git a/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc
deleted file mode 100644
index 029baa43e610..000000000000
--- a/www/chromium/files/patch-chrome__browser__storage_monitor__storage_monitor.cc
+++ /dev/null
@@ -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() {
diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h b/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
index 996575a6e281..ac99a611cc62 100644
--- a/www/chromium/files/patch-chrome__browser__ui__gtk__accelerators_gtk.h
+++ b/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	2013-10-11 13:42:01.000000000 +0200
-@@ -8,6 +8,8 @@
+--- ./chrome/browser/ui/gtk/accelerators_gtk.h.orig	2014-04-24 22:34:59.000000000 +0200
++++ ./chrome/browser/ui/gtk/accelerators_gtk.h	2014-04-24 23:23:43.000000000 +0200
+@@ -10,6 +10,8 @@
  #include "base/containers/hash_tables.h"
  #include "ui/base/accelerators/accelerator.h"
  
diff --git a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
index 513339cf4161..ec6945b8dfb2 100644
--- a/www/chromium/files/patch-chrome__browser__ui__gtk__first_run_dialog.cc
+++ b/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	2013-09-25 23:11:03.000000000 +0300
-@@ -160,6 +160,7 @@
+--- ./chrome/browser/ui/gtk/first_run_dialog.cc.orig	2014-04-24 22:34:59.000000000 +0200
++++ ./chrome/browser/ui/gtk/first_run_dialog.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -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);
    }
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
index 531e60a7609a..0d6ada8701b6 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
+++ b/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	2013-03-06 20:47:33.000000000 +0200
-@@ -740,7 +740,7 @@
+--- ./chrome/browser/ui/webui/about_ui.cc.orig	2014-04-24 22:35:00.000000000 +0200
++++ ./chrome/browser/ui/webui/about_ui.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -768,7 +768,7 @@
    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;
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
index e112dec01b16..e2e06bd11d5d 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__certificate_viewer_webui.cc
+++ b/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	2014-01-13 15:16:24.000000000 +0100
-@@ -228,7 +228,7 @@
+--- ./chrome/browser/ui/webui/certificate_viewer_webui.cc.orig	2014-04-24 22:35:00.000000000 +0200
++++ ./chrome/browser/ui/webui/certificate_viewer_webui.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -229,7 +229,7 @@
    if (cert_index < 0)
      return;
  
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
index df12a7be791d..506ad7a4166b 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2012-11-27 10:02:11.000000000 +0200
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2012-11-28 21:02:24.000000000 +0200
-@@ -366,7 +366,7 @@
+--- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-04-24 22:35:00.000000000 +0200
++++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -466,7 +466,7 @@
        url.host() == chrome::kChromeUIMemoryRedirectHost ||
        url.host() == chrome::kChromeUIStatsHost ||
        url.host() == chrome::kChromeUITermsHost
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
index 0c83c644066c..a2d8a04da9fb 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2013-08-30 06:46:19.000000000 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc	2013-09-03 21:15:44.092633766 +0300
-@@ -322,7 +322,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-04-24 22:35:00.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -313,7 +313,8 @@
      { "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());
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
index 8baec8a6a2ba..4c7f165da8d0 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2013-09-03 21:22:36.851628387 +0300
-+++ chrome/browser/ui/webui/options/browser_options_handler.h	2013-09-03 21:23:09.395628553 +0300
-@@ -193,7 +193,8 @@
+--- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-04-24 22:35:00.000000000 +0200
++++ ./chrome/browser/ui/webui/options/browser_options_handler.h	2014-04-24 23:23:43.000000000 +0200
+@@ -168,7 +168,8 @@
  
    void ObserveThemeChanged();
    void ThemesReset(const base::ListValue* args);
diff --git a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc b/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
index b41c22ce4d14..fb53e4e96353 100644
--- a/www/chromium/files/patch-chrome__browser__usb__usb_context.cc
+++ b/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	2013-10-08 22:04:50.000000000 +0300
-@@ -44,7 +44,9 @@
+--- ./chrome/browser/usb/usb_context.cc.orig	2014-04-24 22:35:11.000000000 +0200
++++ ./chrome/browser/usb/usb_context.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -43,7 +43,9 @@
    running_ = false;
    // Spreading running_ to the UsbEventHandler thread.
    base::subtle::MemoryBarrier();
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
index 0f31d57a32bc..46a192a27e2f 100644
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
+++ b/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	2013-11-17 21:13:42.000000000 +0100
-@@ -228,7 +228,7 @@
+--- ./chrome/browser/web_applications/web_app.cc.orig	2014-04-24 22:35:10.000000000 +0200
++++ ./chrome/browser/web_applications/web_app.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -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);
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
index aeda405b12bf..d22201cb0c96 100644
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
+++ b/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	2013-11-15 23:02:30.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	2014-04-24 23:23:43.000000000 +0200
 @@ -97,7 +97,7 @@
                    IconInfoList* icons);
  #endif
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index 66158bb31a44..7eabd95bdf4e 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/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	2013-09-23 20:34:16.000000000 +0300
-@@ -2735,7 +2735,7 @@
+--- ./chrome/chrome_browser.gypi.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/chrome_browser.gypi	2014-04-24 23:23:43.000000000 +0200
+@@ -2949,7 +2949,7 @@
              '../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/breakpad_linux.h',
-@@ -3104,6 +3104,25 @@
-             ['exclude', '^browser/usb/'],
+             'app/chrome_breakpad_client.cc',
+             'app/chrome_breakpad_client.h',
+@@ -3345,6 +3345,25 @@
+             ['exclude', '^third_party/mozilla_security_manager/'],
            ],
          }],
 +        ['os_bsd==1', {
@@ -42,5 +42,5 @@
 +          ],
 +        }],
          ['OS=="mac"', {
-           'sources!': [
-             'browser/automation/automation_provider_list_generic.cc',
+           'dependencies': [
+             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
index 8a301836b2f9..8f44839e97c1 100644
--- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
+++ b/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	2013-11-17 17:09:41.000000000 +0100
-@@ -854,6 +854,11 @@
+--- ./chrome/chrome_browser_extensions.gypi.orig	2014-04-24 22:35:13.000000000 +0200
++++ ./chrome/chrome_browser_extensions.gypi	2014-04-24 23:23:43.000000000 +0200
+@@ -922,6 +922,11 @@
          'browser/extensions/window_controller_list_observer.h',
        ],
        'conditions': [
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc
index 6ca29057bc5a..fbe15a6a3051 100644
--- a/www/chromium/files/patch-chrome__common__chrome_paths.cc
+++ b/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	2013-03-06 21:25:36.000000000 +0200
-@@ -441,10 +441,12 @@
-       if (!file_util::PathExists(cur))  // We don't want to create this
+--- ./chrome/common/chrome_paths.cc.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/chrome_paths.cc	2014-04-24 23:23:48.000000000 +0200
+@@ -440,10 +440,12 @@
+       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;
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h
new file mode 100644
index 000000000000..2a48de748674
--- /dev/null
+++ b/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
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc
index 009589b08f52..6b743bb94e7e 100644
--- a/www/chromium/files/patch-chrome__common__chrome_switches.cc
+++ b/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	2013-11-16 01:18:01.000000000 +0100
-@@ -1563,13 +1563,13 @@
+--- ./chrome/common/chrome_switches.cc.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/chrome_switches.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -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.
- const char kMigrateDataDirForSxS[]          = "migrate-data-dir-for-sxs";
+@@ -1598,7 +1598,7 @@
+ // 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.
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h
index 4ebb83b271a9..42a79daf8926 100644
--- a/www/chromium/files/patch-chrome__common__chrome_switches.h
+++ b/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	2013-11-16 01:20:25.000000000 +0100
-@@ -435,7 +435,7 @@
- #endif
+--- ./chrome/common/chrome_switches.h.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/chrome_switches.h	2014-04-24 23:23:43.000000000 +0200
+@@ -440,7 +440,7 @@
+ 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
- 
diff --git a/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc b/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc
deleted file mode 100644
index e300256bdf2b..000000000000
--- a/www/chromium/files/patch-chrome__common__omaha_query_params__omaha_query_params.cc
+++ /dev/null
@@ -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
diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc
index bdd4ff6ca095..e6019e088e04 100644
--- a/www/chromium/files/patch-chrome__common__pref_names.cc
+++ b/www/chromium/files/patch-chrome__common__pref_names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig	2013-08-17 21:26:00.000000000 +0300
-+++ chrome/common/pref_names.cc	2013-08-17 21:26:43.000000000 +0300
-@@ -955,7 +955,7 @@
+--- ./chrome/common/pref_names.cc.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/pref_names.cc	2014-04-24 23:23:43.000000000 +0200
+@@ -963,7 +963,7 @@
  // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
  const char kForceSafeSearch[] = "settings.force_safesearch";
  
diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h
index 1c5cf32a06c8..5065cc979161 100644
--- a/www/chromium/files/patch-chrome__common__pref_names.h
+++ b/www/chromium/files/patch-chrome__common__pref_names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig	2013-08-17 20:35:53.000000000 +0300
-+++ chrome/common/pref_names.h	2013-08-17 20:36:25.000000000 +0300
-@@ -341,7 +341,7 @@
+--- ./chrome/common/pref_names.h.orig	2014-04-24 22:34:45.000000000 +0200
++++ ./chrome/common/pref_names.h	2014-04-24 23:23:43.000000000 +0200
+@@ -306,7 +306,7 @@
  extern const char kForceSafeSearch[];
  extern const char kDeleteTimePeriod[];
  extern const char kLastClearBrowsingDataTime[];
diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
index a955747d92c0..0ea3ad75973a 100644
--- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
+++ b/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	2013-07-15 20:45:49.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	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 @@
        }
      }
    }
diff --git a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h b/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
index 70301740f956..f4cca5092d05 100644
--- a/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h
+++ b/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	2013-09-03 21:39:51.232633592 +0300
-@@ -231,7 +231,7 @@
+--- ./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	2014-04-24 23:23:43.000000000 +0200
+@@ -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,
diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
index a1ca1203ab1b..d682672e05a4 100644
--- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
+++ b/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	2011-11-19 19:32:51.000000000 +0200
-@@ -41,6 +41,10 @@
- #include "chrome/browser/chromeos/audio_handler.h"
- #endif
+--- ./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	2014-04-24 23:23:43.000000000 +0200
+@@ -72,6 +72,10 @@
+ 
+ namespace {
  
 +#if defined(OS_FREEBSD)
 +#include <signal.h>
 +#endif
 +
  // Passed as value of kTestType.
- static const char kBrowserTestType[] = "browser";
+ const char kBrowserTestType[] = "browser";
  
diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
index b63891b7e822..6b481e2a3c56 100644
--- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
+++ b/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	2011-11-19 19:35:37.000000000 +0200
-@@ -110,7 +110,7 @@
+--- ./chrome/test/base/testing_browser_process.h.orig	2014-04-24 22:34:34.000000000 +0200
++++ ./chrome/test/base/testing_browser_process.h	2014-04-24 23:23:43.000000000 +0200
+@@ -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)
diff --git a/www/chromium/files/patch-chrome__test__perf__perf_test.cc b/www/chromium/files/patch-chrome__test__perf__perf_test.cc
index 3234ca4dc800..3a0464fa04d7 100644
--- a/www/chromium/files/patch-chrome__test__perf__perf_test.cc
+++ b/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	2013-08-19 21:03:16.000000000 +0300
+--- ./chrome/test/perf/perf_test.cc.orig	2014-04-24 22:34:37.000000000 +0200
++++ ./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",
diff --git a/www/chromium/files/patch-chrome__test__ui__ui_test.cc b/www/chromium/files/patch-chrome__test__ui__ui_test.cc
index 926d71e949aa..6a225535cb2d 100644
--- a/www/chromium/files/patch-chrome__test__ui__ui_test.cc
+++ b/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	2010-12-20 20:15:08.000000000 +0100
+--- ./chrome/test/ui/ui_test.cc.orig	2014-04-24 22:34:34.000000000 +0200
++++ ./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 "
diff --git a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh b/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
index b4ec2b343401..71de28ec21c7 100644
--- a/www/chromium/files/patch-chrome__tools__build__linux__sed.sh
+++ b/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	2010-12-20 20:15:08.000000000 +0100
+--- ./chrome/tools/build/linux/sed.sh.orig	2014-04-24 22:34:55.000000000 +0200
++++ ./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
diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json
index f3de61279ace..4d86d595294e 100644
--- a/www/chromium/files/patch-components__policy__resources__policy_templates.json
+++ b/www/chromium/files/patch-components__policy__resources__policy_templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig	2013-09-24 21:57:03.000000000 +0300
-+++ components/policy/resources/policy_templates.json	2013-09-24 21:59:32.000000000 +0300
-@@ -1366,7 +1366,7 @@
+--- ./components/policy/resources/policy_templates.json.orig	2014-04-24 22:35:25.000000000 +0200
++++ ./components/policy/resources/policy_templates.json	2014-04-24 23:23:44.000000000 +0200
+@@ -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' },
diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
index 9584926234f2..b52c3f5c9fb2 100644
--- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
+++ b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
@@ -1,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	2013-09-24 21:56:43.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	2014-04-24 23:23:44.000000000 +0200
 @@ -64,7 +64,7 @@
        if platform.startswith('chrome.'):
          platform_sub = platform[7:]
diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi
new file mode 100644
index 000000000000..96d6ce5a68bd
--- /dev/null
+++ b/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',
+       ],
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
new file mode 100644
index 000000000000..b51f6562089e
--- /dev/null
+++ b/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 {
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
new file mode 100644
index 000000000000..927b3a535e3a
--- /dev/null
+++ b/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();
++}
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
new file mode 100644
index 000000000000..94d0a359be66
--- /dev/null
+++ b/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_
diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc
index ac79bd8ecb39..0a17e1c2c4e7 100644
--- a/www/chromium/files/patch-content__app__content_main_runner.cc
+++ b/www/chromium/files/patch-content__app__content_main_runner.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner.cc.orig	2013-07-15 19:05:22.000000000 +0300
-+++ content/app/content_main_runner.cc	2013-07-15 19:11:30.000000000 +0300
-@@ -78,10 +78,10 @@
+--- ./content/app/content_main_runner.cc.orig	2014-04-24 22:35:46.000000000 +0200
++++ ./content/app/content_main_runner.cc	2014-04-24 23:23:44.000000000 +0200
+@@ -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 @@
      }
    }
  
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc
index 3c49f82ff4f0..d9b8dc24c20f 100644
--- a/www/chromium/files/patch-content__browser__browser_main_loop.cc
+++ b/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	2014-02-24 20:28:45.000000000 +0100
+--- ./content/browser/browser_main_loop.cc.orig	2014-04-24 22:35:48.000000000 +0200
++++ ./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
  
diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc
index f0b51a89b24c..dac136479364 100644
--- a/www/chromium/files/patch-content__browser__child_process_launcher.cc
+++ b/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	2012-12-09 17:02:22.000000000 +0200
-@@ -53,7 +53,7 @@
+--- ./content/browser/child_process_launcher.cc.orig	2014-04-24 22:35:48.000000000 +0200
++++ ./content/browser/child_process_launcher.cc	2014-04-24 23:23:44.000000000 +0200
+@@ -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 @@
-         FileDescriptorInfo(kPrimaryIPCChannel,
-                                     base::FileDescriptor(ipcfd, false)));
+@@ -245,7 +245,7 @@
+     // child termination.
+     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_);
diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc
index 6843f77edc86..e8bcf66c0191 100644
--- a/www/chromium/files/patch-content__browser__download__base_file.cc
+++ b/www/chromium/files/patch-content__browser__download__base_file.cc
@@ -1,6 +1,6 @@
---- content/browser/download/base_file.cc.orig	2013-08-18 21:43:48.000000000 +0300
-+++ content/browser/download/base_file.cc	2013-08-18 21:44:22.000000000 +0300
-@@ -212,7 +212,8 @@
+--- ./content/browser/download/base_file.cc.orig	2014-04-24 22:35:46.000000000 +0200
++++ ./content/browser/download/base_file.cc	2014-04-24 23:23:44.000000000 +0200
+@@ -216,7 +216,8 @@
  }
  
  // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc
index ad9734fc80c2..eeaaf0243f76 100644
--- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc
+++ b/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	2013-08-21 09:51:22.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	2014-04-24 23:23:44.000000000 +0200
 @@ -13,7 +13,9 @@
    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
    DCHECK(!detached_);
diff --git a/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc b/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
deleted file mode 100644
index f7cb962cf07c..000000000000
--- a/www/chromium/files/patch-content__browser__fileapi__file_system_dir_url_request_job_unittest.cc
+++ /dev/null
@@ -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());
diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
index be661cc1f2d5..dfff001f1877 100644
--- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
+++ b/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	2014-01-13 16:30:21.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-04-24 23:23:44.000000000 +0200
 @@ -160,7 +160,7 @@
  }
  
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
index cfb70fee8091..a1327e86936d 100644
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
+++ b/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	2013-11-15 22:09:52.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	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;
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
index a2662277a7ef..822732552c57 100644
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
+++ b/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	2013-11-15 22:08:05.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	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
diff --git a/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc b/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc
deleted file mode 100644
index 88aecbfffa8d..000000000000
--- a/www/chromium/files/patch-content__browser__renderer_host__pepper__pepper_file_io_host.cc
+++ /dev/null
@@ -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.
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc
index e232833a853d..bede817822b5 100644
--- a/www/chromium/files/patch-content__common__set_process_title_linux.cc
+++ b/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	2011-03-20 22:02:04.407737434 +0200
+--- ./content/common/set_process_title_linux.cc.orig	2014-04-24 22:35:41.000000000 +0200
++++ ./content/common/set_process_title_linux.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -48,6 +48,8 @@
  extern char** environ;
  
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h
index 5b027a6a9821..6cff5ac871c9 100644
--- a/www/chromium/files/patch-content__common__set_process_title_linux.h
+++ b/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	2011-03-20 22:02:04.404739287 +0200
-@@ -6,6 +6,9 @@
- #define CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_
- #pragma once
+--- ./content/common/set_process_title_linux.h.orig	2014-04-24 22:35:41.000000000 +0200
++++ ./content/common/set_process_title_linux.h	2014-04-24 23:23:44.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ #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, ...);
diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi
index d4770ffe9db9..0843ddd7efa8 100644
--- a/www/chromium/files/patch-content__content_browser.gypi
+++ b/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	2014-02-24 23:00:37.000000000 +0100
-@@ -586,6 +586,8 @@
+--- ./content/content_browser.gypi.orig	2014-04-24 22:35:48.000000000 +0200
++++ ./content/content_browser.gypi	2014-04-24 23:23:44.000000000 +0200
+@@ -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"', {
-@@ -1635,7 +1647,7 @@
+     ['use_aura!=1 and OS!="android"', {
+@@ -1647,7 +1659,7 @@
          'browser/geolocation/empty_wifi_data_provider.cc',
        ],
      }],
diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi
index 88a4ec091354..9348e5856eda 100644
--- a/www/chromium/files/patch-content__content_common.gypi
+++ b/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	2014-02-24 20:59:04.000000000 +0100
-@@ -482,6 +482,21 @@
+--- ./content/content_common.gypi.orig	2014-04-24 22:35:48.000000000 +0200
++++ ./content/content_common.gypi	2014-04-24 23:23:44.000000000 +0200
+@@ -479,6 +479,21 @@
          'content.gyp:common_aidl',
        ],
      }],
diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi
index d5628d043ebe..0922951a4438 100644
--- a/www/chromium/files/patch-content__content_tests.gypi
+++ b/www/chromium/files/patch-content__content_tests.gypi
@@ -1,6 +1,6 @@
---- content/content_tests.gypi.orig	2013-01-08 23:49:55.890245836 +0200
-+++ content/content_tests.gypi	2013-01-08 23:52:52.374246102 +0200
-@@ -585,6 +585,15 @@
+--- ./content/content_tests.gypi.orig	2014-04-24 22:35:48.000000000 +0200
++++ ./content/content_tests.gypi	2014-04-24 23:23:44.000000000 +0200
+@@ -818,6 +818,15 @@
              'browser/geolocation/wifi_data_provider_linux_unittest.cc',
            ],
          }],
diff --git a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
index feaf08c2b1b0..ee77fe39568f 100644
--- a/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
+++ b/www/chromium/files/patch-content__plugin__plugin_main_linux.cc
@@ -1,5 +1,5 @@
---- content/plugin/plugin_main_linux.cc.orig	2012-11-28 04:01:26.000000000 +0200
-+++ content/plugin/plugin_main_linux.cc	2012-12-04 22:14:32.000000000 +0200
+--- ./content/plugin/plugin_main_linux.cc.orig	2014-04-24 22:35:42.000000000 +0200
++++ ./content/plugin/plugin_main_linux.cc	2014-04-24 23:23:44.000000000 +0200
 @@ -5,13 +5,13 @@
  #include <signal.h>
  #include <string.h>
@@ -14,5 +14,5 @@
 -#if defined(ARCH_CPU_64_BITS)
 +#if defined(ARCH_CPU_64_BITS) && !defined(OS_BSD)
  
- namespace {
+ namespace content {
  
diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc
index 1a79e594dca2..5333289bb337 100644
--- a/www/chromium/files/patch-content__public__test__browser_test_base.cc
+++ b/www/chromium/files/patch-content__public__test__browser_test_base.cc
@@ -1,5 +1,5 @@
---- content/public/test/browser_test_base.cc.orig	2013-01-08 23:22:25.608704051 +0200
-+++ content/public/test/browser_test_base.cc	2013-01-08 23:24:45.354245363 +0200
+--- ./content/public/test/browser_test_base.cc.orig	2014-04-24 22:35:43.000000000 +0200
++++ ./content/public/test/browser_test_base.cc	2014-04-24 23:23:45.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "content/public/test/browser_test_base.h"
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
index 4725f7ba8238..0a1982ee83ad 100644
--- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
+++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
@@ -1,6 +1,6 @@
---- content/renderer/media/webrtc_audio_capturer.cc.orig	2013-08-30 06:45:44.000000000 +0300
-+++ content/renderer/media/webrtc_audio_capturer.cc	2013-09-03 21:47:30.139633005 +0300
-@@ -26,10 +26,10 @@
+--- ./content/renderer/media/webrtc_audio_capturer.cc.orig	2014-04-24 22:35:42.000000000 +0200
++++ ./content/renderer/media/webrtc_audio_capturer.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -29,10 +29,10 @@
  // The listed rates below adds restrictions and WebRtcAudioDeviceImpl::Init()
  // will fail if the user selects any rate outside these ranges.
  const int kValidInputRates[] = {96000, 48000, 44100, 32000, 16000, 8000};
@@ -13,8 +13,8 @@
  #else
  const int kValidInputRates[] = {44100};
  #endif
-@@ -430,7 +430,7 @@
-   // CaptureCallback.
+@@ -419,7 +419,7 @@
+ // CaptureCallback.
  #if defined(OS_WIN) || defined(OS_MACOSX)
    DCHECK_LE(volume, 1.0);
 -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
index c9698cd8c7eb..f4941d7b2b47 100644
--- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
+++ b/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc
@@ -1,6 +1,6 @@
---- content/renderer/media/webrtc_audio_renderer.cc.orig	2013-09-02 21:19:42.000000000 +0300
-+++ content/renderer/media/webrtc_audio_renderer.cc	2013-09-02 21:21:52.000000000 +0300
-@@ -31,7 +31,7 @@
+--- ./content/renderer/media/webrtc_audio_renderer.cc.orig	2014-04-24 22:35:42.000000000 +0200
++++ ./content/renderer/media/webrtc_audio_renderer.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -34,7 +34,7 @@
  // rates below adds restrictions and Initialize() will fail if the user selects
  // any rate outside these ranges.
  const int kValidOutputRates[] = {96000, 48000, 44100, 32000, 16000};
diff --git a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
index f3de9ab15350..c07b8e3a4b59 100644
--- a/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
+++ b/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc
@@ -1,5 +1,5 @@
---- content/renderer/pepper/usb_key_code_conversion.cc.orig	2013-09-03 23:00:20.220628554 +0300
-+++ content/renderer/pepper/usb_key_code_conversion.cc	2013-09-03 23:02:18.736631955 +0300
+--- ./content/renderer/pepper/usb_key_code_conversion.cc.orig	2014-04-24 22:35:42.000000000 +0200
++++ ./content/renderer/pepper/usb_key_code_conversion.cc	2014-04-24 23:23:45.000000000 +0200
 @@ -10,7 +10,7 @@
  
  namespace content {
diff --git a/www/chromium/files/patch-content__renderer__render_process_impl.cc b/www/chromium/files/patch-content__renderer__render_process_impl.cc
index 92ca3b32b539..4fdaf1076efc 100644
--- a/www/chromium/files/patch-content__renderer__render_process_impl.cc
+++ b/www/chromium/files/patch-content__renderer__render_process_impl.cc
@@ -1,15 +1,6 @@
---- content/renderer/render_process_impl.cc.orig	2013-08-09 19:07:03.000000000 +0000
-+++ content/renderer/render_process_impl.cc	2013-08-12 21:00:44.000000000 +0000
-@@ -89,7 +89,7 @@
- 
- bool RenderProcessImpl::InProcessPlugins() {
-   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Plugin processes require a UI message loop, and the Linux message loop
-   // implementation only allows one UI loop per process.
-   if (command_line.HasSwitch(switches::kInProcessPlugins))
-@@ -152,7 +152,7 @@
+--- ./content/renderer/render_process_impl.cc.orig	2014-04-24 22:35:43.000000000 +0200
++++ ./content/renderer/render_process_impl.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -155,7 +155,7 @@
    int width = rect.width();
    int height = rect.height();
    const size_t stride = skia::PlatformCanvasStrideForWidth(rect.width());
diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
index 6d821cf06951..66c040f15b13 100644
--- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2013-05-13 01:33:56.000000000 +0000
-+++ content/renderer/renderer_main_platform_delegate_linux.cc	2013-05-16 23:29:28.000000000 +0000
-@@ -41,11 +41,14 @@
+--- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig	2014-04-24 22:35:43.000000000 +0200
++++ ./content/renderer/renderer_main_platform_delegate_linux.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -50,11 +50,14 @@
    // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
    //
    // Anything else is started in InitializeSandbox().
@@ -15,7 +15,7 @@
    // The LinuxSandbox class requires going through initialization before
    // GetStatus() and others can be used.  When we are not launched through the
    // Zygote, this initialization will only happen in the renderer process if
-@@ -80,6 +83,7 @@
+@@ -89,6 +92,7 @@
      CHECK_EQ(errno, EPERM);
    }
  #endif  // __x86_64__
diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
index ad19cd2893c8..31f581bcca69 100644
--- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
@@ -1,15 +1,15 @@
---- content/renderer/renderer_webkitplatformsupport_impl.cc.orig	2013-04-30 10:20:40.000000000 +0300
-+++ content/renderer/renderer_webkitplatformsupport_impl.cc	2013-05-07 21:11:09.000000000 +0300
-@@ -87,7 +87,7 @@
- #include "third_party/WebKit/public/platform/mac/WebSandboxSupport.h"
- #endif
+--- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig	2014-04-24 22:35:43.000000000 +0200
++++ ./content/renderer/renderer_webkitplatformsupport_impl.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -88,7 +88,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 defined(OS_POSIX)
+ #include "base/file_descriptor_posix.h"
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
  #include <map>
  #include <string>
  
-@@ -164,7 +164,7 @@
+@@ -169,7 +169,7 @@
    scoped_refptr<ThreadSafeSender> thread_safe_sender_;
  };
  
@@ -18,7 +18,7 @@
  // WebKit doesn't use WebSandboxSupport on android so we don't need to
  // implement anything here.
  class RendererWebKitPlatformSupportImpl::SandboxSupport {
-@@ -256,7 +256,7 @@
+@@ -262,7 +262,7 @@
  }
  
  blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
@@ -27,7 +27,7 @@
    // WebKit doesn't use WebSandboxSupport on android.
    return NULL;
  #else
-@@ -541,7 +541,7 @@
+@@ -547,7 +547,7 @@
    return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
  }
  
diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc
new file mode 100644
index 000000000000..36df4ba02349
--- /dev/null
+++ b/www/chromium/files/patch-crypto__nss_util.cc
@@ -0,0 +1,33 @@
+--- ./crypto/nss_util.cc.orig	2014-04-24 22:35:50.000000000 +0200
++++ ./crypto/nss_util.cc	2014-04-24 23:23:45.000000000 +0200
+@@ -13,7 +13,7 @@
+ #include <prtime.h>
+ #include <secmod.h>
+ 
+-#if defined(OS_OPENBSD)
++#if defined(OS_BSD)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #endif
+@@ -138,7 +138,7 @@
+ // detection when database_dir is on NFS.  See http://crbug.com/48585.
+ //
+ // TODO(wtc): port this function to other USE_NSS platforms.  It is defined
+-// only for OS_LINUX and OS_OPENBSD simply because the statfs structure
++// only for OS_LINUX and OS_BSD simply because the statfs structure
+ // is OS-specific.
+ //
+ // Because this function sets an environment variable it must be run before we
+@@ -149,10 +149,10 @@
+   file_util::FileSystemType fs_type = file_util::FILE_SYSTEM_UNKNOWN;
+   if (file_util::GetFileSystemType(database_dir, &fs_type))
+     db_on_nfs = (fs_type == file_util::FILE_SYSTEM_NFS);
+-#elif defined(OS_OPENBSD)
++#elif defined(OS_BSD)
+   struct statfs buf;
+   if (statfs(database_dir.value().c_str(), &buf) == 0)
+-    db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0);
++    db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0);
+ #else
+   NOTIMPLEMENTED();
+ #endif
diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp
new file mode 100644
index 000000000000..b095c860a03a
--- /dev/null
+++ b/www/chromium/files/patch-device__hid__hid.gyp
@@ -0,0 +1,24 @@
+--- ./device/hid/hid.gyp.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./device/hid/hid.gyp	2014-04-24 23:23:45.000000000 +0200
+@@ -23,8 +23,8 @@
+       'sources': [
+         'hid_connection.cc',
+         'hid_connection.h',
+-        'hid_connection_linux.cc',
+-        'hid_connection_linux.h',
++        #'hid_connection_linux.cc',
++        #'hid_connection_linux.h',
+         'hid_connection_mac.cc',
+         'hid_connection_mac.h',
+         'hid_connection_win.cc',
+@@ -33,8 +33,8 @@
+         'hid_device_info.h',
+         'hid_service.cc',
+         'hid_service.h',
+-        'hid_service_linux.cc',
+-        'hid_service_linux.h',
++        #'hid_service_linux.cc',
++        #'hid_service_linux.h',
+         'hid_service_mac.cc',
+         'hid_service_mac.h',
+         'hid_service_win.cc',
diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp
new file mode 100644
index 000000000000..6827cb18e665
--- /dev/null
+++ b/www/chromium/files/patch-device__serial__serial.gyp
@@ -0,0 +1,13 @@
+--- ./device/serial/serial.gyp.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./device/serial/serial.gyp	2014-04-24 23:23:45.000000000 +0200
+@@ -23,8 +23,8 @@
+       'sources': [
+         'serial_device_enumerator.cc',
+         'serial_device_enumerator.h',
+-        'serial_device_enumerator_linux.cc',
+-        'serial_device_enumerator_linux.h',
++        #'serial_device_enumerator_linux.cc',
++        #'serial_device_enumerator_linux.h',
+         'serial_device_enumerator_mac.cc',
+         'serial_device_enumerator_mac.h',
+         'serial_device_enumerator_win.cc',
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc
index 858e0db7659b..5614a69c993e 100644
--- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_control_list.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list.cc.orig	2013-09-02 21:03:44.000000000 +0300
-+++ gpu/config/gpu_control_list.cc	2013-09-02 21:05:31.000000000 +0300
-@@ -1346,10 +1346,10 @@
+--- ./gpu/config/gpu_control_list.cc.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./gpu/config/gpu_control_list.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -1344,10 +1344,10 @@
    return kOsWin;
  #elif defined(OS_ANDROID)
    return kOsAndroid;
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
index 684c88586fb5..b00df69d7733 100644
--- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list_unittest.cc.orig	2013-09-02 21:20:16.000000000 +0300
-+++ gpu/config/gpu_control_list_unittest.cc	2013-09-02 21:21:01.000000000 +0300
-@@ -177,8 +177,7 @@
+--- ./gpu/config/gpu_control_list_unittest.cc.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./gpu/config/gpu_control_list_unittest.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -175,8 +175,7 @@
    features = control_list->MakeDecision(
        GpuControlList::kOsLinux, kOsVersion, gpu_info());
    EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc
index 686252c9d7dd..ae6eaae83dcd 100644
--- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc
+++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_test_config.cc.orig	2013-09-02 21:22:26.000000000 +0300
-+++ gpu/config/gpu_test_config.cc	2013-09-02 21:23:55.000000000 +0300
-@@ -17,8 +17,6 @@
+--- ./gpu/config/gpu_test_config.cc.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./gpu/config/gpu_test_config.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -23,8 +23,6 @@
  GPUTestConfig::OS GetCurrentOS() {
  #if defined(OS_CHROMEOS)
    return GPUTestConfig::kOsChromeOS;
@@ -9,7 +9,7 @@
  #elif defined(OS_WIN)
    int32 major_version = 0;
    int32 minor_version = 0;
-@@ -53,6 +51,8 @@
+@@ -61,6 +59,8 @@
    }
  #elif defined(OS_ANDROID)
    return GPUTestConfig::kOsAndroid;
diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi
index b38802895cd9..faa7575aea11 100644
--- a/www/chromium/files/patch-gpu__gpu_config.gypi
+++ b/www/chromium/files/patch-gpu__gpu_config.gypi
@@ -1,6 +1,6 @@
---- gpu/gpu_config.gypi.orig	2013-08-12 20:57:26.000000000 +0000
-+++ gpu/gpu_config.gypi	2013-08-12 20:58:18.000000000 +0000
-@@ -67,7 +67,7 @@
+--- ./gpu/gpu_config.gypi.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./gpu/gpu_config.gypi	2014-04-24 23:23:46.000000000 +0200
+@@ -63,7 +63,7 @@
          '../third_party/amd/amd_videocard_info_win.cc',
        ],
      }],
diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
index 876b8e3c87d3..f5c2a07584c6 100644
--- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
+++ b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
@@ -1,6 +1,6 @@
---- media/audio/audio_input_volume_unittest.cc.orig	2013-04-30 10:22:14.000000000 +0300
-+++ media/audio/audio_input_volume_unittest.cc	2013-05-07 21:17:17.000000000 +0300
-@@ -57,7 +57,7 @@
+--- ./media/audio/audio_input_volume_unittest.cc.orig	2014-04-24 22:35:18.000000000 +0200
++++ ./media/audio/audio_input_volume_unittest.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -74,7 +74,7 @@
          params, device_id);
      EXPECT_TRUE(NULL != ais);
  
diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc
index 5ff429aa3e0e..4a8a042c2cee 100644
--- a/www/chromium/files/patch-media__base__audio_splicer.cc
+++ b/www/chromium/files/patch-media__base__audio_splicer.cc
@@ -1,5 +1,5 @@
---- media/base/audio_splicer.cc.orig	2013-08-30 06:47:05.000000000 +0300
-+++ media/base/audio_splicer.cc	2013-09-03 22:08:02.140628065 +0300
+--- ./media/base/audio_splicer.cc.orig	2014-04-24 22:35:18.000000000 +0200
++++ ./media/base/audio_splicer.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -60,7 +60,7 @@
    base::TimeDelta expected_timestamp = output_timestamp_helper_.GetTimestamp();
    base::TimeDelta delta = timestamp - expected_timestamp;
diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
index ac14701ec861..6f319847e79d 100644
--- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
+++ b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
@@ -1,5 +1,5 @@
---- media/filters/decrypting_audio_decoder.cc.orig	2013-08-30 06:47:05.000000000 +0300
-+++ media/filters/decrypting_audio_decoder.cc	2013-09-03 22:11:24.289626887 +0300
+--- ./media/filters/decrypting_audio_decoder.cc.orig	2014-04-24 22:35:18.000000000 +0200
++++ ./media/filters/decrypting_audio_decoder.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -30,7 +30,7 @@
    // Out of sync of 100ms would be pretty noticeable and we should keep any
    // drift below that.
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
index 8a1df5227cba..99b169b5ac84 100644
--- a/www/chromium/files/patch-media__media.gyp
+++ b/www/chromium/files/patch-media__media.gyp
@@ -1,6 +1,6 @@
---- media/media.gyp.orig	2013-11-08 07:41:32.000000000 +0100
-+++ media/media.gyp	2013-11-15 16:39:58.000000000 +0100
-@@ -563,7 +563,7 @@
+--- ./media/media.gyp.orig	2014-04-24 22:35:20.000000000 +0200
++++ ./media/media.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -625,7 +625,7 @@
              'audio/openbsd/audio_manager_openbsd.h',
            ],
          }],
@@ -9,8 +9,8 @@
            'variables': {
              'conditions': [
                ['sysroot!=""', {
-@@ -836,7 +836,7 @@
-             'ENABLE_EAC3_PLAYBACK',
+@@ -885,7 +885,7 @@
+             'base/simd/convert_yuv_to_rgb_x86.cc',
            ],
          }],
 -        ['OS!="linux" and OS!="win"', {
diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi
index 9a7ecc46ea98..07be418d7cbf 100644
--- a/www/chromium/files/patch-native_client__build__common.gypi
+++ b/www/chromium/files/patch-native_client__build__common.gypi
@@ -1,7 +1,7 @@
---- ./native_client/build/common.gypi.orig	2010-12-16 02:12:20.000000000 +0100
-+++ ./native_client/build/common.gypi	2010-12-20 20:15:08.000000000 +0100
-@@ -375,7 +375,7 @@
-     },
+--- ./native_client/build/common.gypi.orig	2014-04-24 22:36:13.000000000 +0200
++++ ./native_client/build/common.gypi	2014-04-24 23:23:46.000000000 +0200
+@@ -262,7 +262,7 @@
+     ],
    },
    'conditions': [
 -    ['OS=="linux"', {
diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
index 35e16a8130de..ff0cd1d99b05 100644
--- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
+++ b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
@@ -1,11 +1,11 @@
---- ./native_client/src/shared/platform/platform.gyp.orig	2010-12-16 02:12:14.000000000 +0100
-+++ ./native_client/src/shared/platform/platform.gyp	2010-12-20 20:15:08.000000000 +0100
-@@ -60,7 +60,7 @@
-       'time.h',
+--- ./native_client/src/shared/platform/platform.gyp.orig	2014-04-24 22:36:52.000000000 +0200
++++ ./native_client/src/shared/platform/platform.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -36,7 +36,7 @@
+       'refcount_base.cc',
      ],
      'conditions': [
 -      ['OS=="linux"', {
 +      ['OS=="linux" or OS=="freebsd"', {
          'platform_sources': [
-           'linux/condition_variable.cc',
-           'linux/lock.cc',
+           'linux/nacl_clock.c',
+           'linux/nacl_host_dir.c',
diff --git a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
index 91ed115749cc..895b58945e69 100644
--- a/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
+++ b/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp
@@ -1,20 +1,20 @@
---- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig	2010-12-16 02:12:15.000000000 +0100
-+++ ./native_client/src/trusted/debug_stub/debug_stub.gyp	2010-12-20 20:15:08.000000000 +0100
-@@ -16,7 +16,7 @@
-       'transport_common.cc',
+--- ./native_client/src/trusted/debug_stub/debug_stub.gyp.orig	2014-04-24 22:36:36.000000000 +0200
++++ ./native_client/src/trusted/debug_stub/debug_stub.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -27,7 +27,7 @@
+       'test.cc',
      ],
      'conditions': [
 -      ['OS=="linux" or OS=="mac"', {
 +      ['OS=="linux" or OS=="freebsd" or OS=="mac"', {
          'platform_sources': [
            'posix/debug_stub_posix.cc',
-           'posix/mutex_impl.cc',
-@@ -40,7 +40,7 @@
+           'posix/platform_impl.cc',
+@@ -49,7 +49,7 @@
        'target_base': 'none',
      },
      'target_conditions': [
 -      ['OS=="linux" or OS=="mac"', {
 +      ['OS=="linux" or OS=="freebsd" or OS=="mac"', {
          'cflags': [
-           '-Wno-long-long',
+           '-fexceptions',
          ],
diff --git a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
index 0f1ff031c35f..ab37116e51d9 100644
--- a/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
+++ b/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp
@@ -1,11 +1,11 @@
---- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig	2010-12-16 02:12:19.000000000 +0100
-+++ ./native_client/src/trusted/service_runtime/service_runtime.gyp	2010-12-20 20:15:08.000000000 +0100
-@@ -31,7 +31,7 @@
+--- ./native_client/src/trusted/service_runtime/service_runtime.gyp.orig	2014-04-24 22:36:36.000000000 +0200
++++ ./native_client/src/trusted/service_runtime/service_runtime.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -6,7 +6,7 @@
  {
    'variables': {
      'conditions': [
 -      ['OS=="linux"', {
 +      ['OS=="linux" or OS=="freebsd"', {
          'syscall_handler': [
-           'linux/nacl_syscall_impl.c'
+           'posix/nacl_syscall_impl.c'
          ],
diff --git a/www/chromium/files/patch-net__base__dns_reloader.cc b/www/chromium/files/patch-net__base__dns_reloader.cc
index b28dbf814c83..794828f3d10d 100644
--- a/www/chromium/files/patch-net__base__dns_reloader.cc
+++ b/www/chromium/files/patch-net__base__dns_reloader.cc
@@ -1,8 +1,8 @@
---- net/base/dns_reloader.cc.orig	2011-10-09 01:12:14.189268935 +0300
-+++ net/base/dns_reloader.cc	2011-10-09 01:32:07.358661959 +0300
-@@ -6,6 +6,9 @@
- 
- #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+--- ./net/base/dns_reloader.cc.orig	2014-04-24 22:35:53.000000000 +0200
++++ ./net/base/dns_reloader.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -7,6 +7,9 @@
+ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+     !defined(OS_ANDROID)
  
 +#if defined(OS_FREEBSD)
 +#include <netinet/in.h>
diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc
index 6daaf8b2d693..8baf04ad373c 100644
--- a/www/chromium/files/patch-net__base__mime_util_unittest.cc
+++ b/www/chromium/files/patch-net__base__mime_util_unittest.cc
@@ -1,6 +1,6 @@
---- net/base/mime_util_unittest.cc.orig	2013-09-02 22:31:36.000000000 +0300
-+++ net/base/mime_util_unittest.cc	2013-09-02 22:32:33.000000000 +0300
-@@ -245,7 +245,7 @@
+--- ./net/base/mime_util_unittest.cc.orig	2014-04-24 22:35:53.000000000 +0200
++++ ./net/base/mime_util_unittest.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -260,7 +260,7 @@
      { "MeSsAge/*",  1, "eml" },
      { "image/bmp",  1, "bmp" },
      { "video/*",    6, "mp4" },
diff --git a/www/chromium/files/patch-net__base__net_util.h b/www/chromium/files/patch-net__base__net_util.h
index 7cbebc6b3257..68428e030bf1 100644
--- a/www/chromium/files/patch-net__base__net_util.h
+++ b/www/chromium/files/patch-net__base__net_util.h
@@ -1,5 +1,5 @@
---- net/base/net_util.h.orig	2013-09-01 00:45:45.000000000 +0300
-+++ net/base/net_util.h	2013-09-01 00:47:35.000000000 +0300
+--- ./net/base/net_util.h.orig	2014-04-24 22:35:53.000000000 +0200
++++ ./net/base/net_util.h	2014-04-24 23:23:46.000000000 +0200
 @@ -13,6 +13,9 @@
  #elif defined(OS_POSIX)
  #include <sys/types.h>
@@ -9,4 +9,4 @@
 +#endif
  #endif
  
- #include <list>
+ #include <string>
diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc
index 5b5b4a119657..7cbd476e930e 100644
--- a/www/chromium/files/patch-net__base__network_change_notifier.cc
+++ b/www/chromium/files/patch-net__base__network_change_notifier.cc
@@ -1,6 +1,6 @@
---- ./net/base/network_change_notifier.cc.orig	2010-12-16 02:11:31.000000000 +0100
-+++ ./net/base/network_change_notifier.cc	2010-12-20 20:15:08.000000000 +0100
-@@ -42,7 +42,6 @@
+--- ./net/base/network_change_notifier.cc.orig	2014-04-24 22:35:53.000000000 +0200
++++ ./net/base/network_change_notifier.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -470,7 +470,6 @@
  #elif defined(OS_MACOSX)
    return new NetworkChangeNotifierMac();
  #else
diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc
index c1c30d1737ba..c1087267c414 100644
--- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc
+++ b/www/chromium/files/patch-net__dns__address_sorter_posix.cc
@@ -1,5 +1,5 @@
---- net/dns/address_sorter_posix.cc.orig	2012-11-07 16:21:02.000000000 +0200
-+++ net/dns/address_sorter_posix.cc	2012-11-07 16:21:39.000000000 +0200
+--- ./net/dns/address_sorter_posix.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/dns/address_sorter_posix.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -10,6 +10,7 @@
  #include <sys/socket.h>  // Must be included before ifaddrs.h.
  #include <ifaddrs.h>
diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
index 6c22840187ae..13cb3a2844c1 100644
--- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
+++ b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
@@ -1,5 +1,5 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig	2013-09-01 00:10:54.000000000 +0300
-+++ net/dns/dns_config_service_posix_unittest.cc	2013-09-01 00:22:00.000000000 +0300
+--- ./net/dns/dns_config_service_posix_unittest.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/dns/dns_config_service_posix_unittest.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -2,8 +2,6 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc
index 684caa7ac891..6c8f725c9cf3 100644
--- a/www/chromium/files/patch-net__dns__dns_session.cc
+++ b/www/chromium/files/patch-net__dns__dns_session.cc
@@ -1,6 +1,6 @@
---- net/dns/dns_session.cc.orig	2013-08-19 01:54:01.000000000 +0200
-+++ net/dns/dns_session.cc	2013-08-26 12:42:02.000000000 +0200
-@@ -176,7 +176,7 @@
+--- ./net/dns/dns_session.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/dns/dns_session.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -178,7 +178,7 @@
    base::TimeDelta current_error = rtt - estimate;
    estimate += current_error / 8;  // * alpha
    base::TimeDelta abs_error = base::TimeDelta::FromInternalValue(
diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
index 07c590f134b9..98fbf8d9d988 100644
--- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
+++ b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
@@ -1,5 +1,5 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2013-09-02 22:50:25.000000000 +0300
-+++ net/http/http_auth_gssapi_posix.cc	2013-09-02 22:52:13.000000000 +0300
+--- ./net/http/http_auth_gssapi_posix.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/http/http_auth_gssapi_posix.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -430,8 +430,8 @@
      static const char* const kDefaultLibraryNames[] = {
  #if defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp
index 9aff183cc2f9..9cdfa62a9c29 100644
--- a/www/chromium/files/patch-net__net.gyp
+++ b/www/chromium/files/patch-net__net.gyp
@@ -1,6 +1,6 @@
---- net/net.gyp.orig	2013-09-20 05:36:19.000000000 +0300
-+++ net/net.gyp	2013-09-23 20:45:35.000000000 +0300
-@@ -1283,9 +1283,10 @@
+--- ./net/net.gyp.orig	2014-04-24 22:35:55.000000000 +0200
++++ ./net/net.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -1435,9 +1435,10 @@
                }],
                ['os_bsd==1', {
                  'sources!': [
@@ -12,18 +12,18 @@
                  ],
                },{
                  'dependencies': [
-@@ -1865,7 +1866,7 @@
-         'websockets/websocket_throttle_unittest.cc',
+@@ -2081,7 +2082,7 @@
+         'websockets/websocket_throttle_test.cc',
        ],
        'conditions': [
 -        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
 +        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
            'dependencies': [
-             'quic_library',
-             'flip_in_mem_edsm_server_library',
-@@ -2140,6 +2141,11 @@
-             'cert/x509_cert_types_unittest.cc',
-           ],
+             'balsa',
+             'epoll_server',
+@@ -2359,6 +2360,11 @@
+             '../testing/android/native_test.gyp:native_test_native_code',
+           ]
          }],
 +        [ 'os_bsd == 1', {
 +          'sources!': [
@@ -31,5 +31,5 @@
 +          ],
 +        }],
        ],
-     },
-     {
+       'target_conditions': [
+         # These source files are excluded by default platform rules, but they
diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
index 862ee20c0389..853e858b82f8 100644
--- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
@@ -1,5 +1,5 @@
---- net/proxy/proxy_config_service_linux.cc.orig	2013-08-22 10:48:23.000000000 +0300
-+++ net/proxy/proxy_config_service_linux.cc	2013-08-22 14:41:23.000000000 +0300
+--- ./net/proxy/proxy_config_service_linux.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/proxy/proxy_config_service_linux.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -12,7 +12,13 @@
  #include <limits.h>
  #include <stdio.h>
diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc
index 80a98c8767cb..299d6489c973 100644
--- a/www/chromium/files/patch-net__proxy__proxy_service.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_service.cc
@@ -1,5 +1,5 @@
---- net/proxy/proxy_service.cc.orig	2013-08-09 22:05:31.000000000 +0300
-+++ net/proxy/proxy_service.cc	2013-08-19 21:08:08.000000000 +0300
+--- ./net/proxy/proxy_service.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/proxy/proxy_service.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -39,7 +39,7 @@
  #elif defined(OS_MACOSX)
  #include "net/proxy/proxy_config_service_mac.h"
@@ -9,7 +9,7 @@
  #include "net/proxy/proxy_config_service_linux.h"
  #elif defined(OS_ANDROID)
  #include "net/proxy/proxy_config_service_android.h"
-@@ -1347,7 +1347,7 @@
+@@ -1382,7 +1382,7 @@
               << "profile_io_data.cc::CreateProxyConfigService and this should "
               << "be used only for examples.";
    return new UnsetProxyConfigService;
diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
index 0584ba625f8a..53f0b1fbc6e0 100644
--- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc
+++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
@@ -1,5 +1,5 @@
---- net/socket/socks5_client_socket.cc.orig	2012-07-26 22:30:09.628651909 +0300
-+++ net/socket/socks5_client_socket.cc	2012-07-26 22:30:41.781651802 +0300
+--- ./net/socket/socks5_client_socket.cc.orig	2014-04-24 22:35:52.000000000 +0200
++++ ./net/socket/socks5_client_socket.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -4,6 +4,10 @@
  
  #include "net/socket/socks5_client_socket.h"
diff --git a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
index 771ef48c42aa..2ce21b787204 100644
--- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
+++ b/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
@@ -1,5 +1,5 @@
---- net/socket/tcp_listen_socket_unittest.h.orig	2013-09-01 00:30:34.000000000 +0300
-+++ net/socket/tcp_listen_socket_unittest.h	2013-09-01 00:31:11.000000000 +0300
+--- ./net/socket/tcp_listen_socket_unittest.h.orig	2014-04-24 22:35:52.000000000 +0200
++++ ./net/socket/tcp_listen_socket_unittest.h	2014-04-24 23:23:46.000000000 +0200
 @@ -13,6 +13,9 @@
  #include <arpa/inet.h>
  #include <errno.h>
diff --git a/www/chromium/files/patch-net__spdy__spdy_priority_forest.h b/www/chromium/files/patch-net__spdy__spdy_priority_forest.h
deleted file mode 100644
index 2e26d9122747..000000000000
--- a/www/chromium/files/patch-net__spdy__spdy_priority_forest.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/spdy/spdy_priority_forest.h.orig	2013-09-28 19:11:06.000000000 +0200
-+++ net/spdy/spdy_priority_forest.h	2013-10-10 14:59:28.000000000 +0200
-@@ -7,6 +7,7 @@
- 
- #include <map>
- #include <set>
-+#include <vector>
- 
- #include "base/basictypes.h"
- #include "base/containers/hash_tables.h"
diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
index 63abe7f8b624..5458093cc42b 100644
--- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
+++ b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
@@ -1,5 +1,5 @@
---- net/udp/udp_socket_unittest.cc.orig	2013-09-01 17:50:31.000000000 +0300
-+++ net/udp/udp_socket_unittest.cc	2013-09-01 17:50:50.000000000 +0300
+--- ./net/udp/udp_socket_unittest.cc.orig	2014-04-24 22:35:54.000000000 +0200
++++ ./net/udp/udp_socket_unittest.cc	2014-04-24 23:23:46.000000000 +0200
 @@ -202,7 +202,7 @@
        client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
  }
diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
new file mode 100644
index 000000000000..85b32097c013
--- /dev/null
+++ b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
@@ -0,0 +1,46 @@
+--- ./ppapi/proxy/file_io_resource.cc.orig	2014-04-24 22:35:39.000000000 +0200
++++ ./ppapi/proxy/file_io_resource.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -294,15 +294,17 @@
+ 
+   if (check_quota_) {
+     int64_t increase = 0;
+-    uint64_t max_offset = 0;
++    // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
++    // which also defines max_offset
++    uint64_t _max_offset = 0;
+     bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
+     if (append) {
+       increase = bytes_to_write;
+     } else {
+-      uint64_t max_offset = offset + bytes_to_write;
+-      if (max_offset > static_cast<uint64_t>(kint64max))
++      uint64_t _max_offset = offset + bytes_to_write;
++      if (_max_offset > static_cast<uint64_t>(kint64max))
+         return PP_ERROR_FAILED;  // amount calculation would overflow.
+-      increase = static_cast<int64_t>(max_offset) - max_written_offset_;
++      increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
+     }
+ 
+     if (increase > 0) {
+@@ -319,7 +321,7 @@
+       if (append)
+         append_mode_write_amount_ += bytes_to_write;
+       else
+-        max_written_offset_ = max_offset;
++        max_written_offset_ = _max_offset;
+     }
+   }
+   return WriteValidated(offset, buffer, bytes_to_write, callback);
+@@ -597,9 +599,9 @@
+   } else {
+     DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
+ 
+-    int64_t max_offset = offset + bytes_to_write;
+-    if (max_written_offset_ < max_offset)
+-      max_written_offset_ = max_offset;
++    int64_t _max_offset = offset + bytes_to_write;
++    if (max_written_offset_ < _max_offset)
++      max_written_offset_ = _max_offset;
+   }
+ 
+   int32_t result = WriteValidated(offset, buffer, bytes_to_write, callback);
diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
index 1ccf9f0c70ec..f943f93e0d92 100644
--- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
+++ b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
@@ -1,6 +1,6 @@
---- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2012-10-31 21:01:33.000000000 +0200
-+++ ppapi/shared_impl/private/net_address_private_impl.cc	2012-11-07 14:41:26.000000000 +0200
-@@ -12,6 +12,10 @@
+--- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig	2014-04-24 22:35:40.000000000 +0200
++++ ./ppapi/shared_impl/private/net_address_private_impl.cc	2014-04-24 23:23:46.000000000 +0200
+@@ -14,6 +14,10 @@
  #include <sys/types.h>
  #endif
  
@@ -11,7 +11,7 @@
  #include <string.h>
  
  #include <string>
-@@ -26,7 +30,7 @@
+@@ -28,7 +32,7 @@
  #include "ppapi/shared_impl/var.h"
  #include "ppapi/thunk/thunk.h"
  
diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp
new file mode 100644
index 000000000000..f9934ad52602
--- /dev/null
+++ b/www/chromium/files/patch-printing__printing.gyp
@@ -0,0 +1,11 @@
+--- ./printing/printing.gyp.orig	2014-04-24 22:35:32.000000000 +0200
++++ ./printing/printing.gyp	2014-04-24 23:23:46.000000000 +0200
+@@ -215,7 +215,7 @@
+             'backend/print_backend_chromeos.cc',
+           ],
+         }],
+-        ['OS=="linux" and chromeos==0', {
++        ['(OS=="linux" and chromeos==0) or OS=="freebsd"', { #XXX (rene) temp!
+           'sources': [
+             'printing_context_linux.cc',
+             'printing_context_linux.h',
diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp
deleted file mode 100644
index 01a29f70bd28..000000000000
--- a/www/chromium/files/patch-remoting__remoting.gyp
+++ /dev/null
@@ -1,20 +0,0 @@
---- remoting/remoting.gyp.orig	2013-08-09 19:06:51.000000000 +0000
-+++ remoting/remoting.gyp	2013-08-12 21:21:56.000000000 +0000
-@@ -53,7 +53,7 @@
- 
-     'conditions': [
-       # Remoting host is supported only on Windows, OSX and Linux (with X11).
--      ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
-+      ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0 and use_x11==1)', {
-         'enable_remoting_host': 1,
-       }, {
-         'enable_remoting_host': 0,
-@@ -484,7 +484,7 @@
-             'host/win/wts_terminal_observer.h',
-           ],
-           'conditions': [
--            ['OS=="linux"', {
-+            ['OS=="linux" or os_bsd==1', {
-               'dependencies': [
-                 # Always use GTK on Linux, even for Aura builds.
-                 #
diff --git a/www/chromium/files/patch-skia__skia_library.gypi b/www/chromium/files/patch-skia__skia_common.gypi
index d641215b710b..0c39d50229a8 100644
--- a/www/chromium/files/patch-skia__skia_library.gypi
+++ b/www/chromium/files/patch-skia__skia_common.gypi
@@ -1,6 +1,6 @@
---- skia/skia_library.gypi.orig	2013-09-03 22:15:35.743627150 +0300
-+++ skia/skia_library.gypi	2013-09-03 22:17:46.187628519 +0300
-@@ -193,7 +193,7 @@
+--- ./skia/skia_common.gypi.orig	2014-04-24 22:35:56.000000000 +0200
++++ ./skia/skia_common.gypi	2014-04-24 23:23:47.000000000 +0200
+@@ -61,7 +61,7 @@
      }],
  
      #Settings for text blitting, chosen to approximate the system browser.
diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc
index 27989ab1f3f4..e4ea82bf31d9 100644
--- a/www/chromium/files/patch-sync__util__get_session_name.cc
+++ b/www/chromium/files/patch-sync__util__get_session_name.cc
@@ -1,5 +1,5 @@
---- sync/util/get_session_name.cc.orig	2014-01-07 21:02:32.000000000 +0100
-+++ sync/util/get_session_name.cc	2014-01-11 02:17:44.000000000 +0100
+--- ./sync/util/get_session_name.cc.orig	2014-04-24 22:35:50.000000000 +0200
++++ ./sync/util/get_session_name.cc	2014-04-24 23:23:47.000000000 +0200
 @@ -11,7 +11,7 @@
  #include "base/sys_info.h"
  #include "base/task_runner.h"
diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc
index fb3eea5d9158..415ba9ec9bf4 100644
--- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc
+++ b/www/chromium/files/patch-sync__util__get_session_name_linux.cc
@@ -1,5 +1,5 @@
---- sync/util/get_session_name_linux.cc.orig	2013-08-16 23:53:51.000000000 +0300
-+++ sync/util/get_session_name_linux.cc	2013-08-16 23:56:00.000000000 +0300
+--- ./sync/util/get_session_name_linux.cc.orig	2014-04-24 22:35:50.000000000 +0200
++++ ./sync/util/get_session_name_linux.cc	2014-04-24 23:23:47.000000000 +0200
 @@ -13,8 +13,9 @@
  namespace internal {
  
diff --git a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
index cc7af8ab2af6..0e8b8936a20c 100644
--- a/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
+++ b/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h
@@ -1,6 +1,6 @@
---- testing/gtest/include/gtest/internal/gtest-port.h.orig	2013-08-19 02:58:58.000000000 +0300
-+++ testing/gtest/include/gtest/internal/gtest-port.h	2013-08-30 19:49:05.000000000 +0300
-@@ -261,6 +261,8 @@
+--- ./testing/gtest/include/gtest/internal/gtest-port.h.orig	2014-04-24 22:36:14.000000000 +0200
++++ ./testing/gtest/include/gtest/internal/gtest-port.h	2014-04-24 23:23:47.000000000 +0200
+@@ -265,6 +265,8 @@
  # define GTEST_OS_NACL 1
  #elif defined __OpenBSD__
  # define GTEST_OS_OPENBSD 1
@@ -9,7 +9,7 @@
  #elif defined __QNX__
  # define GTEST_OS_QNX 1
  #endif  // __CYGWIN__
-@@ -473,7 +475,7 @@
+@@ -477,7 +479,7 @@
  // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0
  // to your compiler flags.
  # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \
@@ -18,7 +18,7 @@
  #endif  // GTEST_HAS_PTHREAD
  
  #if GTEST_HAS_PTHREAD
-@@ -642,7 +644,7 @@
+@@ -646,7 +648,7 @@
       (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \
       (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
       GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \
diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc
index 91b4f04c5721..0623a6077f21 100644
--- a/www/chromium/files/patch-testing__gtest__src__gtest.cc
+++ b/www/chromium/files/patch-testing__gtest__src__gtest.cc
@@ -1,6 +1,6 @@
---- testing/gtest/src/gtest.cc.orig	2011-09-14 11:19:34.000000000 +0300
-+++ testing/gtest/src/gtest.cc	2011-09-27 00:34:58.000000000 +0300
-@@ -114,6 +114,10 @@
+--- ./testing/gtest/src/gtest.cc.orig	2014-04-24 22:36:14.000000000 +0200
++++ ./testing/gtest/src/gtest.cc	2014-04-24 23:23:47.000000000 +0200
+@@ -117,6 +117,10 @@
  
  #endif  // GTEST_OS_LINUX
  
@@ -11,7 +11,7 @@
  #if GTEST_HAS_EXCEPTIONS
  # include <stdexcept>
  #endif
-@@ -1621,7 +1625,7 @@
+@@ -1592,7 +1596,7 @@
  
  #if GTEST_OS_WINDOWS
    return _wcsicmp(lhs, rhs) == 0;
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi b/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
deleted file mode 100644
index 65486589b09b..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__build__features.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/build/features.gypi.orig	2013-08-30 06:55:03.000000000 +0300
-+++ third_party/WebKit/Source/build/features.gypi	2013-09-03 22:27:08.777629842 +0300
-@@ -94,7 +94,7 @@
-           'ENABLE_WEB_AUDIO=1',
-         ],
-       }],
--      ['OS=="win" or OS=="android" or OS=="linux"', {
-+      ['OS=="win" or OS=="android" or OS=="linux" or os_bsd==1', {
-         'feature_defines': [
-           'ENABLE_OPENTYPE_VERTICAL=1',
-         ],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__config.h b/www/chromium/files/patch-third_party__WebKit__Source__config.h
index 6601904f3954..a6f15523b4a7 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__config.h
+++ b/www/chromium/files/patch-third_party__WebKit__Source__config.h
@@ -1,7 +1,7 @@
---- third_party/WebKit/Source/config.h.orig	2013-11-08 07:50:10.000000000 +0100
-+++ third_party/WebKit/Source/config.h	2013-11-15 16:58:16.000000000 +0100
-@@ -167,6 +167,6 @@
- #define __STDC_FORMAT_MACROS 1
+--- ./third_party/WebKit/Source/config.h.orig	2014-04-24 22:39:59.000000000 +0200
++++ ./third_party/WebKit/Source/config.h	2014-04-24 23:23:47.000000000 +0200
+@@ -156,6 +156,6 @@
+ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
  #endif
  
 -#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS)
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
index 4bdb2f00b707..0db6c3cb6c2f 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
@@ -1,15 +1,6 @@
---- third_party/WebKit/Source/core/core.gyp.orig	2013-08-09 19:15:52.000000000 +0000
-+++ third_party/WebKit/Source/core/core.gyp	2013-08-12 21:31:28.000000000 +0000
-@@ -593,7 +593,7 @@
-         ['exclude', 'platform/Theme\\.cpp$'],
-       ],
-       'conditions': [
--        ['OS!="linux"', {
-+        ['OS!="linux" and os_bsd!=1', {
-           'sources/': [
-             ['exclude', 'Linux\\.cpp$'],
-           ],
-@@ -946,7 +946,7 @@
+--- ./third_party/WebKit/Source/core/core.gyp.orig	2014-04-24 22:39:54.000000000 +0200
++++ ./third_party/WebKit/Source/core/core.gyp	2014-04-24 23:23:47.000000000 +0200
+@@ -627,7 +627,7 @@
            # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
            'cflags': ['-Wno-uninitialized'],
          }],
@@ -18,7 +9,7 @@
            'sources/': [
              ['exclude', 'Linux\\.cpp$'],
            ],
-@@ -991,7 +991,7 @@
+@@ -671,7 +671,7 @@
          ['OS=="win" and buildtype=="Official"', {
            'msvs_shard': 19,
          }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp
new file mode 100644
index 000000000000..354f92c3d719
--- /dev/null
+++ b/www/chromium/files/patch-third_party__WebKit__Source__heap__ThreadState.cpp
@@ -0,0 +1,36 @@
+--- ./third_party/WebKit/Source/heap/ThreadState.cpp.orig	2014-04-24 22:39:56.000000000 +0200
++++ ./third_party/WebKit/Source/heap/ThreadState.cpp	2014-04-24 23:23:47.000000000 +0200
+@@ -43,13 +43,22 @@
+ extern "C" void* __libc_stack_end;  // NOLINT
+ #endif
+ 
++#if OS(FREEBSD)
++#include <pthread_np.h>
++#endif
++
+ namespace WebCore {
+ 
+ static void* getStackStart()
+ {
+-#if defined(__GLIBC__) || OS(ANDROID)
++#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
+     pthread_attr_t attr;
++#if OS(FREEBSD)
++    pthread_attr_init(&attr);
++    if (!pthread_attr_get_np(pthread_self(), &attr)) {
++#else
+     if (!pthread_getattr_np(pthread_self(), &attr)) {
++#endif
+         void* base;
+         size_t size;
+         int error = pthread_attr_getstack(&attr, &base, &size);
+@@ -57,6 +66,9 @@
+         pthread_attr_destroy(&attr);
+         return reinterpret_cast<Address>(base) + size;
+     }
++#if OS(FREEBSD)
++    pthread_attr_destroy(&attr);
++#endif
+ #if defined(__GLIBC__)
+     // pthread_getattr_np can fail for the main thread. In this case
+     // just like NaCl we rely on the __libc_stack_end to give us
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
index 9aca73db879d..801ce1a2f560 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
@@ -1,6 +1,6 @@
---- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2014-02-20 21:32:30.000000000 +0100
-+++ third_party/WebKit/Source/platform/blink_platform.gyp	2014-02-25 01:06:25.000000000 +0100
-@@ -196,7 +196,7 @@
+--- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig	2014-04-24 22:39:50.000000000 +0200
++++ ./third_party/WebKit/Source/platform/blink_platform.gyp	2014-04-24 23:23:47.000000000 +0200
+@@ -193,7 +193,7 @@
      # compiler optimizations, see crbug.com/237063
      'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
      'conditions': [
@@ -9,7 +9,7 @@
          'sources/': [
            # Cherry-pick files excluded by the broader regular expressions above.
            ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
-@@ -304,7 +304,7 @@
+@@ -303,7 +303,7 @@
            ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
          ],
        }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp b/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
deleted file mode 100644
index 6d9f6cb9d808..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__testing__runner__WebAXObjectProxy.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp.orig	2014-01-07 21:06:22.000000000 +0100
-+++ third_party/WebKit/Source/testing/runner/WebAXObjectProxy.cpp	2014-01-13 13:22:53.000000000 +0100
-@@ -36,6 +36,10 @@
- #include "public/platform/WebRect.h"
- #include "public/platform/WebString.h"
- 
-+#if defined(OS_FREEBSD)
-+#include <stdlib.h> // atoi()
-+#endif
-+
- using namespace blink;
- using namespace std;
- 
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp b/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
deleted file mode 100644
index 3c54317a565f..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__testing__testing.gyp
+++ /dev/null
@@ -1,15 +0,0 @@
---- third_party/WebKit/Source/testing/testing.gyp.orig	2013-09-03 23:36:08.000000000 +0300
-+++ third_party/WebKit/Source/testing/testing.gyp	2013-09-03 23:37:05.000000000 +0300
-@@ -339,5 +339,12 @@
-                 },
-             },
-         }],
-+        ['OS=="freebsd"', {
-+            'target_defaults': {
-+                'include_dirs': [
-+                    '/usr/local/include',
-+                ],
-+            },
-+        }],
-     ], # conditions
- }
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
index d5332455884f..b71979a1bc24 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__web__WebInputEventFactoryGtk.cpp
@@ -1,15 +1,15 @@
---- third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig	2014-01-07 21:06:23.000000000 +0100
-+++ third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp	2014-01-11 00:54:01.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <gdk/gdkkeysyms.h>
+--- ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp.orig	2014-04-24 22:39:57.000000000 +0200
++++ ./third_party/WebKit/Source/web/WebInputEventFactoryGtk.cpp	2014-04-24 23:23:47.000000000 +0200
+@@ -41,6 +41,8 @@
  #include <gtk/gtk.h>
+ #include <stdlib.h>
  
 +#include <cstdlib>
 +
  #include "wtf/Assertions.h"
  
  namespace {
-@@ -65,8 +67,8 @@
+@@ -66,8 +68,8 @@
                   "gtk-double-click-time", &doubleClickTime,
                   "gtk-double-click-distance", &doubleClickDistance, NULL);
      return (time - gLastClickTime) > doubleClickTime
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
index 18d9e5901691..94b726220bc4 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig	2014-02-20 21:32:26.000000000 +0100
-+++ third_party/WebKit/Source/web/linux/WebFontRendering.cpp	2014-02-25 00:44:05.000000000 +0100
+--- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig	2014-04-24 22:39:57.000000000 +0200
++++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp	2014-04-24 23:23:47.000000000 +0200
 @@ -34,7 +34,7 @@
  #include "platform/fonts/FontDescription.h"
  #include "platform/fonts/FontPlatformData.h"
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
index 9c4ecf3f7a9d..1b7ac00e2c94 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
@@ -1,6 +1,6 @@
---- third_party/WebKit/Source/web/web.gyp.orig	2013-07-15 19:48:12.000000000 +0300
-+++ third_party/WebKit/Source/web/web.gyp	2013-07-15 19:48:46.000000000 +0300
-@@ -142,7 +142,7 @@
+--- ./third_party/WebKit/Source/web/web.gyp.orig	2014-04-24 22:39:57.000000000 +0200
++++ ./third_party/WebKit/Source/web/web.gyp	2014-04-24 23:23:47.000000000 +0200
+@@ -149,7 +149,7 @@
                        },
                      },
                  }],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
index e2730fbd8411..53f2647fba22 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp
@@ -1,10 +1,10 @@
---- third_party/WebKit/Source/wtf/Assertions.cpp.orig	2013-09-28 19:19:20.000000000 +0200
-+++ third_party/WebKit/Source/wtf/Assertions.cpp	2013-10-10 11:45:33.000000000 +0200
-@@ -37,6 +37,7 @@
- #include "Compiler.h"
- #include "OwnArrayPtr.h"
+--- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig	2014-04-24 22:39:59.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/Assertions.cpp	2014-04-24 23:23:47.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include "OwnPtr.h"
+ #include "PassOwnPtr.h"
  
 +#include <stdlib.h>
  #include <stdio.h>
  #include <stdarg.h>
- #include <string.h>
+ #include <stdlib.h>
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
index 68dbbb153a76..49b162543d69 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
+++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-02-20 21:32:28.000000000 +0100
-+++ third_party/WebKit/Source/wtf/ByteSwap.h	2014-02-24 17:55:43.000000000 +0100
+--- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-04-24 22:39:59.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/ByteSwap.h	2014-04-24 23:23:47.000000000 +0200
 @@ -52,14 +52,20 @@
  
  #else
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
index fe957359950b..9a3515932ede 100644
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
+++ b/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/wtf/DateMath.cpp.orig	2013-11-08 07:50:10.000000000 +0100
-+++ third_party/WebKit/Source/wtf/DateMath.cpp	2013-11-15 12:55:05.000000000 +0100
+--- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig	2014-04-24 22:39:59.000000000 +0200
++++ ./third_party/WebKit/Source/wtf/DateMath.cpp	2014-04-24 23:23:47.000000000 +0200
 @@ -80,6 +80,7 @@
  #include "StringExtras.h"
  
diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
index 5f80ccb84108..a59f283a7551 100644
--- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
+++ b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
@@ -1,7 +1,7 @@
---- third_party/ffmpeg/libavutil/mem.c.orig	2011-09-11 11:03:30.000000000 +0300
-+++ third_party/ffmpeg/libavutil/mem.c	2011-09-12 23:49:42.000000000 +0300
-@@ -31,7 +31,7 @@
- #include <limits.h>
+--- ./third_party/ffmpeg/libavutil/mem.c.orig	2014-04-24 22:36:23.000000000 +0200
++++ ./third_party/ffmpeg/libavutil/mem.c	2014-04-24 23:23:47.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include <stdint.h>
  #include <stdlib.h>
  #include <string.h>
 -#if HAVE_MALLOC_H
diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
index 710923602a65..9a7be533e54d 100644
--- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
+++ b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
@@ -1,5 +1,5 @@
---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2012-10-02 20:32:18.000000000 +0300
-+++ third_party/libXNVCtrl/libXNVCtrl.gyp	2012-10-02 20:32:24.000000000 +0300
+--- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2014-04-24 22:36:00.000000000 +0200
++++ ./third_party/libXNVCtrl/libXNVCtrl.gyp	2014-04-24 23:23:47.000000000 +0200
 @@ -13,6 +13,9 @@
          'NVCtrlLib.h',
          'nv_control.h',
diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
index 9067a0fa281b..48af9629aca2 100644
--- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
+++ b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
@@ -1,6 +1,6 @@
---- third_party/libjingle/libjingle.gyp.orig	2013-08-09 22:05:45.000000000 +0300
-+++ third_party/libjingle/libjingle.gyp	2013-08-18 00:43:44.000000000 +0300
-@@ -532,7 +532,7 @@
+--- ./third_party/libjingle/libjingle.gyp.orig	2014-04-24 22:35:58.000000000 +0200
++++ ./third_party/libjingle/libjingle.gyp	2014-04-24 23:23:47.000000000 +0200
+@@ -543,7 +543,7 @@
              '<(libjingle_source)/talk/base/unixfilesystem.h',
            ],
          }],
@@ -9,12 +9,12 @@
            'sources': [
              '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
              '<(libjingle_source)/talk/base/latebindingsymboltable.h',
-@@ -772,7 +772,7 @@
+@@ -795,7 +795,7 @@
                ],
              }],
              # TODO(mallinath) - Enable SCTP for iOS.
 -            ['OS!="ios"', {
 +            ['OS!="ios" and os_bsd!=1', {
                'defines': [
-                 ['HAVE_SCTP',
+                 'HAVE_SCTP',
                ],
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
index 7ec72f8c1a07..701a5b9a8ba7 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2014-01-07 21:03:06.000000000 +0100
-+++ third_party/libjingle/source/talk/base/cpumonitor.cc	2014-01-13 02:01:01.000000000 +0100
+--- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/cpumonitor.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -52,13 +52,13 @@
  #include <mach/task.h>
  #endif  // defined(IOS) || defined(OSX)
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
index d6deec652d6c..afe9dd124c85 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h
@@ -1,6 +1,6 @@
---- third_party/libjingle/source/talk/base/ipaddress.h.orig	2012-01-30 22:44:57.000000000 +0200
-+++ third_party/libjingle/source/talk/base/ipaddress.h	2012-01-30 22:47:28.000000000 +0200
-@@ -33,6 +33,9 @@
+--- ./third_party/libjingle/source/talk/base/ipaddress.h.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/ipaddress.h	2014-04-24 23:23:48.000000000 +0200
+@@ -34,6 +34,9 @@
  #include <arpa/inet.h>
  #include <netdb.h>
  #endif
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
index c88021187de2..f3c2b89fe97d 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/linux.cc.orig	2013-07-15 17:38:04.000000000 +0300
-+++ third_party/libjingle/source/talk/base/linux.cc	2013-07-15 17:39:04.000000000 +0300
+--- ./third_party/libjingle/source/talk/base/linux.cc.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/linux.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -25,7 +25,7 @@
   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
@@ -9,7 +9,7 @@
  #include "talk/base/linux.h"
  
  #include <ctype.h>
-@@ -279,4 +279,4 @@
+@@ -362,4 +362,4 @@
  
  }  // namespace talk_base
  
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
index c04ff720b695..96749b07f5e1 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/linux.h.orig	2013-07-15 17:36:34.000000000 +0300
-+++ third_party/libjingle/source/talk/base/linux.h	2013-07-15 17:37:47.000000000 +0300
+--- ./third_party/libjingle/source/talk/base/linux.h.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/linux.h	2014-04-24 23:23:48.000000000 +0200
 @@ -28,7 +28,7 @@
  #ifndef TALK_BASE_LINUX_H_
  #define TALK_BASE_LINUX_H_
@@ -9,7 +9,7 @@
  #include <string>
  #include <map>
  #include <vector>
-@@ -131,5 +131,5 @@
+@@ -136,5 +136,5 @@
  
  }  // namespace talk_base
  
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
index 94f4506093b3..3feafba616c6 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/network.h.orig	2013-05-26 21:44:12.257312749 +0200
-+++ third_party/libjingle/source/talk/base/network.h	2013-05-26 21:45:08.869297313 +0200
+--- ./third_party/libjingle/source/talk/base/network.h.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/network.h	2014-04-24 23:23:48.000000000 +0200
 @@ -38,6 +38,10 @@
  #include "talk/base/messagehandler.h"
  #include "talk/base/sigslot.h"
diff --git a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
index 6061a08ad1fa..899f6d28d601 100644
--- a/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
+++ b/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc
@@ -1,5 +1,5 @@
---- third_party/libjingle/source/talk/base/systeminfo.cc.orig	2013-09-03 03:20:59.000000000 -0400
-+++ third_party/libjingle/source/talk/base/systeminfo.cc	2013-09-12 15:47:30.000000000 -0400
+--- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig	2014-04-24 22:36:53.000000000 +0200
++++ ./third_party/libjingle/source/talk/base/systeminfo.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -36,7 +36,7 @@
  #elif defined(OSX)
  #include <ApplicationServices/ApplicationServices.h>
diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
index 0d0bf30b361c..2ab98c7c03d9 100644
--- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
+++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
@@ -1,6 +1,6 @@
---- third_party/libjpeg_turbo/libjpeg.gyp.orig	2012-09-25 16:03:33.000000000 +0300
-+++ third_party/libjpeg_turbo/libjpeg.gyp	2012-09-29 18:07:42.000000000 +0300
-@@ -231,7 +231,7 @@
+--- ./third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-04-24 22:36:33.000000000 +0200
++++ ./third_party/libjpeg_turbo/libjpeg.gyp	2014-04-24 23:23:48.000000000 +0200
+@@ -240,7 +240,7 @@
              ],
            },
          }],
@@ -9,7 +9,7 @@
            'conditions': [
              [ 'use_system_yasm==0', {
                'dependencies': [
-@@ -262,6 +262,9 @@
+@@ -271,6 +271,9 @@
                  ],
                }],
              ],
diff --git a/www/chromium/files/patch-third_party__libusb__libusb.gyp b/www/chromium/files/patch-third_party__libusb__libusb.gyp
index ceeeadb3d9c1..15c4e3b1347e 100644
--- a/www/chromium/files/patch-third_party__libusb__libusb.gyp
+++ b/www/chromium/files/patch-third_party__libusb__libusb.gyp
@@ -1,8 +1,8 @@
---- third_party/libusb/libusb.gyp.orig	2013-06-19 01:35:24.000000000 +0000
-+++ third_party/libusb/libusb.gyp	2013-06-24 21:04:31.000000000 +0000
-@@ -67,6 +67,19 @@
-             '_GNU_SOURCE=1',
+--- ./third_party/libusb/libusb.gyp.orig	2014-04-24 22:35:57.000000000 +0200
++++ ./third_party/libusb/libusb.gyp	2014-04-24 23:23:48.000000000 +0200
+@@ -93,6 +93,19 @@
            ],
+           'msvs_disabled_warnings': [ 4267 ],
          }],
 +        ['OS == "freebsd"', {
 +          'type': 'none',
diff --git a/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh b/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
deleted file mode 100644
index 97158d10acf1..000000000000
--- a/www/chromium/files/patch-third_party__libvpx__obj_int_extract.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- third_party/libvpx/obj_int_extract.sh.orig	2012-09-30 00:09:37.000000000 +0300
-+++ third_party/libvpx/obj_int_extract.sh	2012-09-30 00:22:26.000000000 +0300
-@@ -1,4 +1,4 @@
--#!/bin/bash -e
-+#!/usr/bin/env bash
- #
- # Copyright (c) 2012 The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
diff --git a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
index a434fad155c0..8771dc3fac78 100644
--- a/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
+++ b/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh
@@ -1,12 +1,12 @@
---- third_party/libvpx/unpack_lib_posix.sh.orig	2013-05-08 22:39:15.000000000 +0300
-+++ third_party/libvpx/unpack_lib_posix.sh	2013-05-08 22:37:44.000000000 +0300
+--- ./third_party/libvpx/unpack_lib_posix.sh.orig	2014-04-24 22:36:38.000000000 +0200
++++ ./third_party/libvpx/unpack_lib_posix.sh	2014-04-24 23:23:48.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash -e
 +#!/usr/bin/env bash
  #
  # Copyright (c) 2012 The Chromium Authors. All rights reserved.
  # Use of this source code is governed by a BSD-style license that can be
-@@ -45,16 +45,12 @@
+@@ -48,16 +48,12 @@
    ar=$AR
  fi
  
diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
index 9e08cd2912e7..0baca757c803 100644
--- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
+++ b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
@@ -1,5 +1,5 @@
---- third_party/ots/include/opentype-sanitiser.h.orig	2012-04-12 09:04:04.000000000 +0200
-+++ third_party/ots/include/opentype-sanitiser.h	2012-04-29 22:09:44.000000000 +0200
+--- ./third_party/ots/include/opentype-sanitiser.h.orig	2014-04-24 22:36:47.000000000 +0200
++++ ./third_party/ots/include/opentype-sanitiser.h	2014-04-24 23:23:48.000000000 +0200
 @@ -22,6 +22,7 @@
  #else
  #include <arpa/inet.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi
index bd25f89fbc0a..78fd83539d5a 100644
--- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__build__common.gypi
@@ -1,7 +1,7 @@
---- third_party/webrtc/build/common.gypi.orig	2013-07-16 16:41:06.000000000 +0300
-+++ third_party/webrtc/build/common.gypi	2013-07-16 17:21:31.000000000 +0300
+--- ./third_party/webrtc/build/common.gypi.orig	2014-04-24 22:37:12.000000000 +0200
++++ ./third_party/webrtc/build/common.gypi	2014-04-24 23:23:48.000000000 +0200
 @@ -272,6 +272,13 @@
-           #'WEBRTC_CLOCK_TYPE_REALTIME',
+           'WEBRTC_LINUX',
          ],
        }],
 +      ['os_bsd==1', {
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
index 287293c6086d..568bca343fb7 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2013-07-16 18:26:35.000000000 +0300
-+++ third_party/webrtc/modules/audio_device/audio_device.gypi	2013-07-16 18:29:22.000000000 +0300
-@@ -45,7 +45,7 @@
+--- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2014-04-24 22:37:00.000000000 +0200
++++ ./third_party/webrtc/modules/audio_device/audio_device.gypi	2014-04-24 23:23:48.000000000 +0200
+@@ -47,7 +47,7 @@
          'dummy/audio_device_utility_dummy.h',
        ],
        'conditions': [
@@ -9,9 +9,9 @@
            'include_dirs': [
              'linux',
            ],
-@@ -133,7 +133,7 @@
-                 }],
-               ],
+@@ -141,7 +141,7 @@
+                 ],
+               },
              }],
 -            ['OS=="linux"', {
 +            ['OS=="linux" or OS=="freebsd"', {
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
index 80c82bcdb47b..7bf99f17b0eb 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
+++ b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2013-08-16 22:24:59.000000000 +0300
-+++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi	2013-08-16 22:27:28.000000000 +0300
-@@ -75,6 +75,11 @@
+--- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2014-04-24 22:37:06.000000000 +0200
++++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi	2014-04-24 23:23:48.000000000 +0200
+@@ -99,6 +99,11 @@
              ],
            },
          }],
@@ -11,4 +11,4 @@
 +        }],
          ['OS!="win" and OS!="mac" and use_x11==0', {
            'sources': [
-             "screen_capturer_null.cc",
+             "mouse_cursor_monitor_null.cc",
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
index d119fc4f47a5..fe5be76e466e 100644
--- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
+++ b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
@@ -1,10 +1,10 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2013-10-09 17:35:26.000000000 +0200
-+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc	2013-10-09 17:32:54.000000000 +0200
-@@ -14,6 +14,7 @@
+--- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2014-04-24 22:37:08.000000000 +0200
++++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc	2014-04-24 23:23:48.000000000 +0200
+@@ -15,6 +15,7 @@
  #include <string.h>
  
  #include <algorithm>
 +#include <cstdlib>
  #include <iterator>
  
- #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
+ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
index 4e2484c27de8..1df426ab6f1c 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2013-07-16 17:22:11.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc	2013-07-16 17:23:12.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2014-04-24 22:37:13.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -12,7 +12,11 @@
  
  #include <assert.h>
@@ -10,5 +10,5 @@
  #include <malloc.h>
 +#endif
  
- #include "common_types.h"
+ #include "webrtc/common_types.h"
  
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
index d6a303ed89e6..77e369efe635 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig	2013-08-09 22:21:35.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/cpu_info.cc	2013-08-16 23:27:36.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig	2014-04-24 22:37:13.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -12,7 +12,10 @@
  
  #if defined(_WIN32)
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
index 486ff45e0921..d7223269665e 100644
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
+++ b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc
@@ -1,5 +1,5 @@
---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2013-08-09 22:21:35.000000000 +0300
-+++ third_party/webrtc/system_wrappers/source/thread_posix.cc	2013-08-16 23:34:09.000000000 +0300
+--- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2014-04-24 22:37:13.000000000 +0200
++++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -51,9 +51,11 @@
  #include <string.h>  // strncpy
  #include <unistd.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
index 29c73a7955ea..85572bac45f2 100644
--- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
+++ b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
@@ -1,6 +1,6 @@
---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2013-08-09 22:21:34.000000000 +0300
-+++ third_party/webrtc/voice_engine/voice_engine_defines.h	2013-08-16 21:25:45.000000000 +0300
-@@ -260,7 +260,7 @@
+--- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2014-04-24 22:37:12.000000000 +0200
++++ ./third_party/webrtc/voice_engine/voice_engine_defines.h	2014-04-24 23:23:48.000000000 +0200
+@@ -233,7 +233,7 @@
  #include <pthread.h>
  #include <sys/socket.h>
  #include <sys/types.h>
diff --git a/www/chromium/files/patch-tools__grit__grit__node__base.py b/www/chromium/files/patch-tools__grit__grit__node__base.py
deleted file mode 100644
index 8895b8b3137e..000000000000
--- a/www/chromium/files/patch-tools__grit__grit__node__base.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/grit/grit/node/base.py.orig	2013-08-09 22:25:28.000000000 +0300
-+++ tools/grit/grit/node/base.py	2013-08-16 21:30:43.000000000 +0300
-@@ -460,6 +460,7 @@
-         'is_win': target_platform in ('cygwin', 'win32'),
-         'is_android': target_platform == 'android',
-         'is_ios': target_platform == 'ios',
-+        'is_bsd': 'bsd' in target_platform,
-         'is_posix': (target_platform in ('darwin', 'linux2', 'linux3', 'sunos5',
-                                          'android', 'ios')
-                     or 'bsd' in target_platform),
diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
index 09389c15aa53..1ceecb1425c4 100644
--- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
+++ b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
@@ -1,6 +1,6 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig	2012-11-27 10:03:58.000000000 +0200
-+++ tools/gyp/pylib/gyp/generator/make.py	2012-12-10 22:26:33.000000000 +0200
-@@ -86,7 +86,7 @@
+--- ./tools/gyp/pylib/gyp/generator/make.py.orig	2014-04-24 22:36:59.000000000 +0200
++++ ./tools/gyp/pylib/gyp/generator/make.py	2014-04-24 23:23:48.000000000 +0200
+@@ -87,7 +87,7 @@
    else:
      operating_system = flavor
      if flavor == 'android':
@@ -9,7 +9,7 @@
      default_variables.setdefault('OS', operating_system)
      default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
      default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
-@@ -250,30 +250,30 @@
+@@ -275,7 +275,7 @@
  CFLAGS.target ?= $(CFLAGS)
  CXX.target ?= %(CXX.target)s
  CXXFLAGS.target ?= $(CXXFLAGS)
@@ -17,18 +17,9 @@
 +LINK.target ?= %(CXX.target)s
  LDFLAGS.target ?= $(LDFLAGS)
  AR.target ?= $(AR)
-
- # C++ apps need to be linked with g++.
- #
- # Note: flock is used to seralize linking. Linking is a memory-intensive
- # process so running parallel links can often lead to thrashing.  To disable
- # the serialization, override LINK via an envrionment variable as follows:
- #
- #   export LINK=g++
- #
- # This will allow make to invoke N linker processes as specified in -jN.
- LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target)
-
+ 
+@@ -292,13 +292,13 @@
+ 
  # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
  # to replicate this environment fallback in make as well.
 -CC.host ?= %(CC.host)s
@@ -48,7 +39,7 @@
  
  # Define a dir function that can handle spaces.
  # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1770,7 +1770,7 @@
+@@ -1787,7 +1787,7 @@
        return modules
  
      # Retrieve the default value of 'SHARED_LIB_SUFFIX'
diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
index 395571adc2f2..2fc9fb4a554c 100644
--- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
+++ b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
@@ -1,5 +1,5 @@
---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2010-12-16 02:33:31.000000000 +0100
-+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp	2010-12-20 20:15:08.000000000 +0100
+--- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2014-04-24 22:37:02.000000000 +0200
++++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp	2014-04-24 23:23:48.000000000 +0200
 @@ -47,7 +47,7 @@
      },
    ],
diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
index fd29a78614ca..e30dde921bd5 100644
--- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
+++ b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
@@ -1,5 +1,5 @@
---- tools/gyp/test/library/src/library.gyp.orig	2010-12-16 02:33:32.000000000 +0100
-+++ tools/gyp/test/library/src/library.gyp	2010-12-20 20:15:08.000000000 +0100
+--- ./tools/gyp/test/library/src/library.gyp.orig	2014-04-24 22:37:02.000000000 +0200
++++ ./tools/gyp/test/library/src/library.gyp	2014-04-24 23:23:48.000000000 +0200
 @@ -48,7 +48,7 @@
      },
    ],
diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc
index e19a04ac6a5c..91aea61e62dc 100644
--- a/www/chromium/files/patch-ui__events__event_switches.cc
+++ b/www/chromium/files/patch-ui__events__event_switches.cc
@@ -1,5 +1,5 @@
---- ui/events/event_switches.cc.orig	2014-01-13 11:38:50.000000000 +0100
-+++ ui/events/event_switches.cc	2014-01-13 11:38:26.000000000 +0100
+--- ./ui/events/event_switches.cc.orig	2014-04-24 22:35:16.000000000 +0200
++++ ./ui/events/event_switches.cc	2014-04-24 23:23:48.000000000 +0200
 @@ -20,7 +20,7 @@
  //   disabled: touch events are disabled.
  const char kTouchEventsDisabled[] = "disabled";
diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h
index ebe42e587020..21f0e8088368 100644
--- a/www/chromium/files/patch-ui__events__event_switches.h
+++ b/www/chromium/files/patch-ui__events__event_switches.h
@@ -1,5 +1,5 @@
---- ui/events/event_switches.h.orig	2014-01-07 21:02:04.000000000 +0100
-+++ ui/events/event_switches.h	2014-01-13 11:38:59.000000000 +0100
+--- ./ui/events/event_switches.h.orig	2014-04-24 22:35:16.000000000 +0200
++++ ./ui/events/event_switches.h	2014-04-24 23:23:48.000000000 +0200
 @@ -16,7 +16,7 @@
  EVENTS_BASE_EXPORT extern const char kTouchEventsEnabled[];
  EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp
index 21fd93d1ecc7..e05cbc48e2c9 100644
--- a/www/chromium/files/patch-ui__gl__gl.gyp
+++ b/www/chromium/files/patch-ui__gl__gl.gyp
@@ -1,6 +1,6 @@
---- ui/gl/gl.gyp.orig	2013-08-09 22:06:46.000000000 +0300
-+++ ui/gl/gl.gyp	2013-08-16 21:35:40.000000000 +0300
-@@ -178,7 +178,7 @@
+--- ./ui/gl/gl.gyp.orig	2014-04-24 22:35:14.000000000 +0200
++++ ./ui/gl/gl.gyp	2014-04-24 23:23:48.000000000 +0200
+@@ -170,7 +170,7 @@
          },
        ],
        'conditions': [
diff --git a/www/chromium/files/patch-v8__src__checks.cc b/www/chromium/files/patch-v8__src__checks.cc
deleted file mode 100644
index 6f8325344acf..000000000000
--- a/www/chromium/files/patch-v8__src__checks.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- v8/src/checks.cc.orig	2014-01-07 21:03:55.000000000 +0100
-+++ v8/src/checks.cc	2014-01-11 01:09:31.000000000 +0100
-@@ -32,6 +32,7 @@
- # include <execinfo.h>
- #endif  // V8_LIBC_GLIBC || V8_OS_BSD
- #include <stdio.h>
-+#include <unistd.h> // size_t
- 
- #include "platform.h"
- #include "v8.h"
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index fc0d86fd1417..4e86c936de41 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -3,7 +3,6 @@ man/man1/chrome.1.gz
 share/applications/chromium-browser.desktop
 %%DATADIR%%/chrome
 %%DATADIR%%/chrome-wrapper
-%%DATADIR%%/chrome.pak
 %%DATADIR%%/chrome_100_percent.pak
 %%DATADIR%%/content_resources.pak
 %%DATADIR%%/libffmpegsumo.so
@@ -76,12 +75,12 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/cmdevtools.css
 %%DATADIR%%/resources/inspector/codemirror.css
 %%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js
-%%DATADIR%%/resources/inspector/cssNamedFlows.css
 %%DATADIR%%/resources/inspector/dataGrid.css
 %%DATADIR%%/resources/inspector/devtools.html
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/elementsPanel.css
 %%DATADIR%%/resources/inspector/ElementsPanel.js
+%%DATADIR%%/resources/inspector/ExtensionServer.js
 %%DATADIR%%/resources/inspector/filter.css
 %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css
 %%DATADIR%%/resources/inspector/heapProfiler.css
@@ -92,14 +91,10 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/addIcon.png
 %%DATADIR%%/resources/inspector/Images/applicationCache.png
 %%DATADIR%%/resources/inspector/Images/back.png
-%%DATADIR%%/resources/inspector/Images/breakpointBorder.png
-%%DATADIR%%/resources/inspector/Images/breakpointConditionalBorder.png
-%%DATADIR%%/resources/inspector/Images/breakpointConditionalCounterBorder.png
-%%DATADIR%%/resources/inspector/Images/breakpointCounterBorder.png
-%%DATADIR%%/resources/inspector/Images/breakpoint2.png
-%%DATADIR%%/resources/inspector/Images/breakpoint2_2x.png
-%%DATADIR%%/resources/inspector/Images/breakpointConditional2.png
-%%DATADIR%%/resources/inspector/Images/breakpointConditional2_2x.png
+%%DATADIR%%/resources/inspector/Images/breakpoint.png
+%%DATADIR%%/resources/inspector/Images/breakpointConditional.png
+%%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png
+%%DATADIR%%/resources/inspector/Images/breakpoint_2x.png
 %%DATADIR%%/resources/inspector/Images/checker.png
 %%DATADIR%%/resources/inspector/Images/cookie.png
 %%DATADIR%%/resources/inspector/Images/database.png
@@ -109,17 +104,12 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/fileSystem.png
 %%DATADIR%%/resources/inspector/Images/forward.png
 %%DATADIR%%/resources/inspector/Images/frame.png
-%%DATADIR%%/resources/inspector/Images/glossyHeader.png
-%%DATADIR%%/resources/inspector/Images/glossyHeaderPressed.png
-%%DATADIR%%/resources/inspector/Images/glossyHeaderSelected.png
-%%DATADIR%%/resources/inspector/Images/glossyHeaderSelectedPressed.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png
 %%DATADIR%%/resources/inspector/Images/indexedDB.png
 %%DATADIR%%/resources/inspector/Images/indexedDBIndex.png
 %%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png
 %%DATADIR%%/resources/inspector/Images/localStorage.png
-%%DATADIR%%/resources/inspector/Images/namedFlowOverflow.png
 %%DATADIR%%/resources/inspector/Images/navigationControls.png
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
 %%DATADIR%%/resources/inspector/Images/paneAddButtons.png
@@ -132,11 +122,7 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
 %%DATADIR%%/resources/inspector/Images/profileIcon.png
 %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png
-%%DATADIR%%/resources/inspector/Images/programCounterBorder.png
 %%DATADIR%%/resources/inspector/Images/radioDot.png
-%%DATADIR%%/resources/inspector/Images/regionEmpty.png
-%%DATADIR%%/resources/inspector/Images/regionFit.png
-%%DATADIR%%/resources/inspector/Images/regionOverset.png
 %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png
@@ -149,13 +135,12 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/sessionStorage.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png
-%%DATADIR%%/resources/inspector/Images/spinner.gif
 %%DATADIR%%/resources/inspector/Images/spinnerActive.gif
 %%DATADIR%%/resources/inspector/Images/spinnerActiveSelected.gif
 %%DATADIR%%/resources/inspector/Images/spinnerInactive.gif
 %%DATADIR%%/resources/inspector/Images/spinnerInactiveSelected.gif
 %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png
-%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs2x.png
+%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs_2x.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png
 %%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png
@@ -164,20 +149,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/thumbHoverHoriz.png
 %%DATADIR%%/resources/inspector/Images/thumbHoverVert.png
 %%DATADIR%%/resources/inspector/Images/thumbVert.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillBlue.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillGray.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillGreen.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillOrange.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillPurple.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillRed.png
-%%DATADIR%%/resources/inspector/Images/timelineHollowPillYellow.png
-%%DATADIR%%/resources/inspector/Images/timelinePillBlue.png
-%%DATADIR%%/resources/inspector/Images/timelinePillGray.png
-%%DATADIR%%/resources/inspector/Images/timelinePillGreen.png
-%%DATADIR%%/resources/inspector/Images/timelinePillOrange.png
-%%DATADIR%%/resources/inspector/Images/timelinePillPurple.png
-%%DATADIR%%/resources/inspector/Images/timelinePillRed.png
-%%DATADIR%%/resources/inspector/Images/timelinePillYellow.png
 %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png
 %%DATADIR%%/resources/inspector/Images/trackHoriz.png
 %%DATADIR%%/resources/inspector/Images/trackVert.png
@@ -204,6 +175,7 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/sourcesView.css
 %%DATADIR%%/resources/inspector/spectrum.css
 %%DATADIR%%/resources/inspector/splitView.css
+%%DATADIR%%/resources/inspector/TempStorageSharedWorker.js
 %%DATADIR%%/resources/inspector/textPrompt.css
 %%DATADIR%%/resources/inspector/timelinePanel.css
 %%DATADIR%%/resources/inspector/TimelinePanel.js
author	Rene Ladan <rene@FreeBSD.org>	2014-05-03 10:02:35 +0000
committer	Rene Ladan <rene@FreeBSD.org>	2014-05-03 10:02:35 +0000
commit	d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553 (patch)
tree	843b721a512771c94d9cdb6e645e07d46c0d648a
parent	9d7947dfa95a2c447839c24edc6f59935ece1ebf (diff)
download	ports-d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553.tar.gz ports-d9ae29740e61b36eb20c0cbda9f06c6cc8c9d553.zip