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

chrome/chrome_browser.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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
     # These variables are so the file lists can be shared with the GN build.
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
     ### Platform-based sources ###
 
     # The set of sources used on all platforms but iOS that aren't listed in
     # more specific variables below.
     'chrome_browser_non_ios_sources': [
       'browser/about_flags.cc',
       'browser/about_flags.h',
       'browser/android/accessibility/font_size_prefs_android.cc',
       'browser/android/accessibility/font_size_prefs_android.h',
       'browser/android/accessibility_util.cc',
       'browser/android/accessibility_util.h',
       'browser/android/activity_type_id_list.h',
       'browser/android/activity_type_ids.cc',
       'browser/android/activity_type_ids.h',
-      'browser/android/app_google_location_settings_helper.cc',
-      'browser/android/app_google_location_settings_helper.h',
       'browser/android/appmenu/app_menu_drag_helper.cc',
       'browser/android/appmenu/app_menu_drag_helper.h',
       'browser/android/banners/app_banner_manager.cc',
       'browser/android/banners/app_banner_manager.h',
       'browser/android/banners/app_banner_metrics_id_list.h',
       'browser/android/banners/app_banner_metrics_ids.h',
       'browser/android/banners/app_banner_settings_helper.cc',
       'browser/android/banners/app_banner_settings_helper.h',
       'browser/android/banners/app_banner_utilities.cc',
       'browser/android/banners/app_banner_utilities.h',
@@ skipping 55 matching lines @@
       'browser/android/logo_bridge.cc',
       'browser/android/logo_bridge.h',
       'browser/android/logo_service.cc',
       'browser/android/logo_service.h',
       'browser/android/meta_tag_observer.cc',
       'browser/android/meta_tag_observer.h',
       'browser/android/new_tab_page_prefs.cc',
       'browser/android/new_tab_page_prefs.h',
       'browser/android/new_tab_page_url_handler.cc',
       'browser/android/new_tab_page_url_handler.h',
-      'browser/android/google_location_settings_helper.h',
       'browser/android/intent_helper.cc',
       'browser/android/intent_helper.h',
       'browser/android/intercept_download_resource_throttle.cc',
       'browser/android/intercept_download_resource_throttle.h',
+      'browser/android/location_settings.h',
+      'browser/android/location_settings_impl.cc',
+      'browser/android/location_settings_impl.h',
       'browser/android/most_visited_sites.cc',
       'browser/android/most_visited_sites.h',
       'browser/android/omnibox/answers_image_bridge.cc',
       'browser/android/omnibox/answers_image_bridge.h',
       'browser/android/omnibox/autocomplete_controller_android.cc',
       'browser/android/omnibox/autocomplete_controller_android.h',
       'browser/android/omnibox/omnibox_prerender.cc',
       'browser/android/omnibox/omnibox_prerender.h',
       'browser/android/password_ui_view_android.cc',
       'browser/android/password_ui_view_android.h',
@@ skipping 3576 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }