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

chrome/browser/geolocation/geolocation_permission_context_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 
 // The flow for geolocation permissions on Android needs to take into account
 // the global geolocation settings so it differs from the desktop one. It
 // works as follows.
 // GeolocationPermissionContextAndroid::RequestPermission intercepts the flow
 // and proceeds to check the system location.
 // This will in fact check several possible settings
 //     - The global system geolocation setting
 //     - The Google location settings on pre KK devices
 //     - An old internal Chrome setting on pre-JB MR1 devices
 // With all that information it will decide if system location is enabled.
 // If enabled, it proceeds with the per site flow via
 // GeolocationPermissionContext (which will check per site permissions, create
 // infobars, etc.).
 //
 // Otherwise the permission is already decided.
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 namespace content {
 class WebContents;
 }
 
-class GoogleLocationSettingsHelper;
+class LocationSettings;
 class GURL;
 class PermissionRequestID;
 
 class GeolocationPermissionContextAndroid
     : public GeolocationPermissionContext {
  public:
   explicit GeolocationPermissionContextAndroid(Profile* profile);
   ~GeolocationPermissionContextAndroid() override;
 
  private:
   friend class GeolocationPermissionContextTests;
 
   // GeolocationPermissionContext:
   void RequestPermission(
       content::WebContents* web_contents,
        const PermissionRequestID& id,
        const GURL& requesting_frame_origin,
        bool user_gesture,
        const BrowserPermissionCallback& callback) override;
 
-  // Overrides the GoogleLocationSettingsHelper used to determine whether
+  // Overrides the LocationSettings object used to determine whether
   // system and Chrome-wide location permissions are enabled.
-  void SetGoogleLocationSettingsHelperForTesting(
-      scoped_ptr<GoogleLocationSettingsHelper> helper);
+  void SetLocationSettingsForTesting(scoped_ptr<LocationSettings> settings);
 
-  scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
+  scoped_ptr<LocationSettings> location_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextAndroid);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_