www/chromium: update to 45.0.2454.85 [1]

- support webui JS code, from OpenBSD
- support setting background processes, from OpenBSD
- disable core dumps in the wrapper script [2]

Submitted by:	LeFroid <tmvfroid@gmail.com> [1] via GitHub
Submitted by:	cognet [2]
MFH:		2015Q3
Security:	http://vuxml.freebsd.org/freebsd/a9350df8-5157-11e5-b5c1-e8e0b747a45a.html

36 files changed, 424 insertions, 376 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 43a4dfb8d31c..568fd6f90741 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	44.0.2403.155
+PORTVERSION=    45.0.2454.85	
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -281,7 +281,7 @@ pre-configure:
 		'third_party/google_input_tools' \
 		'third_party/google_input_tools/third_party/closure_library' \
 		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell_new' \
+		'third_party/hunspell' \
 		'third_party/iccjpeg' \
 		'third_party/icu/icu.isolate' \
 		'third_party/jinja2' \
@@ -325,9 +325,10 @@ pre-configure:
 		'third_party/tcmalloc' \
 		'third_party/tlslite' \
 		'third_party/trace-viewer' \
-		'third_party/trace-viewer/third_party' \
-		'third_party/trace-viewer/third_party/tvcm/third_party' \
-		'third_party/undoview' \
+		'third_party/trace-viewer/tracing' \
+		'third_party/trace-viewer/tracing/third_party' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/third_party' \
+		'third_party/trace-viewer/tracing/third_party/tvcm/tvcm' \
 		'third_party/usrsctp' \
 		'third_party/web-animations-js' \
 		'third_party/webdriver' \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 2c632dc706a2..0d37b516d039 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-44.0.2403.155.tar.xz) = eba271c210a020dd61b72c940abeecdafc562a1d15fb45615dda72bcb6219f3c
-SIZE (chromium-44.0.2403.155.tar.xz) = 293362744
-SHA256 (chromium-44.0.2403.155-testdata.tar.xz) = 1fbcfc5bb94db75970f04055163a82560814f3961dece961db4ed5c11014f3d4
-SIZE (chromium-44.0.2403.155-testdata.tar.xz) = 128600128
+SHA256 (chromium-45.0.2454.85.tar.xz) = 3e8c03a5a6ea4cc35017404a58687ca18207eed70781bad7f2d7d70610934c91
+SIZE (chromium-45.0.2454.85.tar.xz) = 321222028
+SHA256 (chromium-45.0.2454.85-testdata.tar.xz) = 94577c27e9de9dd1c85d2e3ea4db5021ea7a6661f5615c2c91180104516b51b7
+SIZE (chromium-45.0.2454.85-testdata.tar.xz) = 115779592
diff --git a/www/chromium/files/chrome.in b/www/chromium/files/chrome.in
index 8039b3dc3c39..8ad218d8a6c5 100644
--- a/www/chromium/files/chrome.in
+++ b/www/chromium/files/chrome.in
@@ -15,4 +15,5 @@ $SYSCTL=1
 EOMSG
 	exit 1
 fi
+ulimit -c 0
 exec %%PREFIX%%/share/chromium/chrome $*
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index d0cd3d05c1e6..7a8df24e4655 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -1,5 +1,5 @@
---- base/allocator/allocator_extension.cc	2015-04-15 00:18:47.000000000 +0200
-+++ base/allocator/allocator_extension.cc	2015-04-18 21:44:25.000000000 +0200
+--- base/allocator/allocator_extension.cc   2015-04-15 00:18:47.000000000 +0200
++++ base/allocator/allocator_extension.cc   2015-04-18 21:44:25.000000000 +0200
 @@ -35,20 +35,20 @@
  void SetGetAllocatorWasteSizeFunction(
      thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) {
@@ -24,8 +24,8 @@
    thunks::SetReleaseFreeMemoryFunction(release_free_memory_function);
  }
  
---- base/strings/safe_sprintf_unittest.cc	2015-04-15 00:18:48.000000000 +0200
-+++ base/strings/safe_sprintf_unittest.cc	2015-04-18 22:08:45.000000000 +0200
+--- base/strings/safe_sprintf_unittest.cc   2015-04-15 00:18:48.000000000 +0200
++++ base/strings/safe_sprintf_unittest.cc   2015-04-18 22:08:45.000000000 +0200
 @@ -729,12 +729,14 @@
  #pragma GCC diagnostic push
  #pragma GCC diagnostic ignored "-Wconversion-null"
@@ -41,8 +41,8 @@
  #if defined(__GCC__)
  #pragma GCC diagnostic pop
  #endif
---- base/threading/thread_local_storage_unittest.cc	2015-04-15 00:18:48.000000000 +0200
-+++ base/threading/thread_local_storage_unittest.cc	2015-04-18 21:45:40.000000000 +0200
+--- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200
++++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200
 @@ -60,7 +60,7 @@
  void ThreadLocalStorageCleanup(void *value) {
    int *ptr = reinterpret_cast<int*>(value);
@@ -52,9 +52,9 @@
    if (*ptr == kFinalTlsValue)
      return;  // We've been called enough times.
    ASSERT_LT(kFinalTlsValue, *ptr);
---- base/tracked_objects.cc	2015-04-15 00:31:20.000000000 +0200
-+++ base/tracked_objects.cc	2015-04-18 21:57:33.000000000 +0200
-@@ -393,7 +393,7 @@
+--- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200
++++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200
+@@ -425,7 +425,7 @@
    }
    // We must NOT do any allocations during this callback.
    // Using the simple linked lists avoids all allocations.
@@ -63,8 +63,8 @@
    this->next_retired_worker_ = first_retired_worker_;
    first_retired_worker_ = this;
  }
---- base/tracked_objects_unittest.cc	2015-04-15 00:31:20.000000000 +0200
-+++ base/tracked_objects_unittest.cc	2015-04-18 22:01:28.000000000 +0200
+--- base/tracked_objects_unittest.cc.orig   2015-08-22 15:01:51.000000000 -0400
++++ base/tracked_objects_unittest.cc    2015-09-03 09:20:53.370191000 -0400
 @@ -58,9 +58,9 @@
      Births* birth = ThreadData::TallyABirthIfActive(location);
  
@@ -77,18 +77,27 @@
    }
  
    // Helper function to verify the most common test expectations.
-@@ -271,7 +271,7 @@
-   }
+@@ -240,7 +240,7 @@
+   ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
  
    scoped_ptr<DeathData> data(new DeathData());
 -  ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
 +  ASSERT_NE(data, static_cast<DeathData*>(NULL));
    EXPECT_EQ(data->run_duration_sum(), 0);
+   EXPECT_EQ(data->run_duration_max(), 0);
    EXPECT_EQ(data->run_duration_sample(), 0);
-   EXPECT_EQ(data->queue_duration_sum(), 0);
+@@ -279,7 +279,7 @@
+   ThreadData::InitializeAndSetTrackingStatus(ThreadData::PROFILING_ACTIVE);
+ 
+   scoped_ptr<DeathData> data(new DeathData());
+-  ASSERT_NE(data, reinterpret_cast<DeathData*>(NULL));
++  ASSERT_NE(data, static_cast<DeathData*>(NULL));
+ 
+   int32 run_ms = 42;
+   int32 queue_ms = 8;
 --- chrome/browser/sync/glue/synced_session_tracker.cc	2015-04-15 00:18:50.000000000 +0200
 +++ chrome/browser/sync/glue/synced_session_tracker.cc	2015-04-18 22:02:15.000000000 +0200
-@@ -260,7 +260,7 @@
+@@ -262,7 +262,7 @@
    }
    DCHECK(window_ptr);
    DCHECK_EQ(window_ptr->window_id.id(), window_id);
@@ -99,7 +108,7 @@
  }
 --- content/browser/frame_host/render_widget_host_view_guest.cc	2015-04-15 00:31:22.000000000 +0200
 +++ content/browser/frame_host/render_widget_host_view_guest.cc	2015-04-18 22:10:28.000000000 +0200
-@@ -241,11 +241,11 @@
+@@ -315,11 +315,11 @@
  
  gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
    if (!guest_)
@@ -126,7 +135,7 @@
          .Times(2);
 --- media/filters/decrypting_video_decoder_unittest.cc	2015-04-15 00:31:22.000000000 +0200
 +++ media/filters/decrypting_video_decoder_unittest.cc	2015-04-18 22:03:40.000000000 +0200
-@@ -420,7 +420,7 @@
+@@ -422,7 +422,7 @@
    // NULL callback to cancel the |decryptor_ready_cb|.
    EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce(
        ResetAndRunCallback(&decryptor_ready_cb,
@@ -135,8 +144,8 @@
                            base::Bind(&DecryptingVideoDecoderTest::DecryptorSet,
                                       base::Unretained(this))));
    EXPECT_CALL(*this, DecryptorSet(_)).Times(0);
---- third_party/hunspell_new/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
-+++ third_party/hunspell_new/src/hunspell/affentry.hxx  2015-07-21 18:48:02.034251000 -0400
+--- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400
++++ third_party/hunspell/src/hunspell/affentry.hxx  2015-07-21 18:48:02.034251000 -0400
 @@ -27,7 +27,7 @@
    struct hentry *      checkword(const char * word, int len, char in_compound, 
                              const FLAG needflag = FLAG_NULL);
@@ -213,9 +222,9 @@
  
    tasks_.erase(it, tasks_.end());
  
---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig  2015-07-21 18:53:32.511953000 -0400
-+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc   2015-07-21 18:54:56.010341000 -0400
-@@ -989,7 +989,7 @@
+--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig  2015-09-03 09:31:11.815462000 -0400
++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc   2015-09-03 09:31:50.974163000 -0400
+@@ -1028,7 +1028,7 @@
  
  const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
    FATAL() << "Not implemented yet.";
@@ -224,7 +233,7 @@
  }
  
  const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -1009,7 +1009,7 @@
+@@ -1048,7 +1048,7 @@
  
  const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
    FATAL() << "Not implemented yet.";
@@ -232,7 +241,7 @@
 +  return static_cast<const ReceiverInfo*>(NULL);
  }
  
- bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
+ bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { 
 --- v8/src/runtime/runtime-i18n.cc	2015-04-15 00:32:37.000000000 +0200
 +++ v8/src/runtime/runtime-i18n.cc	2015-04-18 22:06:17.000000000 +0200
 @@ -627,7 +627,7 @@
diff --git a/www/chromium/files/patch-base__process__process_posix.cc b/www/chromium/files/patch-base__process__process_posix.cc
index e8574e0e1dc1..3c121eeae7c1 100644
--- a/www/chromium/files/patch-base__process__process_posix.cc
+++ b/www/chromium/files/patch-base__process__process_posix.cc
@@ -1,6 +1,6 @@
---- base/process/process_posix.cc.orig	2015-05-20 21:26:57.068650000 -0400
-+++ base/process/process_posix.cc	2015-05-20 21:25:28.077153000 -0400
-@@ -17,6 +17,13 @@
+--- base/process/process_posix.cc.orig	2015-08-22 15:01:51.000000000 -0400
++++ base/process/process_posix.cc	2015-09-05 09:44:45.526291000 -0400
+@@ -17,8 +17,18 @@
  #include <sys/event.h>
  #endif
  
@@ -13,8 +13,13 @@
 +
  namespace {
  
++const int kBackgroundPriority = 5;
++const int kForegroundPriority = 0;
++
  #if !defined(OS_NACL_NONSFI)
-@@ -83,7 +90,7 @@
+ 
+ bool WaitpidWithTimeout(base::ProcessHandle handle,
+@@ -83,7 +93,7 @@
    return ret_pid > 0;
  }
  
@@ -23,7 +28,7 @@
  // Using kqueue on Mac so that we can wait on non-child processes.
  // We can't use kqueues on child processes because we need to reap
  // our own children using wait.
-@@ -180,7 +187,7 @@
+@@ -180,7 +190,7 @@
    base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
    base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
    if (parent_pid != our_pid) {
@@ -32,3 +37,52 @@
      // On Mac we can wait on non child processes.
      return WaitForSingleNonChildProcess(handle, timeout);
  #else
+@@ -255,13 +265,6 @@
+   return Process(handle);
+ }
+ 
+-#if !defined(OS_LINUX) && !defined(OS_MACOSX)
+-// static
+-bool Process::CanBackgroundProcesses() {
+-  return false;
+-}
+-#endif  // !defined(OS_LINUX) && !defined(OS_MACOSX)
+-
+ bool Process::IsValid() const {
+   return process_ != kNullProcessHandle;
+ }
+@@ -357,18 +360,27 @@
+ }
+ 
+ #if !defined(OS_LINUX) && !defined(OS_MACOSX)
++// static
++bool Process::CanBackgroundProcesses() {
++  return true;
++}
++
+ bool Process::IsProcessBackgrounded() const {
+-  // See SetProcessBackgrounded().
+   DCHECK(IsValid());
+-  return false;
++  return GetPriority() == kBackgroundPriority;
+ }
+ 
+ bool Process::SetProcessBackgrounded(bool value) {
+-  // Not implemented for POSIX systems other than Mac and Linux. With POSIX, if
+-  // we were to lower the process priority we wouldn't be able to raise it back
+-  // to its initial priority.
+-  NOTIMPLEMENTED();
+-  return false;
++  DCHECK(IsValid());
++
++  if (!CanBackgroundProcesses())
++    return false;
++
++  int priority = value ? kBackgroundPriority : kForegroundPriority;
++  int result   = setpriority(PRIO_PROCESS, process_, priority);
++
++  DPCHECK(result == 0);
++  return result == 0;
+ }
+ #endif  // !defined(OS_LINUX) && !defined(OS_MACOSX)
+ 
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index 0ec1e830436f..4874e7e9330f 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/www/chromium/files/patch-build__common.gypi
@@ -1,24 +1,15 @@
---- build/common.gypi.orig	2015-07-15 16:29:56.000000000 -0400
-+++ build/common.gypi	2015-07-22 18:47:32.413623000 -0400
-@@ -97,7 +97,7 @@
+--- build/common.gypi.orig	2015-09-01 16:10:41.000000000 -0400
++++ build/common.gypi	2015-09-03 09:38:09.528529000 -0400
+@@ -105,7 +105,7 @@
  
            'conditions': [
-             # ChromeOS and Windows use Aura and Ash.
--            ['chromeos==1 or OS=="win" or OS=="linux"', {
-+            ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', {
+             # Windows and Linux (including Chrome OS) use Aura and Ash.
+-            ['OS=="win" or OS=="linux"', {
++            ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
                'use_ash%': 1,
                'use_aura%': 1,
              }],
-@@ -676,7 +676,7 @@
-       # Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
-       'mac_views_browser%': 0,
- 
--      # By default, use ICU data file (icudtl.dat).
-+      # By default, use ICU data file (icudtl.dat)
-       'icu_use_data_file_flag%': 1,
- 
-       # Turn on JNI generation optimizations by default.
-@@ -697,6 +697,12 @@
+@@ -729,6 +729,12 @@
            'os_bsd%': 0,
          }],
  
@@ -31,7 +22,7 @@
          # NSS usage.
          ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
            'use_nss_certs%': 1,
-@@ -735,7 +741,7 @@
+@@ -767,7 +773,7 @@
          }],
  
          # DBus usage.
@@ -40,7 +31,7 @@
            'use_dbus%': 1,
          }, {
            'use_dbus%': 0,
-@@ -986,7 +992,7 @@
+@@ -997,7 +1003,7 @@
          }, {
            'use_openmax_dl_fft%': 0,
          }],
@@ -49,7 +40,7 @@
              'enable_mdns%' : 1,
          }],
  
-@@ -1248,6 +1254,10 @@
+@@ -1263,6 +1269,10 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
@@ -60,7 +51,7 @@
      # 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.
-@@ -4631,6 +4641,13 @@
+@@ -4698,6 +4708,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],
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 05e9ba07f3a1..95d34ef435d3 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	2015-04-18 22:54:06.000000000 +0200
-+++ chrome/browser/chrome_content_browser_client.cc	2015-04-18 22:58:13.000000000 +0200
-@@ -446,7 +446,7 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig	2015-09-01 16:10:41.000000000 -0400
++++ chrome/browser/chrome_content_browser_client.cc	2015-09-03 09:43:02.602298000 -0400
+@@ -444,7 +444,7 @@
    return false;
  }
  
@@ -9,16 +9,16 @@
  breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
      const std::string& process_type) {
    base::FilePath dumps_path;
-@@ -503,7 +503,7 @@
+@@ -501,7 +501,7 @@
  
    return -1;
  }
 -#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 +#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
  
- #if !defined(OS_CHROMEOS)
- GURL GetEffectiveURLForSignin(const GURL& url) {
-@@ -1295,7 +1295,7 @@
+ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+@@ -1246,7 +1246,7 @@
      command_line->AppendSwitchASCII(switches::kMetricsClientID,
                                      client_info->client_id);
    }
@@ -27,21 +27,12 @@
    if (breakpad::IsCrashReporterEnabled()) {
      scoped_ptr<metrics::ClientInfo> client_info =
          GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2409,7 +2409,7 @@
-   }
+@@ -2332,7 +2332,7 @@
+   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
+   DCHECK(!app_data_path.empty());
  }
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -2494,7 +2494,7 @@
-   }
- #endif  // defined(OS_ANDROID)
- }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- #if defined(OS_WIN)
- const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
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 541d3a7d2d55..bbcc0353abed 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,11 +1,11 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2015-01-21 20:28:15 UTC
-+++ chrome/browser/chrome_content_browser_client.h
-@@ -262,7 +262,7 @@
-   net::CookieStore* OverrideCookieStoreForRenderProcess(
-       int render_process_id) override;
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+--- chrome/browser/chrome_content_browser_client.h.orig	2015-09-03 09:44:27.080480000 -0400
++++ chrome/browser/chrome_content_browser_client.h	2015-09-03 09:44:46.151235000 -0400
+@@ -253,7 +253,7 @@
+       int child_process_id,
+       content::FileDescriptorInfo* mappings,
+       std::map<int, base::MemoryMappedFile::Region>* regions) override;
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
    void GetAdditionalMappedFilesForChildProcess(
        const base::CommandLine& command_line,
        int child_process_id,
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc
deleted file mode 100644
index de6ed315e11d..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2015-08-02 00:29:44.653703000 -0400
-+++ chrome/browser/extensions/api/tabs/tabs_api.cc	2015-08-02 00:32:45.945039000 -0400
-@@ -659,7 +659,7 @@
- 
-   WindowController* controller = new_window->extension_window_controller();
- 
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   // On Desktop Linux, window managers may ignore hints until the X11 window is
-   // mapped, which happens in the blocking call to Show() above.
-   // DesktopWindowTreeHostX11 currently only checks for an attempt to maximize
-@@ -669,7 +669,7 @@
-   if (create_params.initial_show_state == ui::SHOW_STATE_MINIMIZED)
-     new_window->window()->Minimize();
- #endif
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
-+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
-   // On Desktop Linux and Windows, managers don't handle fullscreen state to
-   // create window for now.
-   if (create_params.initial_show_state == ui::SHOW_STATE_FULLSCREEN)
diff --git a/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc b/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc
new file mode 100644
index 000000000000..9a66382f0a29
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc
@@ -0,0 +1,18 @@
+--- chrome/browser/memory/system_memory_stats_recorder_linux.cc.orig	2015-09-03 20:30:21.188785000 -0400
++++ chrome/browser/memory/system_memory_stats_recorder_linux.cc	2015-09-03 20:25:00.522580000 -0400
+@@ -29,6 +29,7 @@
+   UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
+ 
+ void RecordMemoryStats(RecordMemoryStatsType type) {
++#if !defined(OS_FREEBSD)
+   base::SystemMemoryInfoKB memory;
+   if (!base::GetSystemMemoryInfo(&memory))
+     return;
+@@ -92,6 +93,7 @@
+       break;
+     }
+   }
++#endif // !defined(OS_FREEBSD)
+ }
+ 
+ }  // namespace memory
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 56c0f243045a..0b9f8ab4c155 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	2015-04-19 00:16:05.000000000 +0200
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2015-04-19 00:17:03.000000000 +0200
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2015-08-22 15:01:53.000000000 -0400
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2015-09-03 10:01:52.619879000 -0400
 @@ -13,7 +13,7 @@
  #include "ppapi/proxy/ppapi_messages.h"
  #include "ppapi/proxy/serialized_structs.h"
@@ -16,7 +16,7 @@
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
    fd_.reset(content::MatchFontWithFallback(
-       description.face.c_str(),
+       description.face,
        description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
        description.italic,
        charset,
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 2d2ca7be88eb..ae79225861c8 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	2015-05-13 18:23:06.000000000 -0400
-+++ content/browser/child_process_launcher.cc	2015-05-20 11:55:38.781168000 -0400
-@@ -111,7 +111,11 @@
+--- content/browser/child_process_launcher.cc.orig	2015-09-01 16:10:42.000000000 -0400
++++ content/browser/child_process_launcher.cc	2015-09-03 10:33:53.388547000 -0400
+@@ -114,7 +114,11 @@
    base::EnvironmentMap env = delegate->GetEnvironment();
    base::ScopedFD ipcfd = delegate->TakeIpcFd();
  #elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ -12,16 +12,33 @@
    base::EnvironmentMap env = delegate->GetEnvironment();
    base::ScopedFD ipcfd = delegate->TakeIpcFd();
  #endif
-@@ -157,7 +161,7 @@
+@@ -143,7 +147,7 @@
+ #endif
+ #endif
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   std::map<int, base::MemoryMappedFile::Region> regions;
+   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
+       *cmd_line, child_process_id, files_to_register.get()
+@@ -176,7 +180,7 @@
+     }
+   }
+ #endif  // defined(V8_USE_EXTERNAL_STARTUP_DATA)
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ #if defined(OS_ANDROID)
+   files_to_register->Share(
+@@ -196,21 +200,21 @@
    // We need to close the client end of the IPC channel to reliably detect
    // child termination.
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-       *cmd_line, child_process_id, files_to_register.get());
    if (use_zygote) {
-@@ -166,14 +170,14 @@
+     base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
+         cmd_line->argv(), files_to_register.Pass(), process_type);
      process = base::Process(handle);
    } else
    // Fall through to the normal posix case below when we're not zygoting.
@@ -38,7 +55,7 @@
      if (process_type == switches::kRendererProcess) {
        const int sandbox_fd =
            RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -181,7 +185,7 @@
+@@ -218,7 +222,7 @@
            sandbox_fd,
            GetSandboxFD()));
      }
@@ -47,7 +64,7 @@
  
      // Actually launch the app.
      base::LaunchOptions options;
-@@ -254,13 +258,13 @@
+@@ -294,13 +298,13 @@
    process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -63,7 +80,7 @@
    base::EnsureProcessTerminated(process.Pass());
  #endif  // OS_POSIX
  #endif  // defined(OS_ANDROID)
-@@ -351,7 +355,7 @@
+@@ -399,7 +403,7 @@
  
  void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
    DCHECK(CalledOnValidThread());
@@ -72,7 +89,7 @@
    if (zygote_) {
      termination_status_ = ZygoteHostImpl::GetInstance()->
          GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -359,7 +363,7 @@
+@@ -407,7 +411,7 @@
      termination_status_ =
          base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
    } else {
@@ -81,7 +98,7 @@
    if (known_dead) {
      termination_status_ =
          base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
-@@ -433,7 +437,7 @@
+@@ -481,7 +485,7 @@
    starting_ = false;
    process_ = process.Pass();
  
diff --git a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc b/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
deleted file mode 100644
index 111ea4107a17..000000000000
--- a/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- content/renderer/accessibility/blink_ax_tree_source.cc.orig	2014-10-10 09:15:31 UTC
-+++ content/renderer/accessibility/blink_ax_tree_source.cc
-@@ -470,13 +470,15 @@
-     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width());
-     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height());
- 
--    const gfx::Size& min_offset = document.minimumScrollOffset();
--    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width());
--    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height());
-+    // Prefix {min|max}_offset with '_' to avoid collision with
-+    // FreeBSD namespace
-+    const gfx::Size& _min_offset = document.minimumScrollOffset();
-+    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width());
-+    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height());
- 
--    const gfx::Size& max_offset = document.maximumScrollOffset();
--    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width());
--    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height());
-+    const gfx::Size& _max_offset = document.maximumScrollOffset();
-+    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width());
-+    dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height());
- 
-     if (node_to_frame_routing_id_map_ && !src.equals(GetRoot())) {
-       WebLocalFrame* frame = document.frame();
diff --git a/www/chromium/files/patch-content__renderer__render_thread_impl.cc b/www/chromium/files/patch-content__renderer__render_thread_impl.cc
index 323a89fe7472..612dfeb48714 100644
--- a/www/chromium/files/patch-content__renderer__render_thread_impl.cc
+++ b/www/chromium/files/patch-content__renderer__render_thread_impl.cc
@@ -1,11 +1,11 @@
---- content/renderer/render_thread_impl.cc.orig	2015-05-13 18:35:46.000000000 -0400
-+++ content/renderer/render_thread_impl.cc	    2015-05-20 15:46:14.175833000 -0400
-@@ -673,7 +673,7 @@
-                   static_cast<unsigned>(compositor_raster_threads_.size() + 1))
-                   .c_str()));
-       raster_thread->Start();
+--- content/renderer/render_thread_impl.cc.orig	2015-09-01 16:10:42.000000000 -0400
++++ content/renderer/render_thread_impl.cc	2015-09-03 10:37:57.364787000 -0400
+@@ -768,7 +768,7 @@
+   is_gather_pixel_refs_enabled_ = num_raster_threads > 1;
+ 
+   base::SimpleThread::Options thread_options;
 -#if defined(OS_ANDROID) || defined(OS_LINUX)
 +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-       if (!command_line.HasSwitch(
-               switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
-         raster_thread->SetThreadPriority(base::ThreadPriority::BACKGROUND);
+   if (!command_line.HasSwitch(
+           switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
+     thread_options.set_priority(base::ThreadPriority::BACKGROUND);
diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.cc b/www/chromium/files/patch-device__usb__usb_service_impl.cc
index b36f44e90004..f3333dc003e2 100644
--- a/www/chromium/files/patch-device__usb__usb_service_impl.cc
+++ b/www/chromium/files/patch-device__usb__usb_service_impl.cc
@@ -1,8 +1,8 @@
---- device/usb/usb_service_impl.cc.orig	2015-07-15 16:30:04.000000000 -0400
-+++ device/usb/usb_service_impl.cc	2015-07-22 20:14:21.946835000 -0400
-@@ -17,7 +17,11 @@
- #include "base/thread_task_runner_handle.h"
+--- device/usb/usb_service_impl.cc.orig	2015-09-01 16:10:43.000000000 -0400
++++ device/usb/usb_service_impl.cc	2015-09-03 10:41:26.551811000 -0400
+@@ -19,7 +19,11 @@
  #include "components/device_event_log/device_event_log.h"
+ #include "device/usb/usb_device_handle.h"
  #include "device/usb/usb_error.h"
 +#if defined(OS_FREEBSD)
 +#include "libusb.h"
@@ -12,7 +12,7 @@
  
  #if defined(OS_WIN)
  #include <setupapi.h>
-@@ -294,6 +298,7 @@
+@@ -373,6 +377,7 @@
        weak_factory_(this) {
    base::MessageLoop::current()->AddDestructionObserver(this);
  
@@ -20,25 +20,25 @@
    int rv = libusb_hotplug_register_callback(
        context_->context(),
        static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -321,14 +326,16 @@
-     }
- #endif  // OS_WIN
+@@ -391,14 +396,17 @@
+     device_observer_.Add(device_monitor);
    }
-+#endif // !OS_FREEBSD
+ #endif  // OS_WIN
++#endif  // OS_FREEBSD
  }
  
  UsbServiceImpl::~UsbServiceImpl() {
    base::MessageLoop::current()->RemoveDestructionObserver(this);
--
+ 
 +#if !defined(OS_FREEBSD)
    if (hotplug_enabled_) {
      libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
    }
-+#endif // !OS_FREEBSD
++#endif  // OS_FREEBSD
    for (const auto& map_entry : devices_) {
      map_entry.second->OnDisconnect();
    }
-@@ -566,6 +573,7 @@
+@@ -630,6 +638,7 @@
    device->OnDisconnect();
  }
  
@@ -46,7 +46,7 @@
  // static
  int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
                                                  PlatformUsbDevice device,
-@@ -603,6 +611,7 @@
+@@ -667,6 +676,7 @@
  
    return 0;
  }
diff --git a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc b/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc
deleted file mode 100644
index 4ddfe73d775c..000000000000
--- a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_egl.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc.orig	2015-05-13 18:35:46.000000000 -0400
-+++ gpu/command_buffer/service/async_pixel_transfer_manager_egl.cc	2015-05-20 15:58:33.229171000 -0400
-@@ -89,7 +89,7 @@
-  public:
-   TransferThread() : base::Thread(kAsyncTransferThreadName) {
-     Start();
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     SetPriority(base::ThreadPriority::BACKGROUND);
- #endif
-   }
-@@ -465,14 +465,14 @@
- 
- void AsyncPixelTransferDelegateEGL::WaitForTransferCompletion() {
-   if (state_->TransferIsInProgress()) {
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::DISPLAY);
- #endif
- 
-     state_->WaitForTransferCompletion();
-     DCHECK(!state_->TransferIsInProgress());
- 
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     g_transfer_thread.Pointer()->SetPriority(base::ThreadPriority::BACKGROUND);
- #endif
-   }
diff --git a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc b/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
index 4565850b50c8..2c19b3693b91 100644
--- a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
+++ b/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig	2015-05-13 18:35:46.000000000 -0400
-+++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc	2015-05-20 16:00:07.466335000 -0400
-@@ -46,7 +46,7 @@
+--- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig	2015-09-01 16:10:43.000000000 -0400
++++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc	2015-09-03 10:44:42.860094000 -0400
+@@ -48,7 +48,7 @@
        : base::Thread(kAsyncTransferThreadName),
          initialized_(false) {
-     Start();
+     base::Thread::Options options;
 -#if defined(OS_ANDROID) || defined(OS_LINUX)
 +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-     SetPriority(base::ThreadPriority::BACKGROUND);
+     options.priority = base::ThreadPriority::BACKGROUND;
  #endif
-   }
+     StartWithOptions(options);
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.cc b/www/chromium/files/patch-net__base__address_tracker_linux.cc
index cdbbf220b382..24ea66736bd6 100644
--- a/www/chromium/files/patch-net__base__address_tracker_linux.cc
+++ b/www/chromium/files/patch-net__base__address_tracker_linux.cc
@@ -1,5 +1,5 @@
---- net/base/address_tracker_linux.cc.orig	2015-04-19 20:31:08.000000000 +0200
-+++ net/base/address_tracker_linux.cc	2015-04-19 20:36:27.000000000 +0200
+--- net/base/address_tracker_linux.cc.orig	2015-08-22 15:01:56.000000000 -0400
++++ net/base/address_tracker_linux.cc	2015-09-03 10:45:50.411703000 -0400
 @@ -5,7 +5,9 @@
  #include "net/base/address_tracker_linux.h"
  
@@ -10,7 +10,7 @@
  #include <sys/ioctl.h>
  
  #include "base/files/scoped_file.h"
-@@ -24,6 +26,7 @@
+@@ -39,6 +41,7 @@
  bool GetAddress(const struct nlmsghdr* header,
                  IPAddressNumber* out,
                  bool* really_deprecated) {
@@ -18,7 +18,7 @@
    if (really_deprecated)
      *really_deprecated = false;
    const struct ifaddrmsg* msg =
-@@ -76,6 +79,9 @@
+@@ -91,6 +94,9 @@
      return false;
    out->assign(address, address + address_length);
    return true;
@@ -28,7 +28,7 @@
  }
  
  }  // namespace
-@@ -128,6 +134,7 @@
+@@ -146,6 +152,7 @@
  }
  
  void AddressTrackerLinux::Init() {
@@ -36,7 +36,7 @@
    netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
    if (netlink_fd_ < 0) {
      PLOG(ERROR) << "Could not create NETLINK socket";
-@@ -215,6 +222,10 @@
+@@ -233,6 +240,10 @@
        return;
      }
    }
@@ -47,7 +47,7 @@
  }
  
  void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -250,6 +261,7 @@
+@@ -277,6 +288,7 @@
  void AddressTrackerLinux::ReadMessages(bool* address_changed,
                                         bool* link_changed,
                                         bool* tunnel_changed) {
@@ -55,7 +55,7 @@
    *address_changed = false;
    *link_changed = false;
    *tunnel_changed = false;
-@@ -276,6 +288,7 @@
+@@ -303,6 +315,7 @@
    }
    if (*link_changed || *address_changed)
      UpdateCurrentConnectionType();
@@ -63,7 +63,7 @@
  }
  
  void AddressTrackerLinux::HandleMessage(char* buffer,
-@@ -283,6 +296,7 @@
+@@ -310,6 +323,7 @@
                                          bool* address_changed,
                                          bool* link_changed,
                                          bool* tunnel_changed) {
@@ -71,7 +71,7 @@
    DCHECK(buffer);
    for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
         NLMSG_OK(header, length);
-@@ -365,6 +379,7 @@
+@@ -406,6 +420,7 @@
          break;
      }
    }
@@ -79,7 +79,7 @@
  }
  
  void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
-@@ -391,8 +406,12 @@
+@@ -432,8 +447,12 @@
  
  bool AddressTrackerLinux::IsTunnelInterface(int interface_index) const {
    // Linux kernel drivers/net/tun.c uses "tun" name prefix.
diff --git a/www/chromium/files/patch-net__base__net_util_posix.cc b/www/chromium/files/patch-net__base__net_util_posix.cc
deleted file mode 100644
index 0ed2c8d4fa87..000000000000
--- a/www/chromium/files/patch-net__base__net_util_posix.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- net/base/net_util_posix.cc.orig	2015-04-19 16:44:32.000000000 +0200
-+++ net/base/net_util_posix.cc	2015-04-19 16:45:29.000000000 +0200
-@@ -20,6 +20,7 @@
- #if !defined(OS_NACL)
- namespace internal {
- 
-+#if !defined(OS_BSD)
- // The application layer can pass |policy| defined in net_util.h to
- // request filtering out certain type of interfaces.
- bool ShouldIgnoreInterface(const std::string& name, int policy) {
-@@ -56,6 +57,7 @@
-   }
-   return false;
- }
-+#endif
- 
- }  // namespace internal
- #else   // OS_NACL
diff --git a/www/chromium/files/patch-net__base__net_util_linux.cc b/www/chromium/files/patch-net__base__network_interfaces_linux.cc
index bc26597cc497..aa14bd834c5c 100644
--- a/www/chromium/files/patch-net__base__net_util_linux.cc
+++ b/www/chromium/files/patch-net__base__network_interfaces_linux.cc
@@ -1,8 +1,8 @@
---- net/base/net_util_linux.cc.orig	2015-04-19 19:54:25.000000000 +0200
-+++ net/base/net_util_linux.cc	2015-04-20 20:26:41.000000000 +0200
+--- net/base/network_interfaces_linux.cc.orig	2015-09-03 11:01:37.625073000 -0400
++++ net/base/network_interfaces_linux.cc	2015-09-03 11:00:13.970733000 -0400
 @@ -4,12 +4,14 @@
  
- #include "net/base/net_util_linux.h"
+ #include "net/base/network_interfaces_linux.h"
  
 +#if !defined(OS_FREEBSD)
  #if !defined(OS_ANDROID)
@@ -11,11 +11,11 @@
  #include <linux/if.h>
  #include <linux/sockios.h>
  #include <linux/wireless.h>
-+#endif // !defined(OS_FREEBSD)
++#endif  // !defined(OS_FREEBSD)
  #include <set>
  #include <sys/ioctl.h>
  #include <sys/types.h>
-@@ -44,6 +46,7 @@
+@@ -45,6 +47,7 @@
    // are still progressing through duplicated address detection (DAD)
    // and shouldn't be used by the application layer until DAD process
    // is completed.
@@ -23,18 +23,18 @@
    if (native_attributes & (
  #if !defined(OS_ANDROID)
                                IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
-@@ -61,6 +64,10 @@
+@@ -62,6 +65,10 @@
    }
  
    return true;
 +#else
 +  // the flags tested above are not present on FreeBSD
 +  return false;
-+#endif // !OS_FREEBSD
++#endif  // !OS_FREEBSD
  }
  
  }  // namespace
-@@ -83,13 +90,15 @@
+@@ -80,13 +87,15 @@
    if (!s.is_valid())
      return NetworkChangeNotifier::CONNECTION_UNKNOWN;
  
@@ -44,14 +44,14 @@
    strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
    if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1)
      return NetworkChangeNotifier::CONNECTION_WIFI;
-+#endif // !defined(OS_FREEBSD)
++#endif  // !defined(OS_FREEBSD)
  
 -#if !defined(OS_ANDROID)
 +#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
    // Test ethtool for CONNECTION_ETHERNET
    struct ethtool_cmd ecmd = {};
    ecmd.cmd = ETHTOOL_GSET;
-@@ -98,12 +107,13 @@
+@@ -95,12 +104,13 @@
    strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
    if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
      return NetworkChangeNotifier::CONNECTION_ETHERNET;
@@ -66,7 +66,7 @@
    base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
    if (!ioctl_socket.is_valid())
      return "";
-@@ -115,9 +125,11 @@
+@@ -112,9 +122,11 @@
    wreq.u.essid.length = IW_ESSID_MAX_SIZE;
    if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
      return ssid;
@@ -78,15 +78,15 @@
  bool GetNetworkListImpl(
      NetworkInterfaceList* networks,
      int policy,
-@@ -186,6 +198,7 @@
+@@ -183,6 +195,7 @@
  
    return true;
  }
-+#endif // !defined(OS_FREEBSD)
++#endif  // !defined(OS_FREEBSD)
  
  std::string GetWifiSSIDFromInterfaceListInternal(
      const NetworkInterfaceList& interfaces,
-@@ -210,12 +223,16 @@
+@@ -207,12 +220,16 @@
    if (networks == NULL)
      return false;
  
diff --git a/www/chromium/files/patch-net__base__network_interfaces_posix.cc b/www/chromium/files/patch-net__base__network_interfaces_posix.cc
new file mode 100644
index 000000000000..b6e942e4e9bd
--- /dev/null
+++ b/www/chromium/files/patch-net__base__network_interfaces_posix.cc
@@ -0,0 +1,18 @@
+--- net/base/network_interfaces_posix.cc.orig	2015-09-03 11:04:58.534429000 -0400
++++ net/base/network_interfaces_posix.cc	2015-09-03 11:07:05.587031000 -0400
+@@ -20,6 +20,7 @@
+ #if !defined(OS_NACL)
+ namespace internal {
+ 
++#if !defined(OS_BSD)
+ // The application layer can pass |policy| defined in net_util.h to
+ // request filtering out certain type of interfaces.
+ bool ShouldIgnoreInterface(const std::string& name, int policy) {
+@@ -33,6 +34,7 @@
+ 
+   return false;
+ }
++#endif
+ 
+ // Check if the address is unspecified (i.e. made of zeroes) or loopback.
+ bool IsLoopbackOrUnspecifiedAddress(const sockaddr* addr) {
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
deleted file mode 100644
index 5b8abaa5ea06..000000000000
--- a/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- net/socket/tcp_listen_socket_unittest.h.orig	2014-10-10 09:15:31 UTC
-+++ net/socket/tcp_listen_socket_unittest.h
-@@ -13,6 +13,9 @@
- #include <arpa/inet.h>
- #include <errno.h>
- #include <sys/socket.h>
-+#if defined(OS_BSD)
-+#include <netinet/in.h>
-+#endif
- #endif
- 
- #include "base/basictypes.h"
diff --git a/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp b/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
index 85b2a92ff80a..1d5f1535dfee 100644
--- a/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
+++ b/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
@@ -1,20 +1,20 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2015-04-20 19:38:21.000000000 +0200
-+++ skia/ext/SkMemory_new_handler.cpp	2015-04-20 19:38:39.000000000 +0200
-@@ -53,7 +53,7 @@
- static void* sk_malloc_nothrow(size_t size) {
+--- skia/ext/SkMemory_new_handler.cpp.orig	2015-08-22 15:01:57.000000000 -0400
++++ skia/ext/SkMemory_new_handler.cpp	2015-09-03 11:11:25.462063000 -0400
+@@ -62,7 +62,7 @@
      // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
      // doesn't work as intended everywhere.
+     void* result;
 -#if  defined(OS_IOS)
 +#if  defined(OS_IOS) || defined(OS_FREEBSD)
-     return malloc(size);
+     result = malloc(size);
  #else
-     void* result;
-@@ -77,7 +77,7 @@
- void* sk_calloc(size_t size) {
+     // It's the responsibility of the caller to check the return value.
+@@ -89,7 +89,7 @@
      // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
      // doesn't work as intended everywhere.
+     void* result;
 -#if  defined(OS_IOS)
 +#if  defined(OS_IOS) || defined(OS_FREEBSD)
-     return calloc(1, size);
+     result = calloc(1, size);
  #else
-     void* result;
+     // It's the responsibility of the caller to check the return value.
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 6266a07e35cc..ad50caaf9eff 100644
--- a/www/chromium/files/patch-sync__util__get_session_name.cc
+++ b/www/chromium/files/patch-sync__util__get_session_name.cc
@@ -1,18 +1,18 @@
---- sync/util/get_session_name.cc.orig	2014-10-10 08:54:17 UTC
-+++ sync/util/get_session_name.cc
-@@ -12,7 +12,7 @@
- #include "base/sys_info.h"
- #include "base/task_runner.h"
+--- sync/util/get_session_name.cc.orig	2015-08-22 15:01:57.000000000 -0400
++++ sync/util/get_session_name.cc	2015-09-03 11:15:14.369871000 -0400
+@@ -14,7 +14,7 @@
  
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/system/devicetype.h"
+-#elif defined(OS_LINUX)
++#elif (defined(OS_LINUX) || defined(OS_BSD))
  #include "sync/util/get_session_name_linux.h"
  #elif defined(OS_IOS)
  #include "sync/util/get_session_name_ios.h"
-@@ -37,7 +37,7 @@
-   // like "stumpy-signed-mp-v2keys" etc. The information can be checked on
-   // "CHROMEOS_RELEASE_BOARD" line in chrome://system.
-   session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook";
+@@ -50,7 +50,7 @@
+       session_name = "Chromebook";
+       break;
+   }
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    session_name = internal::GetHostname();
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 b7bcb5d6738a..a808e6f817a4 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,5 +1,5 @@
---- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2015-01-21 20:48:07 UTC
-+++ third_party/WebKit/Source/platform/blink_platform.gyp
+--- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2015-09-01 16:10:53.000000000 -0400
++++ third_party/WebKit/Source/platform/blink_platform.gyp	2015-09-03 11:17:44.822976000 -0400
 @@ -38,6 +38,9 @@
    'targets': [{
      'target_name': 'blink_common',
@@ -10,16 +10,16 @@
      'variables': { 'enable_wexit_time_destructors': 1 },
      'dependencies': [
        '../config.gyp:config',
-@@ -248,7 +251,7 @@
-     # compiler optimizations, see crbug.com/237063
-     'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
-     'conditions': [
+@@ -251,7 +254,7 @@
+           ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'],
+         ],
+       }],
 -      ['OS=="linux" or OS=="android" or OS=="win"', {
 +      ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', {
          'sources/': [
            # Cherry-pick files excluded by the broader regular expressions above.
            ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
-@@ -259,7 +262,7 @@
+@@ -262,7 +265,7 @@
          ],
        },
        ],
@@ -28,7 +28,7 @@
          'sources/': [
            ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
          ]
-@@ -350,7 +353,7 @@
+@@ -345,7 +348,7 @@
            ['exclude', 'scroll/ScrollbarThemeMac'],
          ],
        }],
@@ -37,7 +37,7 @@
          'sources/': [
            ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
          ],
-@@ -395,7 +398,7 @@
+@@ -388,7 +391,7 @@
            ['exclude', 'Android\\.cpp$'],
          ],
        }],
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 5c2491da2c6b..b60be0446f1f 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,6 +1,6 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2014-10-10 09:34:38 UTC
-+++ third_party/WebKit/Source/wtf/ByteSwap.h
-@@ -52,14 +52,20 @@
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2015-08-22 15:03:03.000000000 -0400
++++ third_party/WebKit/Source/wtf/ByteSwap.h	2015-09-03 11:19:52.852584000 -0400
+@@ -52,9 +52,15 @@
  
  #else
  
@@ -10,13 +10,8 @@
 +#ifndef bswap32
  ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
 +#endif
- // GCC 4.6 lacks __builtin_bswap16. Newer versions have it but we support 4.6.
 +#ifndef bswap16
- #if COMPILER(CLANG)
  ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
- #else
- inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); }
- #endif
 +#endif
  
  #endif
diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
new file mode 100644
index 000000000000..af8bcd0933cd
--- /dev/null
+++ b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
@@ -0,0 +1,38 @@
+--- third_party/ffmpeg/ffmpeg_generated.gypi.orig	2015-09-04 18:08:57.318433000 -0400
++++ third_party/ffmpeg/ffmpeg_generated.gypi	2015-09-08 12:00:45.690486000 -0400
+@@ -138,7 +138,7 @@
+           'libavcodec/x86/flacdsp.asm',
+         ],
+       }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
++      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/x86/dct_init.c',
+           'libavcodec/x86/h264_qpel.c',
+@@ -301,7 +301,7 @@
+           'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S',
+         ],
+       }],  # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1)
+-      ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win")', {
++      ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win") or (os_bsd==1)', {
+         'c_sources': [
+           'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c',
+           'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
+@@ -376,7 +376,7 @@
+           'libavutil/arm/float_dsp_vfp.S',
+         ],
+       }],  # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")
+-      ['(OS == "linux" and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
++      ['((OS == "linux" or os_bsd==1) and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/cabac.c',
+           'libavcodec/h264.c',
+@@ -437,7 +437,7 @@
+           'libavformat/rawdec.c',
+         ],
+       }],  # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")
+-      ['(OS == "linux") or (OS == "mac") or (OS == "win")', {
++      ['(OS == "linux") or (OS == "mac") or (OS == "win") or (os_bsd==1)', {
+         'c_sources': [
+           'libavcodec/h264pred.c',
+           'libavcodec/hpeldsp.c',
diff --git a/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc b/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc
new file mode 100644
index 000000000000..5feabb42f00b
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc
@@ -0,0 +1,42 @@
+--- third_party/webrtc/base/platform_thread.cc.orig	2015-09-03 11:23:10.962030000 -0400
++++ third_party/webrtc/base/platform_thread.cc	2015-09-03 11:36:53.569521000 -0400
+@@ -14,11 +14,18 @@
+ 
+ #include "webrtc/base/checks.h"
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
+ #endif
+ 
++#if defined(WEBRTC_BSD)
++#include <pthread.h>
++#include <pthread_np.h>
++#include <sys/syscall.h>
++#include <sys/thr.h>
++#endif
++
+ namespace rtc {
+ 
+ PlatformThreadId CurrentThreadId() {
+@@ -28,6 +35,8 @@
+ #elif defined(WEBRTC_POSIX)
+ #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   ret = pthread_mach_thread_np(pthread_self());
++#elif defined(WEBRTC_BSD)
++  ret = static_cast<int>(pthread_getthreadid_np());
+ #elif defined(WEBRTC_LINUX)
+   ret =  syscall(__NR_gettid);
+ #elif defined(WEBRTC_ANDROID)
+@@ -72,7 +81,9 @@
+                      reinterpret_cast<ULONG_PTR*>(&threadname_info));
+   } __except (EXCEPTION_EXECUTE_HANDLER) {
+   }
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#elif defined(WEBRTC_BSD)
++  pthread_set_name_np(pthread_self(), name);
++#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
+   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   pthread_setname_np(name);
diff --git a/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc b/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc
deleted file mode 100644
index 3e738bbf3a81..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- third_party/webrtc/base/thread_checker_impl.cc.orig	2015-04-19 18:30:59.000000000 +0200
-+++ third_party/webrtc/base/thread_checker_impl.cc	2015-04-19 18:51:43.000000000 +0200
-@@ -14,10 +14,15 @@
- 
- #include "webrtc/base/checks.h"
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
- #include <sys/syscall.h>
- #endif
- 
-+#if defined(WEBRTC_BSD)
-+#include <pthread_np.h>
-+#include <sys/thr.h>
-+#endif
-+
- namespace rtc {
- 
- PlatformThreadId CurrentThreadId() {
-@@ -27,6 +32,8 @@
- #elif defined(WEBRTC_POSIX)
- #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   ret = pthread_mach_thread_np(pthread_self());
-+#elif defined(WEBRTC_BSD)
-+  ret = static_cast<int>(pthread_getthreadid_np());
- #elif defined(WEBRTC_LINUX)
-   ret =  syscall(__NR_gettid);
- #elif defined(WEBRTC_ANDROID)
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 8b8239203124..f40b544d6c8b 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,24 +1,12 @@
---- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2015-04-19 17:26:21.000000000 +0200
-+++ third_party/webrtc/system_wrappers/source/thread_posix.cc	2015-04-19 19:08:15.000000000 +0200
-@@ -15,9 +15,11 @@
+--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig	2015-08-22 15:03:58.000000000 -0400
++++ third_party/webrtc/system_wrappers/source/thread_posix.cc	2015-09-03 11:27:39.172029000 -0400
+@@ -15,7 +15,9 @@
  #include <errno.h>
  #include <unistd.h>
  #ifdef WEBRTC_LINUX
 +#if !defined(WEBRTC_BSD)
  #include <linux/unistd.h>
--#include <sched.h>
- #include <sys/prctl.h>
 +#endif
-+#include <sched.h>
- #include <sys/syscall.h>
+ #include <sched.h>
  #include <sys/types.h>
  #endif
-@@ -138,7 +140,7 @@
-   if (!name_.empty()) {
-     // Setting the thread name may fail (harmlessly) if running inside a
-     // sandbox. Ignore failures if they happen.
--#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
-     prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name_.c_str()));
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-     pthread_setname_np(name_.substr(0, 63).c_str());
diff --git a/www/chromium/files/patch-ui__base__ime__input_method_factory.cc b/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
index 2e49715b2013..11c35f8bdc11 100644
--- a/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
+++ b/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
@@ -1,20 +1,20 @@
---- ui/base/ime/input_method_factory.cc.orig	2015-04-19 17:31:55.000000000 +0200
-+++ ui/base/ime/input_method_factory.cc	2015-04-19 17:33:24.000000000 +0200
-@@ -14,7 +14,7 @@
- #include "ui/base/ime/remote_input_method_win.h"
+--- ui/base/ime/input_method_factory.cc.orig	2015-08-22 15:01:59.000000000 -0400
++++ ui/base/ime/input_method_factory.cc	2015-09-03 11:38:57.103095000 -0400
+@@ -15,7 +15,7 @@
  #elif defined(OS_MACOSX)
  #include "ui/base/ime/input_method_mac.h"
--#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
+-      !defined(OS_CHROMEOS)
++      !defined(OS_CHROMEOS) || defined(OS_BSD)
  #include "ui/base/ime/input_method_auralinux.h"
  #else
  #include "ui/base/ime/input_method_minimal.h"
-@@ -47,7 +47,7 @@
-   return make_scoped_ptr(new InputMethodWin(delegate, widget));
+@@ -57,7 +57,7 @@
  #elif defined(OS_MACOSX)
    return make_scoped_ptr(new InputMethodMac(delegate));
--#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
+-      !defined(OS_CHROMEOS)
++      !defined(OS_CHROMEOS) || defined(OS_BSD)
    return make_scoped_ptr(new InputMethodAuraLinux(delegate));
  #else
    return make_scoped_ptr(new InputMethodMinimal(delegate));
diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc
index 9554879f52a3..edad3e83bbc5 100644
--- a/www/chromium/files/patch-ui__views__views_delegate.cc
+++ b/www/chromium/files/patch-ui__views__views_delegate.cc
@@ -1,20 +1,11 @@
---- ui/views/views_delegate.cc.orig	2015-07-15 16:30:11.000000000 -0400
-+++ ui/views/views_delegate.cc	2015-07-22 22:04:39.799216000 -0400
-@@ -51,7 +51,7 @@
+--- ui/views/views_delegate.cc.orig	2015-08-22 15:02:00.000000000 -0400
++++ ui/views/views_delegate.cc	2015-09-03 11:41:11.900854000 -0400
+@@ -62,7 +62,7 @@
  bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
    return false;
  }
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
  gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
-   return NULL;
- }
-@@ -91,7 +91,7 @@
-   return program.BaseName().AsUTF8Unsafe();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- scoped_refptr<base::TaskRunner>
-     ViewsDelegate::GetTaskRunnerForAuraLinuxAccessibilityInit() {
    return nullptr;
+ }
diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h
index b0f47ac59f17..aed2a96c31c2 100644
--- a/www/chromium/files/patch-ui__views__views_delegate.h
+++ b/www/chromium/files/patch-ui__views__views_delegate.h
@@ -1,6 +1,6 @@
---- ui/views/views_delegate.h.orig	2015-07-15 16:30:11.000000000 -0400
-+++ ui/views/views_delegate.h	2015-07-24 06:37:19.269166000 -0400
-@@ -101,7 +101,7 @@
+--- ui/views/views_delegate.h.orig	2015-08-22 15:02:00.000000000 -0400
++++ ui/views/views_delegate.h	2015-09-03 11:42:15.403898000 -0400
+@@ -110,7 +110,7 @@
    // Returns true if the window passed in is in the Windows 8 metro
    // environment.
    virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
@@ -9,12 +9,3 @@
    virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
  #endif
  
-@@ -139,7 +139,7 @@
-   // Returns the user-visible name of the application.
-   virtual std::string GetApplicationName();
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   // Get a task runner suitable for posting initialization tasks for
-   // Aura Linux accessibility.
-   virtual scoped_refptr<base::TaskRunner>
diff --git a/www/chromium/files/patch-ui__webui__resources__js__cr.js b/www/chromium/files/patch-ui__webui__resources__js__cr.js
new file mode 100644
index 000000000000..b6689b56e7b3
--- /dev/null
+++ b/www/chromium/files/patch-ui__webui__resources__js__cr.js
@@ -0,0 +1,13 @@
+--- ui/webui/resources/js/cr.js.orig	2015-09-05 09:28:39.153643000 -0400
++++ ui/webui/resources/js/cr.js	2015-09-05 09:29:44.511113000 -0400
+@@ -431,5 +431,10 @@
+     get isLinux() {
+       return /Linux/.test(navigator.userAgent);
+     },
++    
++    /** Whether this is on *BSD. */
++    get isBSD() {
++      return /BSD/.test(navigator.userAgent);
++    },
+   };
+ }();
diff --git a/www/chromium/files/patch-ui__webui__resources__js__util.js b/www/chromium/files/patch-ui__webui__resources__js__util.js
new file mode 100644
index 000000000000..a6d9ef146082
--- /dev/null
+++ b/www/chromium/files/patch-ui__webui__resources__js__util.js
@@ -0,0 +1,11 @@
+--- ui/webui/resources/js/util.js.orig	2015-09-05 09:31:35.172857000 -0400
++++ ui/webui/resources/js/util.js	2015-09-05 09:31:57.588607000 -0400
+@@ -58,7 +58,7 @@
+  */
+ function getSupportedScaleFactors() {
+   var supportedScaleFactors = [];
+-  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
++  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) {
+     // All desktop platforms support zooming which also updates the
+     // renderer's device scale factors (a.k.a devicePixelRatio), and
+     // these platforms has high DPI assets for 2.0x. Use 1x and 2x in
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 569847cd8fa7..abd01404fb78 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -114,6 +114,14 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png
 %%DATADIR%%/resources/inspector/Images/searchNext.png
 %%DATADIR%%/resources/inspector/Images/searchPrev.png
+%%DATADIR%%/resources/inspector/Images/securityStateHttp.png
+%%DATADIR%%/resources/inspector/Images/securityStateHttp_2x.png
+%%DATADIR%%/resources/inspector/Images/securityStateInsecure.png
+%%DATADIR%%/resources/inspector/Images/securityStateInsecure_2x.png
+%%DATADIR%%/resources/inspector/Images/securityStateSecure.png
+%%DATADIR%%/resources/inspector/Images/securityStateSecure_2x.png
+%%DATADIR%%/resources/inspector/Images/securityStateWarning.png
+%%DATADIR%%/resources/inspector/Images/securityStateWarning_2x.png
 %%DATADIR%%/resources/inspector/Images/serviceWorker.svg
 %%DATADIR%%/resources/inspector/Images/sessionStorage.png
 %%DATADIR%%/resources/inspector/Images/settingsListRemove.png
@@ -137,15 +145,15 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/InspectorBackendCommands.js
 %%DATADIR%%/resources/inspector/SupportedCSSProperties.js
 %%DATADIR%%/resources/inspector/accessibility_module.js
+%%DATADIR%%/resources/inspector/animation_module.js
 %%DATADIR%%/resources/inspector/audits_module.js
 %%DATADIR%%/resources/inspector/cm_modes_module.js
 %%DATADIR%%/resources/inspector/components_lazy_module.js
 %%DATADIR%%/resources/inspector/console_module.js
-%%DATADIR%%/resources/inspector/devtools.css
-%%DATADIR%%/resources/inspector/devtools.html
 %%DATADIR%%/resources/inspector/devtools.js
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/elements_module.js
+%%DATADIR%%/resources/inspector/emulated_devices_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js
 %%DATADIR%%/resources/inspector/inspector.css
 %%DATADIR%%/resources/inspector/inspector.html
@@ -157,6 +165,7 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/resources_module.js
 %%DATADIR%%/resources/inspector/screencast_module.js
 %%DATADIR%%/resources/inspector/script_formatter_worker_module.js
+%%DATADIR%%/resources/inspector/security_module.js
 %%DATADIR%%/resources/inspector/settings_module.js
 %%DATADIR%%/resources/inspector/snippets_module.js
 %%DATADIR%%/resources/inspector/source_frame_module.js