Fix Android strict-mode violation in GeoLocation info bar.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index e414cb3045b5e59679755d18bb85ffc1ca786544..7c4ce3c51b120e54195e7f1be158f6dad256b86d 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -189,7 +189,7 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
   }
 
   DecidePermission(web_contents, id, requesting_frame_origin,
-                   embedder, callback);
+                   embedder, "", callback);
 }
 
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
@@ -206,6 +206,7 @@ void ChromeGeolocationPermissionContext::DecidePermission(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
+    const std::string accept_button_label,
     base::Callback<void(bool)> callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ -230,13 +231,25 @@ void ChromeGeolocationPermissionContext::DecidePermission(
       } else {
         // setting == ask. Prompt the user.
         QueueController()->CreateInfoBarRequest(
-            id, requesting_frame, embedder, base::Bind(
-                &ChromeGeolocationPermissionContext::NotifyPermissionSet,
+            id, requesting_frame, embedder, accept_button_label,
+                base::Bind(&ChromeGeolocationPermissionContext::NotifyPermissionSet,

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

nit: >80cols

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

nit: >80cols

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

Done.

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

Done.

                 base::Unretained(this), id, requesting_frame, callback));
       }
   }
 }
 
+void ChromeGeolocationPermissionContext::CreateInfoBarRequest(
+    const PermissionRequestID& id,
+    const GURL& requesting_frame,
+    const GURL& embedder,
+    const std::string accept_button_label,
+    base::Callback<void(bool)> callback) {
+      QueueController()->CreateInfoBarRequest(

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

nit: unindent

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

Done.

+          id, requesting_frame, embedder, accept_button_label, base::Bind(
+              &ChromeGeolocationPermissionContext::NotifyPermissionSet,
+              base::Unretained(this), id, requesting_frame, callback));
+}
+
 void ChromeGeolocationPermissionContext::ShutdownOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   permission_queue_controller_.reset();