Simplify Android geolocation permission checks

chrome/browser/geolocation/geolocation_permission_context.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 163 matching lines @@
   GURL embedder = web_contents->GetLastCommittedURL().GetOrigin();
   if (!requesting_frame_origin.is_valid() || !embedder.is_valid()) {
     LOG(WARNING) << "Attempt to use geolocation from an invalid URL: "
                  << requesting_frame_origin << "," << embedder
                  << " (geolocation is not supported in popups)";
     NotifyPermissionSet(id, requesting_frame_origin, result_callback, false);
     return;
   }
 
   DecidePermission(web_contents, id, requesting_frame_origin, user_gesture,
-                   embedder, "", result_callback);
+                   embedder, result_callback);
 }
 
 void GeolocationPermissionContext::CancelGeolocationPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id) {
   content::WebContents* web_contents = tab_util::GetWebContentsByID(
         render_process_id, render_view_id);
   if (extensions_context_.CancelPermissionRequest(web_contents, bridge_id))
     return;
 
   CancelPendingInfobarRequest(PermissionRequestID(
       render_process_id, render_view_id, bridge_id, GURL()));
 }
 
 void GeolocationPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     bool user_gesture,
     const GURL& embedder,
-    const std::string& accept_button_label,
     base::Callback<void(bool)> callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ContentSetting content_setting =
       profile_->GetHostContentSettingsMap()
           ->GetContentSettingAndMaybeUpdateLastUsage(
               requesting_frame,
               embedder,
               CONTENT_SETTINGS_TYPE_GEOLOCATION,
               std::string());
@@ skipping 13 matching lines @@
               new GeolocationPermissionRequest(
                   this, id, requesting_frame, embedder, user_gesture, callback,
                   profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)));
           GeolocationPermissionRequest* request = request_ptr.get();
           pending_requests_.add(id.ToString(), request_ptr.Pass());
           mgr->AddRequest(request);
         }
       } else {
         // setting == ask. Prompt the user.
         QueueController()->CreateInfoBarRequest(
-            id, requesting_frame, embedder, accept_button_label,
+            id, requesting_frame, embedder,
                 base::Bind(
                     &GeolocationPermissionContext::NotifyPermissionSet,
                 base::Unretained(this), id, requesting_frame, callback));
       }
   }
 }
 
 void GeolocationPermissionContext::CreateInfoBarRequest(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
-    const std::string accept_button_label,
     base::Callback<void(bool)> callback) {
     QueueController()->CreateInfoBarRequest(
-        id, requesting_frame, embedder, accept_button_label, base::Bind(
+        id, requesting_frame, embedder, base::Bind(
             &GeolocationPermissionContext::NotifyPermissionSet,
             base::Unretained(this), id, requesting_frame, callback));
 }
 
 void GeolocationPermissionContext::RequestFinished(
     GeolocationPermissionRequest* request) {
   base::ScopedPtrHashMap<std::string,
                          GeolocationPermissionRequest>::iterator it;
   for (it = pending_requests_.begin(); it != pending_requests_.end(); ++it) {
     if (it->second == request) {
@@ skipping 68 matching lines @@
     if (cancelling != NULL && web_contents != NULL &&
         PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
       PermissionBubbleManager::FromWebContents(web_contents)->
           CancelRequest(cancelling);
     }
     return;
   }
 
   QueueController()->CancelInfoBarRequest(id);
 }