Clean up geolocation code now that it's all upstream.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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': {
     'chrome_unit_tests_sources': [
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
       '../components/autofill/content/renderer/test_password_generation_agent.h',
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
       'app/chrome_dll.rc',
       # All unittests in browser, common, renderer and service.
       'browser/about_flags_unittest.cc',
       'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc',
+      # TODO(newt): move this to test_support_unit?
+      'browser/android/mock_location_settings.cc',
+      'browser/android/mock_location_settings.h',
       'browser/android/preferences/pref_service_bridge_unittest.cc',
       'browser/android/thumbnail/scoped_ptr_expiring_cache_unittest.cc',
-      # mock_google_location_settings_helper could logically go in
-      # test_support_unit. However tests suites in the internal repository
-      # depend on an alternate implementation so instead each test suite
-      # includes the relevant version directly.
-      'browser/android/mock_google_location_settings_helper.cc',
-      'browser/android/mock_google_location_settings_helper.h',
       'browser/android/shortcut_helper_unittest.cc',
       'browser/app_controller_mac_unittest.mm',
       'browser/autocomplete/autocomplete_provider_unittest.cc',
       'browser/autocomplete/bookmark_provider_unittest.cc',
       'browser/autocomplete/builtin_provider_unittest.cc',
       'browser/autocomplete/history_quick_provider_unittest.cc',
       'browser/autocomplete/history_url_provider_unittest.cc',
       'browser/autocomplete/search_provider_unittest.cc',
       'browser/autocomplete/shortcuts_backend_unittest.cc',
       'browser/autocomplete/shortcuts_database_unittest.cc',
@@ skipping 2711 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }