Simplify Android geolocation permission checks

chrome/browser/content_settings/permission_queue_controller.cc

Index: chrome/browser/content_settings/permission_queue_controller.cc
diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc
index bd97b776b13eb31516d6fc2d3ac2866d8d326d96..c32e9d941750af14be685997e4efef9853769b76 100644
--- a/chrome/browser/content_settings/permission_queue_controller.cc
+++ b/chrome/browser/content_settings/permission_queue_controller.cc
@@ -46,7 +46,6 @@ class PermissionQueueController::PendingInfobarRequest {
                         const PermissionRequestID& id,
                         const GURL& requesting_frame,
                         const GURL& embedder,
-                        const std::string& accept_button_label,
                         PermissionDecidedCallback callback);
   ~PendingInfobarRequest();
 
@@ -67,7 +66,6 @@ class PermissionQueueController::PendingInfobarRequest {
   PermissionRequestID id_;
   GURL requesting_frame_;
   GURL embedder_;
-  std::string accept_button_label_;
   PermissionDecidedCallback callback_;
   infobars::InfoBar* infobar_;
 
@@ -79,13 +77,11 @@ PermissionQueueController::PendingInfobarRequest::PendingInfobarRequest(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
-    const std::string& accept_button_label,
     PermissionDecidedCallback callback)
     : type_(type),
       id_(id),
       requesting_frame_(requesting_frame),
       embedder_(embedder),
-      accept_button_label_(accept_button_label),
       callback_(callback),
       infobar_(NULL) {
 }
@@ -111,7 +107,7 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       infobar_ = GeolocationInfoBarDelegate::Create(
           GetInfoBarService(id_), controller, id_, requesting_frame_,
-          display_languages, accept_button_label_);
+          display_languages);
       break;
 #if defined(ENABLE_NOTIFICATIONS)
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
@@ -162,7 +158,6 @@ void PermissionQueueController::CreateInfoBarRequest(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
-    const std::string& accept_button_label,
     PermissionDecidedCallback callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ -171,8 +166,7 @@ void PermissionQueueController::CreateInfoBarRequest(
     return;
 
   pending_infobar_requests_.push_back(PendingInfobarRequest(
-      type_, id, requesting_frame, embedder,
-      accept_button_label, callback));
+      type_, id, requesting_frame, embedder, callback));
   if (!AlreadyShowingInfoBarForTab(id))
     ShowQueuedInfoBarForTab(id);
 }