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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 76230)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -1105,15 +1105,70 @@
         'browser/gears_integration.cc',
         'browser/gears_integration.h',
         'browser/geolocation/access_token_store.cc',
+        '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_content_settings_map.cc',
-        'browser/geolocation/geolocation_content_settings_map.h',        
+        'browser/geolocation/geolocation_content_settings_map.h',
+        'browser/geolocation/geolocation_dispatcher_host.cc',
+        'browser/geolocation/geolocation_dispatcher_host.h',
         'browser/geolocation/geolocation_exceptions_table_model.cc',
-        'browser/geolocation/geolocation_exceptions_table_model.h',        
+        'browser/geolocation/geolocation_exceptions_table_model.h',
+        'browser/geolocation/geolocation_observer.h',
         'browser/geolocation/geolocation_permission_context.cc',
+        'browser/geolocation/geolocation_permission_context.h',
         'browser/geolocation/geolocation_prefs.cc',
         'browser/geolocation/geolocation_prefs.h',
+        'browser/geolocation/geolocation_provider.cc',
+        'browser/geolocation/geolocation_provider.h',
         'browser/geolocation/geolocation_settings_state.cc',
         'browser/geolocation/geolocation_settings_state.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/global_keyboard_shortcuts_mac.h',
         'browser/global_keyboard_shortcuts_mac.mm',
         'browser/google/google_update.cc',