Revert 76228 - Move core pieces of geolocation from chrome to content.This is...

content/content_browser.gypi

Index: content/content_browser.gypi
===================================================================
--- content/content_browser.gypi	(revision 76230)
+++ content/content_browser.gypi	(working copy)
@@ -72,61 +72,6 @@
         'browser/file_system/browser_file_system_helper.h',
         'browser/file_system/file_system_dispatcher_host.cc',
         'browser/file_system/file_system_dispatcher_host.h',
-        'browser/geolocation/access_token_store.h',
-        'browser/geolocation/arbitrator_dependency_factory.cc',
-        'browser/geolocation/arbitrator_dependency_factory.h',
-        'browser/geolocation/core_location_data_provider_mac.h',
-        'browser/geolocation/core_location_data_provider_mac.mm',
-        'browser/geolocation/core_location_provider_mac.h',
-        'browser/geolocation/core_location_provider_mac.mm',
-        'browser/geolocation/device_data_provider.cc',
-        'browser/geolocation/device_data_provider.h',
-        'browser/geolocation/empty_device_data_provider.cc',
-        'browser/geolocation/empty_device_data_provider.h',
-        'browser/geolocation/gateway_data_provider_common.cc',
-        'browser/geolocation/gateway_data_provider_common.h',
-        'browser/geolocation/gateway_data_provider_linux.cc',
-        'browser/geolocation/gateway_data_provider_linux.h',
-        'browser/geolocation/gateway_data_provider_win.cc',
-        'browser/geolocation/gateway_data_provider_win.h',
-        'browser/geolocation/geolocation_dispatcher_host.cc',
-        'browser/geolocation/geolocation_dispatcher_host.h',
-        'browser/geolocation/geolocation_observer.h',
-        'browser/geolocation/geolocation_permission_context.h',
-        'browser/geolocation/geolocation_provider.cc',
-        'browser/geolocation/geolocation_provider.h',
-        'browser/geolocation/gps_location_provider_linux.cc',
-        'browser/geolocation/gps_location_provider_linux.h',
-        'browser/geolocation/libgps_2_38_wrapper_linux.cc',
-        'browser/geolocation/libgps_2_94_wrapper_linux.cc',
-        'browser/geolocation/libgps_wrapper_linux.cc',
-        'browser/geolocation/libgps_wrapper_linux.h',
-        'browser/geolocation/location_arbitrator.cc',
-        'browser/geolocation/location_arbitrator.h',
-        'browser/geolocation/location_provider.cc',
-        'browser/geolocation/location_provider.h',
-        'browser/geolocation/network_location_provider.cc',
-        'browser/geolocation/network_location_provider.h',
-        'browser/geolocation/network_location_request.cc',
-        'browser/geolocation/network_location_request.h',
-        'browser/geolocation/osx_wifi.h',
-        'browser/geolocation/wifi_data_provider_chromeos.cc',
-        'browser/geolocation/wifi_data_provider_chromeos.h',
-        'browser/geolocation/wifi_data_provider_common.cc',
-        'browser/geolocation/wifi_data_provider_common.h',
-        'browser/geolocation/wifi_data_provider_common_win.cc',
-        'browser/geolocation/wifi_data_provider_common_win.h',
-        'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
-        'browser/geolocation/wifi_data_provider_linux.cc',
-        'browser/geolocation/wifi_data_provider_linux.h',
-        'browser/geolocation/wifi_data_provider_mac.cc',
-        'browser/geolocation/wifi_data_provider_mac.h',
-        'browser/geolocation/wifi_data_provider_win.cc',
-        'browser/geolocation/wifi_data_provider_win.h',
-        'browser/geolocation/win7_location_api_win.cc',
-        'browser/geolocation/win7_location_api_win.h',
-        'browser/geolocation/win7_location_provider_win.cc',
-        'browser/geolocation/win7_location_provider_win.h',
         'browser/gpu_blacklist.cc',
         'browser/gpu_blacklist.h',
         'browser/gpu_process_host.cc',
@@ -307,16 +252,16 @@
         ['OS=="win"', {
           'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442',
         }],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
           'dependencies': [
-            '../build/linux/system.gyp:dbus-glib',
             # For FcLangSetAdd call in render_sandbox_host_linux.cc
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:gtk',
             # For XShm* in backing_store_x.cc
             '../build/linux/system.gyp:x11',
           ],
-        }, {  # OS != "linux"
+        }],
+        ['OS!="linux"', {
           'sources!': [
             # TODO(mattm): Cert manager stuff is really !USE_NSS.
             'browser/certificate_manager_model.cc',