Update geolocation infobar to handle Android system settings

chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h

Index: chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h b/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h
index 6ef4a72bfc08db226c2f1cae71dd1f219348eb54..544470cccbd1f3e9ac38ff54736f19e547ba853d 100644
--- a/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h
+++ b/chrome/browser/geolocation/geolocation_infobar_queue_controller_android.h
@@ -7,6 +7,8 @@
 
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
 
+class GoogleLocationSettingsHelper;
+
 // Android-specific geolocation infobar queue controller. As with
 // GeolocationInfoBarQueueController, this class is owned by
 // ChromeGeolocationPermissionContextAndroid.
@@ -15,7 +17,8 @@ class GeolocationInfoBarQueueControllerAndroid
 
  public:
   explicit GeolocationInfoBarQueueControllerAndroid(
-      Profile* profile);
+      Profile* profile,
+      GoogleLocationSettingsHelper* helper);
 
  private:
   virtual GeolocationConfirmInfoBarDelegate* CreateInfoBarDelegate(
@@ -26,6 +29,10 @@ class GeolocationInfoBarQueueControllerAndroid
       int bridge_id,
       const GURL& requesting_frame_url,
       const std::string& display_languages) OVERRIDE;
+
+  // ChromeGeolocationPermissionContextAndroid owns both this class
+  // and this instance of google_location_settings_helper_.
+  GoogleLocationSettingsHelper* google_location_settings_helper_;
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_QUEUE_CONTROLLER_ANDROID_H__