Rename PermissionBubbleRequest to PermissionRequest

chrome/browser/permissions/permission_context_base.cc

 // Copyright 2014 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/permissions/permission_context_base.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/permissions/permission_queue_controller.h"
 #else
-#include "chrome/browser/permissions/permission_bubble_request_impl.h"
+#include "chrome/browser/permissions/permission_request_impl.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #endif
 
 // static
 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] =
     "PermissionsKillSwitch";
 // static
 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] =
     "blocked";
 
@@ skipping 102 matching lines @@
 }
 
 void PermissionContextBase::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if defined(OS_ANDROID)
   GetQueueController()->CancelInfoBarRequest(id);
 #else
-  PermissionBubbleRequest* cancelling = pending_bubbles_.get(id.ToString());
+  PermissionRequest* cancelling = pending_requests_.get(id.ToString());
   if (cancelling != NULL && web_contents != NULL &&
       PermissionRequestManager::FromWebContents(web_contents) != NULL) {
     PermissionRequestManager::FromWebContents(web_contents)
         ->CancelRequest(cancelling);
   }
 #endif
 }
 
 void PermissionContextBase::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if !defined(OS_ANDROID)
   PermissionRequestManager* permission_request_manager =
       PermissionRequestManager::FromWebContents(web_contents);
   // TODO(felt): sometimes |permission_request_manager| is null. This check is
   // meant to prevent crashes. See crbug.com/457091.
   if (!permission_request_manager)
     return;
-  std::unique_ptr<PermissionBubbleRequest> request_ptr(
-      new PermissionBubbleRequestImpl(
+  std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl(
           requesting_origin, permission_type_,
           base::Bind(&PermissionContextBase::PermissionDecided,
                      weak_factory_.GetWeakPtr(), id, requesting_origin,
                      embedding_origin, callback),
-          base::Bind(&PermissionContextBase::CleanUpBubble,
+          base::Bind(&PermissionContextBase::CleanUpRequest,
                      weak_factory_.GetWeakPtr(), id)));
-  PermissionBubbleRequest* request = request_ptr.get();
+  PermissionRequest* request = request_ptr.get();
 
   bool inserted =
-      pending_bubbles_.add(id.ToString(), std::move(request_ptr)).second;
+      pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
   DCHECK(inserted) << "Duplicate id " << id.ToString();
   permission_request_manager->AddRequest(request);
 #else
   GetQueueController()->CreateInfoBarRequest(
       id, requesting_origin, embedding_origin,
       base::Bind(&PermissionContextBase::PermissionDecided,
                  weak_factory_.GetWeakPtr(), id, requesting_origin,
                  embedding_origin, callback,
                  // the queue controller takes care of persisting the
                  // permission
@@ skipping 59 matching lines @@
   if (content_setting == CONTENT_SETTING_DEFAULT) {
     content_setting =
         HostContentSettingsMapFactory::GetForProfile(profile_)
             ->GetDefaultContentSetting(content_settings_type_, nullptr);
   }
 
   DCHECK_NE(content_setting, CONTENT_SETTING_DEFAULT);
   callback.Run(content_setting);
 }
 
-void PermissionContextBase::CleanUpBubble(const PermissionRequestID& id) {
-  size_t success = pending_bubbles_.erase(id.ToString());
+void PermissionContextBase::CleanUpRequest(const PermissionRequestID& id) {
+  size_t success = pending_requests_.erase(id.ToString());
   DCHECK(success == 1) << "Missing request " << id.ToString();
 }
 
 void PermissionContextBase::UpdateContentSetting(
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     ContentSetting content_setting) {
   DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
   DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
 
   HostContentSettingsMapFactory::GetForProfile(profile_)
       ->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
                                       content_settings_type_, std::string(),
                                       content_setting);
 }
 
 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
   const std::string param = variations::GetVariationParamValue(
       kPermissionsKillSwitchFieldStudy,
       PermissionUtil::GetPermissionString(permission_type_));
 
   return param == kPermissionsKillSwitchBlockedValue;
 }