Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/geolocation/chrome_geolocation_permission_context_android.h

Index: chrome/browser/geolocation/chrome_geolocation_permission_context_android.h
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h
index aed2ed81d00778b2366167feb95aa67595500139..3cab8d95748ab7919aef47019c8f5d4e532cbbd6 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_android.h
@@ -30,6 +30,7 @@ class ChromeGeolocationPermissionContextAndroid
                                 const PermissionRequestID& id,
                                 const GURL& requesting_frame,
                                 const GURL& embedder,
+                                const std::string accept_button_label,

[bulach, 2014/02/14 11:36:48]

nit: &

[acleung1, 2014/02/21 21:18:01]

Done.

                                 base::Callback<void(bool)> callback) OVERRIDE;
 
   virtual void PermissionDecided(const PermissionRequestID& id,
@@ -38,8 +39,22 @@ class ChromeGeolocationPermissionContextAndroid
                                  base::Callback<void(bool)> callback,
                                  bool allowed) OVERRIDE;
 
+  void ProceedDecidePermission(content::WebContents* web_contents,
+                               const PermissionRequestID& id,
+                               const GURL& requesting_frame,
+                               const GURL& embedder,
+                               const std::string accept_button_label,

[bulach, 2014/02/14 11:36:48]

nit: &

[acleung1, 2014/02/21 21:18:01]

Done.

+                               base::Callback<void(bool)> callback);
+
   scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
 
+ private:
+  void CheckMasterLocation(content::WebContents* web_contents,
+                           const PermissionRequestID& id,
+                           const GURL& requesting_frame,
+                           const GURL& embedder,
+                           base::Callback<void(bool)> callback);
+
   DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContextAndroid);
 };