permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/geolocation/geolocation_permission_context_android.cc

 // 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_android.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "chrome/browser/android/location_settings.h"
@@ skipping 14 matching lines @@
 GeolocationPermissionContextAndroid::~GeolocationPermissionContextAndroid() {
 }
 
 void GeolocationPermissionContextAndroid::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   if (!location_settings_->CanSitesRequestLocationPermission(web_contents)) {
-    PermissionDecided(id, requesting_frame_origin,
-                      web_contents->GetLastCommittedURL().GetOrigin(),
-                      callback, false /* persist */, CONTENT_SETTING_BLOCK);
+    NotifyPermissionSet(id, requesting_frame_origin,
+                        web_contents->GetLastCommittedURL().GetOrigin(),
+                        callback, false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
   ContentSetting content_setting =
       GeolocationPermissionContext::GetPermissionStatus(requesting_frame_origin,
                                                         embedding_origin);
   std::vector<ContentSettingsType> content_settings_types;
   content_settings_types.push_back(CONTENT_SETTINGS_TYPE_GEOLOCATION);
   if (content_setting == CONTENT_SETTING_ALLOW &&
@@ skipping 24 matching lines @@
       ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
 
   NotifyPermissionSet(id, requesting_frame_origin, embedding_origin, callback,
                       false /* persist */, new_setting);
 }
 
 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
     scoped_ptr<LocationSettings> settings) {
   location_settings_ = settings.Pass();
 }