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

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 39 matching lines @@
       ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/autofill/data_driven_test.cc',
         'browser/autofill/data_driven_test.h',
         # 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',
         'browser/mock_browsing_data_database_helper.h',
         'browser/mock_browsing_data_indexed_db_helper.cc',
         'browser/mock_browsing_data_indexed_db_helper.h',
         'browser/mock_browsing_data_local_storage_helper.cc',
         'browser/mock_browsing_data_local_storage_helper.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (in chrome.gyp).
@@ skipping 92 matching lines @@
         'test/thread_test_helper.h',
         'test/ui_test_utils.cc',
         'test/ui_test_utils.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
         'test/unit/chrome_test_suite.cc',
         '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',
         '../content/browser/renderer_host/test_backing_store.h',
         '../content/browser/renderer_host/test_render_view_host.cc',
         '../content/browser/renderer_host/test_render_view_host.h',
         '../content/browser/tab_contents/test_tab_contents.cc',
         '../content/browser/tab_contents/test_tab_contents.h',
       ],
       'conditions': [
@@ skipping 1107 matching lines @@
         'browser/extensions/extension_webnavigation_unittest.cc',
         'browser/extensions/extensions_quota_service_unittest.cc',
         'browser/extensions/external_policy_extension_loader_unittest.cc',
         'browser/extensions/file_reader_unittest.cc',
         'browser/extensions/image_loading_tracker_unittest.cc',
         'browser/extensions/key_identifier_conversion_views_unittest.cc',
         'browser/extensions/sandboxed_extension_unpacker_unittest.cc',
         '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',
         'browser/ui/gtk/bookmark_bar_gtk_unittest.cc',
         'browser/ui/gtk/bookmark_editor_gtk_unittest.cc',
         'browser/ui/gtk/bookmark_utils_gtk_unittest.cc',
         'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
         'browser/ui/gtk/gtk_expanded_container_unittest.cc',
         'browser/ui/gtk/gtk_theme_provider_unittest.cc',
         'browser/ui/gtk/keyword_editor_view_unittest.cc',
@@ skipping 505 matching lines @@
         'test/sync/test_http_bridge_factory.h',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         'tools/convert_dict/convert_dict_unittest.cc',
         '../content/browser/appcache/chrome_appcache_service_unittest.cc',
         '../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',
         '../content/browser/in_process_webkit/webkit_thread_unittest.cc',
         '../content/browser/plugin_service_unittest.cc',
         '../content/browser/renderer_host/audio_renderer_host_unittest.cc',
         '../content/browser/renderer_host/render_view_host_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc',
         '../content/browser/renderer_host/resource_queue_unittest.cc',
@@ skipping 1933 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: