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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 76230)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -57,6 +57,10 @@
         # The only thing used from browser is Browser::Type.
         'browser/extensions/test_extension_prefs.cc',
         'browser/extensions/test_extension_prefs.h',
+        'browser/geolocation/arbitrator_dependency_factories_for_test.cc',
+        'browser/geolocation/arbitrator_dependency_factories_for_test.h',
+        'browser/geolocation/mock_location_provider.cc',
+        'browser/geolocation/mock_location_provider.h',
         'browser/mock_browsing_data_appcache_helper.cc',
         'browser/mock_browsing_data_appcache_helper.h',
         'browser/mock_browsing_data_database_helper.cc',
@@ -169,10 +173,6 @@
         'test/unit/chrome_test_suite.h',
         'test/values_test_util.cc',
         'test/values_test_util.h',
-        '../content/browser/geolocation/arbitrator_dependency_factories_for_test.cc',
-        '../content/browser/geolocation/arbitrator_dependency_factories_for_test.h',
-        '../content/browser/geolocation/mock_location_provider.cc',
-        '../content/browser/geolocation/mock_location_provider.h',
         '../content/browser/renderer_host/mock_render_process_host.cc',
         '../content/browser/renderer_host/mock_render_process_host.h',
         '../content/browser/renderer_host/test_backing_store.cc',
@@ -1300,10 +1300,23 @@
         'browser/extensions/user_script_listener_unittest.cc',
         'browser/extensions/user_script_master_unittest.cc',
         'browser/first_run/first_run_unittest.cc',
+        'browser/geolocation/device_data_provider_unittest.cc',
+        'browser/geolocation/fake_access_token_store.cc',
+        'browser/geolocation/fake_access_token_store.h',
+        'browser/geolocation/gateway_data_provider_common_unittest.cc',
         'browser/geolocation/geolocation_content_settings_map_unittest.cc',
         'browser/geolocation/geolocation_exceptions_table_model_unittest.cc',
+        'browser/geolocation/geolocation_provider_unittest.cc',
         'browser/geolocation/geolocation_permission_context_unittest.cc',
         'browser/geolocation/geolocation_settings_state_unittest.cc',
+        'browser/geolocation/gps_location_provider_unittest_linux.cc',
+        'browser/geolocation/location_arbitrator_unittest.cc',
+        'browser/geolocation/network_location_provider_unittest.cc',
+        'browser/geolocation/wifi_data_provider_common_unittest.cc',
+        'browser/geolocation/wifi_data_provider_unittest_chromeos.cc',
+        'browser/geolocation/wifi_data_provider_unittest_win.cc',
+        'browser/geolocation/win7_location_api_unittest_win.cc',
+        'browser/geolocation/win7_location_provider_unittest_win.cc',
         'browser/global_keyboard_shortcuts_mac_unittest.mm',
         'browser/google/google_update_settings_unittest.cc',
         'browser/google/google_url_tracker_unittest.cc',
@@ -1829,19 +1842,6 @@
         '../content/browser/browser_thread_unittest.cc',
         '../content/browser/child_process_security_policy_unittest.cc',
         '../content/browser/device_orientation/provider_unittest.cc',
-        '../content/browser/geolocation/device_data_provider_unittest.cc',
-        '../content/browser/geolocation/fake_access_token_store.cc',
-        '../content/browser/geolocation/fake_access_token_store.h',
-        '../content/browser/geolocation/gateway_data_provider_common_unittest.cc',
-        '../content/browser/geolocation/geolocation_provider_unittest.cc',
-        '../content/browser/geolocation/gps_location_provider_unittest_linux.cc',
-        '../content/browser/geolocation/location_arbitrator_unittest.cc',
-        '../content/browser/geolocation/network_location_provider_unittest.cc',
-        '../content/browser/geolocation/wifi_data_provider_common_unittest.cc',
-        '../content/browser/geolocation/wifi_data_provider_unittest_chromeos.cc',
-        '../content/browser/geolocation/wifi_data_provider_unittest_win.cc',
-        '../content/browser/geolocation/win7_location_api_unittest_win.cc',
-        '../content/browser/geolocation/win7_location_provider_unittest_win.cc',
         '../content/browser/gpu_blacklist_unittest.cc',
         '../content/browser/host_zoom_map_unittest.cc',
         '../content/browser/in_process_webkit/webkit_context_unittest.cc',