Simplify Android geolocation permission checks

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
@@ skipping 39 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.cc',
       '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/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',
@@ skipping 381 matching lines @@
       'browser/file_select_helper.h',
       'browser/flags_storage.h',
       'browser/fullscreen.h',
       'browser/fullscreen_chromeos.cc',
       'browser/fullscreen_mac.mm',
       'browser/fullscreen_win.cc',
       'browser/geolocation/chrome_access_token_store.cc',
       'browser/geolocation/chrome_access_token_store.h',
       'browser/geolocation/geolocation_infobar_delegate.cc',
       'browser/geolocation/geolocation_infobar_delegate.h',
-      'browser/geolocation/geolocation_infobar_delegate_android.cc',
-      'browser/geolocation/geolocation_infobar_delegate_android.h',
       'browser/geolocation/geolocation_permission_context.cc',
       'browser/geolocation/geolocation_permission_context.h',
       'browser/geolocation/geolocation_permission_context_android.cc',
       'browser/geolocation/geolocation_permission_context_android.h',
       'browser/geolocation/geolocation_permission_context_extensions.cc',
       'browser/geolocation/geolocation_permission_context_extensions.h',
       'browser/geolocation/geolocation_permission_context_factory.cc',
       'browser/geolocation/geolocation_permission_context_factory.h',
       'browser/geolocation/geolocation_prefs.cc',
       'browser/geolocation/geolocation_prefs.h',
@@ skipping 3136 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }