chromium-new: Reduce more undefined references

[Ryo ONODERA <ryoon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Mon Jul 18 20:19:50 2016 +0900
Changeset:	438f810f279258b062b20ce289b654bb92ef0d21

Modified Files:
	chromium-new/Makefile
	chromium-new/distinfo
	chromium-new/patches/patch-build_filename__rules.gypi
	chromium-new/patches/patch-components_storage__monitor.gypi
	chromium-new/patches/patch-content_browser_geolocation_location__arbitrator__impl.cc
	chromium-new/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
	chromium-new/patches/patch-content_content__browser.gypi
	chromium-new/patches/patch-content_public_common_content__switches.cc
	chromium-new/patches/patch-ui_app__list_app__list__constants.cc
	chromium-new/patches/patch-ui_views_views__delegate.cc
Added Files:
	chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.cc
	chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.h

Log Message:
chromium-new: Reduce more undefined references

* Runtime DEPENDS to xdg-utils
* Add hack for OpenGL UI related glib-2.0/gmodule.h not found error
* Revert accidentally enabled linux_link_libspeechd=1
* Use bundled flac as a trial
* Do not use remove_bundled_libraries.py script
* xdg related stuff should be used on NetBSD
* Add storage monitor stub from OpenBSD (thanks Okuyama-san)
* Exclude GPU related functions like FreeBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=438f810f279258b062b20ce289b654bb92ef0d21

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chromium-new/Makefile                              | 11 ++--
 chromium-new/distinfo                              | 18 ++++---
 .../patches/patch-build_filename__rules.gypi       |  9 ++++
 .../patches/patch-components_storage__monitor.gypi |  8 ++-
 ...ts_storage__monitor_storage__monitor__netbsd.cc | 59 ++++++++++++++++++++++
 ...nts_storage__monitor_storage__monitor__netbsd.h | 51 +++++++++++++++++++
 ...owser_geolocation_location__arbitrator__impl.cc |  2 +-
 ...rowser_gpu_gpu__data__manager__impl__private.cc |  6 +--
 .../patches/patch-content_content__browser.gypi    |  2 +-
 ...atch-content_public_common_content__switches.cc |  2 +-
 .../patch-ui_app__list_app__list__constants.cc     |  2 +-
 .../patches/patch-ui_views_views__delegate.cc      |  2 +-
 12 files changed, 152 insertions(+), 20 deletions(-)

diffs:
diff --git a/chromium-new/Makefile b/chromium-new/Makefile
index 9089ae6..d315b76 100644
--- a/chromium-new/Makefile
+++ b/chromium-new/Makefile
@@ -19,6 +19,8 @@ BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
 BUILD_DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 BUILD_DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 
+DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
+
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
@@ -50,6 +52,8 @@ CONFIGURE_ENV+=		GYP_GENERATORS=ninja
 CONFIGURE_ENV+=		GYP_DEFINES="${GYP_DEFINES}"
 
 CFLAGS+=		-fno-stack-protector
+# for #include <glib-2.0/gmodule.h>
+CFLAGS+=		-I${BUILDLINK_DIR}/include/glib
 
 BUILDTYPE=	Release
 MAKE_ENV+=	BUILDTYPE=${BUILDTYPE}
@@ -87,10 +91,10 @@ GYP_DEFINES+=	use_allocator=none
 GYP_DEFINES+=	use_cups=1
 GYP_DEFINES+=	linux_link_gsettings=1
 GYP_DEFINES+=	linux_link_libpci=1
-GYP_DEFINES+=	linux_link_libspeechd=1
+GYP_DEFINES+=	linux_link_libspeechd=0
 GYP_DEFINES+=	want_separate_host_toolset=0
 GYP_DEFINES+=	use_system_bzip2=1
-GYP_DEFINES+=	use_system_flac=1
+GYP_DEFINES+=	use_system_flac=0
 GYP_DEFINES+=	use_system_ffmpeg=0
 GYP_DEFINES+=	use_system_harfbuzz=0
 GYP_DEFINES+=	use_system_icu=0
@@ -123,7 +127,7 @@ GYP_DEFINES+=	google_default_client_secret=3R9TyUv14OXgzJnZi6Ismela
 pre-patch:
 	${RM} ${WRKSRC}/third_party/skia/tests/ImageFilterTest.cpp.*
 
-pre-configure:
+unused-pre-configure:
 # Preserve third party source tree with remove_bundled_libraries.py script.
 	cd ${WRKSRC} && \
 	${PYTHONBIN} ./build/linux/unbundle/remove_bundled_libraries.py \
@@ -229,6 +233,7 @@ pre-configure:
 		'v8/src/third_party/valgrind' \
 		'v8/src/third_party/fdlibm' \
 		--do-remove
+pre-configure:
 	cd ${WRKSRC} && \
 	${PYTHONBIN} ./build/linux/unbundle/replace_gyp_files.py \
 		${GYP_DEFINES:C/^/-D/}
diff --git a/chromium-new/distinfo b/chromium-new/distinfo
index 1896caf..91a294d 100644
--- a/chromium-new/distinfo
+++ b/chromium-new/distinfo
@@ -43,7 +43,7 @@ SHA1 (patch-base_trace__event_process__memory__dump.cc) = 7c28a6ac88c6b812dab3c7
 SHA1 (patch-base_trace__event_process__memory__dump.h) = 8f9fea6a2a271482a6e5290a8e768372683fe2de
 SHA1 (patch-build_build__config.h) = f6c09cbcf5d917da3104842ce307d60303707401
 SHA1 (patch-build_common.gypi) = 3ab9dc8b10debb863190e2b017528a123af68cc9
-SHA1 (patch-build_filename__rules.gypi) = e49a3fb871e3328decd2a971f17b4138312753fa
+SHA1 (patch-build_filename__rules.gypi) = dd720f3c44228674d6b987fc51a7b29705dfd680
 SHA1 (patch-build_linux_system.gyp) = c1b58d24d653be2926d47340304647faedc9c935
 SHA1 (patch-build_linux_unbundle_libwebp.gyp) = 05e963f78891c2954b5cdc4fb5f644135ad96b10
 SHA1 (patch-cc_layers_scrollbar__layer__impl__base.cc) = 294c29df3025d921482e7cdfa4b3351b6f2ab584
@@ -164,10 +164,12 @@ SHA1 (patch-components_plugins_renderer_plugin__placeholder.cc) = 2a8950604b5290
 SHA1 (patch-components_policy_core_common_schema.cc) = d65e18664ec9ccef8fb44115b3a83b02ad981c68
 SHA1 (patch-components_policy_resources_policy__templates.json) = 3e4bec6af1387f1594558bee3f46ade6d4b1ef25
 SHA1 (patch-components_policy_tools_generate__policy__source.py) = 273c04aee70c0a46197b035bebd418601761fff7
-SHA1 (patch-components_storage__monitor.gypi) = b177b9b508ccc7165f06287f2c61d64cf6545112
+SHA1 (patch-components_storage__monitor.gypi) = 6b42a0ca768137f662bd8e8e931261b92e1e2c3a
 SHA1 (patch-components_storage__monitor_storage__monitor.cc) = aada15e6539c05b3fbf841e773e9115e5ec51259
 SHA1 (patch-components_storage__monitor_storage__monitor__freebsd.cc) = 9bebfeb7afd90e8843ba145f57d78867c738fcf3
 SHA1 (patch-components_storage__monitor_storage__monitor__freebsd.h) = d2f27f3680a1dd21ce66116f5020fa48dce9759c
+SHA1 (patch-components_storage__monitor_storage__monitor__netbsd.cc) = f56be795a83897fea3e823e58f3f85e0e98f1a2a
+SHA1 (patch-components_storage__monitor_storage__monitor__netbsd.h) = 01469bf0143193c2172dc533a11aa846a5fab2ef
 SHA1 (patch-components_update__client_update__query__params.cc) = 325905ac49c992252bd9a55b6f9c62feefcbe3c6
 SHA1 (patch-components_url__matcher_regex__set__matcher.cc) = 7c475fac8617e2b618bf1580e582fd8f75242922
 SHA1 (patch-components_url__matcher_url__matcher__factory.cc) = 6c254c711dafc0ee32b3547233c58a4132e3697c
@@ -180,10 +182,10 @@ SHA1 (patch-content_browser_browser__shutdown__profile__dumper.cc) = 740c8f81986
 SHA1 (patch-content_browser_child__process__launcher.cc) = 4a2b8ea55678943c8761ec32c3cee85712f5c2ca
 SHA1 (patch-content_browser_download_base__file.cc) = 7c1d4b33444ebb2168225c2c4bbabde10972d58a
 SHA1 (patch-content_browser_download_base__file__linux.cc) = 9786621267f4dddae701752fd56e0f73f1757435
-SHA1 (patch-content_browser_geolocation_location__arbitrator__impl.cc) = 77df1602ebd8d4675c297a83b19e38fb46c3e4ee
+SHA1 (patch-content_browser_geolocation_location__arbitrator__impl.cc) = a0363bd55e18061fb9f8ef1b4882d0a1931e0782
 SHA1 (patch-content_browser_geolocation_wifi__data__provider__freebsd.cc) = 67a1e76bfe8bcb85e5681775c73aca1217969b09
 SHA1 (patch-content_browser_geolocation_wifi__data__provider__freebsd.h) = 9793189a5768521f25ae856497a3c1f6fc25b263
-SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.cc) = 5601b3af11f4f71a86c57ca76b69b54354ca768b
+SHA1 (patch-content_browser_gpu_gpu__data__manager__impl__private.cc) = c95ebf5f15431f63bfc646ee04e0d31215b0ab5c
 SHA1 (patch-content_browser_gpu_gpu__internals__ui.cc) = 933f9b1a6bbe02af85e2850078be00289ffa3767
 SHA1 (patch-content_browser_indexed__db_indexed__db__backing__store.cc) = dff03cc4a5695d1cdce72618e957b2bc9d90795f
 SHA1 (patch-content_browser_ppapi__plugin__process__host.cc) = 443a9cdd207fa2020d61fbc28f9736af24acca86
@@ -196,13 +198,13 @@ SHA1 (patch-content_browser_web__contents_web__contents__impl.cc) = 790a03da00a8
 SHA1 (patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc) = ab11c3f59baf528bb1837fee533898eb761fbefd
 SHA1 (patch-content_common_set__process__title__linux.cc) = 270992c0fa160e0019f4048fdf5cfea431551408
 SHA1 (patch-content_common_set__process__title__linux.h) = 7ecf5cee9081e08dcdb3a41a2468181fe9110fae
-SHA1 (patch-content_content__browser.gypi) = 44e4beb899932c9c0c6a9dd47357011a88a45701
+SHA1 (patch-content_content__browser.gypi) = 100b6094d39fd39b5c8432969f3d079680210ac9
 SHA1 (patch-content_content__common.gypi) = 21eb4ac13752c21aa6e05fc26eee0cd87fd53033
 SHA1 (patch-content_content__tests.gypi) = fdc4b3044405439cd6df5e8815cf02a7e644fbf0
 SHA1 (patch-content_gpu_gpu__child__thread.cc) = f50c4319d9f866eca3379ad97344b525a5bb254e
 SHA1 (patch-content_gpu_gpu__main.cc) = f96d1fbdf3ab38ac27ded2b3d6274c58b1cdf453
 SHA1 (patch-content_public_common_child__process__sandbox__support__linux.h) = 9da0022b5e38da5cf831f5cfbb391203e7f391f7
-SHA1 (patch-content_public_common_content__switches.cc) = 173d63de3032c81889e8d00f17ed76eecd61d776
+SHA1 (patch-content_public_common_content__switches.cc) = d0a1a6378b42cb48522fc74853c167ed4c48ccc9
 SHA1 (patch-content_public_common_content__switches.h) = 01a8b3b6da6ec5b8219c7484ce6ad0426eab5217
 SHA1 (patch-content_public_test_browser__test__base.cc) = 6119634c1654894a51084a604d177ea382928774
 SHA1 (patch-content_renderer_devtools_v8__sampling__profiler.cc) = d8b00b5bc11ab180796fe40171b9d9c63b866b50
@@ -385,7 +387,7 @@ SHA1 (patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp) = 2dd205b6cb
 SHA1 (patch-tools_gyp_test_library_src_library.gyp) = 724088b57399edf538030fc5617a6f93d49fa2ec
 SHA1 (patch-ui_accessibility_accessibility.gyp) = d21725b73fedd7b9b3ef6e03c4f0311d3441680f
 SHA1 (patch-ui_accessibility_platform_ax__platform__node.h) = e92ab1e287111ba2147eb54e9dff00d0bac109b9
-SHA1 (patch-ui_app__list_app__list__constants.cc) = 1a43fde16d4552196efa0e074f9a925c2011cd4d
+SHA1 (patch-ui_app__list_app__list__constants.cc) = ccaa091fd4821e0ae94877ed87ac4f167f31a1e4
 SHA1 (patch-ui_app__list_app__list__constants.h) = e5276dd6872710edc63577830e256547f597072e
 SHA1 (patch-ui_app__list_app__list__menu.cc) = 96ce9cb6956f81a3630433ad7512c14c82876bf8
 SHA1 (patch-ui_app__list_views_app__list__view.cc) = 8f99e3a71d461bc2d0118f5a3a8aa85959facf81
@@ -423,7 +425,7 @@ SHA1 (patch-ui_views_controls_webview_webview.gyp) = 4cce31bcb3415791f2299037a80
 SHA1 (patch-ui_views_examples_widget__example.cc) = d47000a9e093f1c64fece0c1814784d8c720cbb6
 SHA1 (patch-ui_views_style_platform__style.cc) = 772082e1fad011f3285d35ce444cc6d27b04d6c4
 SHA1 (patch-ui_views_views.gyp) = 7d6cd1f7015dee5daa1338c8ac4985150560d3b5
-SHA1 (patch-ui_views_views__delegate.cc) = 05d85365819f8725fbd3fe075cfc15865c3019d2
+SHA1 (patch-ui_views_views__delegate.cc) = 3a1480c93951d74256fe1cfa00201b615c424c97
 SHA1 (patch-ui_views_views__delegate.h) = d6d67a475a0ccf2c5adbcd27536204c52314d069
 SHA1 (patch-ui_views_views__switches.cc) = 2b9240be3b40c9dca92f4b1a1983fe60ad1baeb0
 SHA1 (patch-ui_views_window_custom__frame__view.cc) = a2702abf0065fc883365d91aa6964bfb0755556a
diff --git a/chromium-new/patches/patch-build_filename__rules.gypi b/chromium-new/patches/patch-build_filename__rules.gypi
index 4367ec2..1ddae5e 100644
--- a/chromium-new/patches/patch-build_filename__rules.gypi
+++ b/chromium-new/patches/patch-build_filename__rules.gypi
@@ -11,6 +11,15 @@ $NetBSD$
        'sources/': [
          ['exclude', '_linux(_unittest|_test)?\\.(h|cc)$'],
          ['exclude', '(^|/)linux/'],
+@@ -58,7 +58,7 @@
+         ['exclude', '_nacl(_unittest)?\\.(h|cc)$'],
+       ],
+     }],
+-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
++    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" and OS!="netbsd" or >(nacl_untrusted_build)==1', {
+       'sources/': [
+         ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
+       ],
 @@ -89,7 +89,7 @@
                      ['exclude', '_ashwin\\.(h|cc)$']
        ]
diff --git a/chromium-new/patches/patch-components_storage__monitor.gypi b/chromium-new/patches/patch-components_storage__monitor.gypi
index e8d53ef..bba69ef 100644
--- a/chromium-new/patches/patch-components_storage__monitor.gypi
+++ b/chromium-new/patches/patch-components_storage__monitor.gypi
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- components/storage_monitor.gypi.orig	2016-06-24 01:02:19.000000000 +0000
 +++ components/storage_monitor.gypi
-@@ -50,6 +50,26 @@
+@@ -50,6 +50,32 @@
          'storage_monitor/volume_mount_watcher_win.h',
        ],
        'conditions': [
@@ -26,6 +26,12 @@ $NetBSD$
 +            'storage_monitor/storage_monitor_freebsd.h',
 +          ],
 +        }],
++        ['OS == "netbsd"', {
++          'sources': [
++            'storage_monitor/storage_monitor_netbsd.cc',
++            'storage_monitor/storage_monitor_netbsd.h',
++          ],
++        }],
          ['OS == "mac"', {
            'link_settings': {
              'libraries': [
diff --git a/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.cc b/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.cc
new file mode 100644
index 0000000..c02e325
--- /dev/null
+++ b/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.cc
@@ -0,0 +1,59 @@
+$NetBSD$
+
+--- components/storage_monitor/storage_monitor_netbsd.cc.orig	2016-07-18 10:41:10.337634800 +0000
++++ components/storage_monitor/storage_monitor_netbsd.cc
+@@ -0,0 +1,54 @@
++// 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.
++
++// StorageMonitorNetBSD implementation.
++
++#include "components/storage_monitor/storage_monitor_netbsd.h"
++
++#include <stdio.h>
++
++#include <list>
++
++#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 storage_monitor {
++
++namespace {
++
++}  // namespace
++
++StorageMonitorNetBSD::StorageMonitorNetBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++StorageMonitorNetBSD::~StorageMonitorNetBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++void StorageMonitorNetBSD::Init() {
++}
++
++bool StorageMonitorNetBSD::GetStorageInfoForPath(
++    const base::FilePath& path,
++    StorageInfo* device_info) const {
++  return false; // TODO
++}
++
++StorageMonitor* StorageMonitor::CreateInternal() {
++  return new StorageMonitorNetBSD();
++}
++
++} // namespace storage_monitor
diff --git a/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.h b/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.h
new file mode 100644
index 0000000..2c67586
--- /dev/null
+++ b/chromium-new/patches/patch-components_storage__monitor_storage__monitor__netbsd.h
@@ -0,0 +1,51 @@
+$NetBSD$
+
+--- components/storage_monitor/storage_monitor_netbsd.h.orig	2016-07-18 10:41:14.673955086 +0000
++++ components/storage_monitor/storage_monitor_netbsd.h
+@@ -0,0 +1,46 @@
++// 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.
++
++// StorageMonitorNetBSD 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_NETBSD_H_
++#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_NETBSD_H_
++
++#include <map>
++#include <string>
++
++#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"
++
++namespace storage_monitor {
++
++class StorageMonitorNetBSD : public StorageMonitor {
++ public:
++  // Should only be called by browser start up code.
++  // Use StorageMonitor::GetInstance() instead.
++  explicit StorageMonitorNetBSD();
++  virtual ~StorageMonitorNetBSD();
++
++  // 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(StorageMonitorNetBSD);
++};
++
++} // namespace storage_monitor
++
++#endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_NETBSD_H_
diff --git a/chromium-new/patches/patch-content_browser_geolocation_location__arbitrator__impl.cc b/chromium-new/patches/patch-content_browser_geolocation_location__arbitrator__impl.cc
index b0d2651..badc6a4 100644
--- a/chromium-new/patches/patch-content_browser_geolocation_location__arbitrator__impl.cc
+++ b/chromium-new/patches/patch-content_browser_geolocation_location__arbitrator__impl.cc
@@ -7,7 +7,7 @@ $NetBSD$
  
  LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NETBSD)
    return NULL;
  #else
    return content::NewSystemLocationProvider();
diff --git a/chromium-new/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/chromium-new/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 6894d53..0228352 100644
--- a/chromium-new/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/chromium-new/patches/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -6,7 +6,7 @@ $NetBSD$
    gpu_info.gl_renderer = gl_renderer;
    gpu_info.gl_version = gl_version;
  
-+#if !defined(OS_FREEBSD)
++#if !defined(OS_FREEBSD) && !defined(OS_NETBSD)
    gpu::IdentifyActiveGPU(&gpu_info);
    gpu::CollectDriverInfoGL(&gpu_info);
 +#endif
@@ -17,7 +17,7 @@ $NetBSD$
      // Also declare the driver_vendor to be osmesa to be able to specify
      // exceptions based on driver_vendor==osmesa for some blacklist rules.
      gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
-+#ifndef __FreeBSD__
++#if !defined(OS_FREEBSD) && !defined(OS_NETBSD)
    } else {
      TRACE_EVENT0("startup",
        "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
@@ -30,7 +30,7 @@ $NetBSD$
      return;
  
    bool was_info_available = IsCompleteGpuInfoAvailable();
-+#ifndef __FreeBSD__
++#if !defined(OS_FREEBSD) && !defined(OS_NETBSD)
    gpu::MergeGPUInfo(&gpu_info_, gpu_info);
 +#endif
    if (IsCompleteGpuInfoAvailable()) {
diff --git a/chromium-new/patches/patch-content_content__browser.gypi b/chromium-new/patches/patch-content_content__browser.gypi
index f7e7b18..c079dec 100644
--- a/chromium-new/patches/patch-content_content__browser.gypi
+++ b/chromium-new/patches/patch-content_content__browser.gypi
@@ -55,7 +55,7 @@ $NetBSD$
 +        '../build/linux/system.gyp:dbus',
 +      ],
 +    }],
-+    ['OS=="netbsd"', {
++    ['OS!="freebsd"', {
 +      'sources!': [
 +        'browser/geolocation/wifi_data_provider_freebsd.cc',
        ],
diff --git a/chromium-new/patches/patch-content_public_common_content__switches.cc b/chromium-new/patches/patch-content_public_common_content__switches.cc
index 79a15e2..28a83d4 100644
--- a/chromium-new/patches/patch-content_public_common_content__switches.cc
+++ b/chromium-new/patches/patch-content_public_common_content__switches.cc
@@ -7,7 +7,7 @@ $NetBSD$
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) || defined(OS_NETBSD)
  // Allows sending text-to-speech requests to speech-dispatcher, a common
  // Linux speech service. Because it's buggy, the user must explicitly
  // enable it so that visiting a random webpage can't cause instability.
diff --git a/chromium-new/patches/patch-ui_app__list_app__list__constants.cc b/chromium-new/patches/patch-ui_app__list_app__list__constants.cc
index cef9a1a..25d1bba 100644
--- a/chromium-new/patches/patch-ui_app__list_app__list__constants.cc
+++ b/chromium-new/patches/patch-ui_app__list_app__list__constants.cc
@@ -7,7 +7,7 @@ $NetBSD$
      "Apps.AppListSearchResultDistanceFromOrigin";
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_NETBSD)
  #if defined(GOOGLE_CHROME_BUILD)
  const char kAppListWMClass[] = "chrome_app_list";
  #else  // CHROMIUM_BUILD
diff --git a/chromium-new/patches/patch-ui_views_views__delegate.cc b/chromium-new/patches/patch-ui_views_views__delegate.cc
index d99f5ca..ccf28db 100644
--- a/chromium-new/patches/patch-ui_views_views__delegate.cc
+++ b/chromium-new/patches/patch-ui_views_views__delegate.cc
@@ -7,7 +7,7 @@ $NetBSD$
    return false;
  }
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) || defined(OS_NETBSD)
  gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
    return nullptr;
  }