Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

chrome/browser/content_settings/permission_queue_controller.cc

 // Copyright 2013 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/content_settings/permission_queue_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
 #include "chrome/browser/media/protected_media_identifier_infobar_delegate.h"
 #endif
 
 namespace {
 
 InfoBarService* GetInfoBarService(const PermissionRequestID& id) {
-  content::WebContents* web_contents =
-      tab_util::GetWebContentsByID(id.render_process_id(), id.render_view_id());
+  content::WebContents* web_contents = tab_util::GetWebContentsByFrameID(
+      id.render_process_id(), id.render_frame_id());
   return web_contents ? InfoBarService::FromWebContents(web_contents) : NULL;
 }
 
+bool ArePermissionRequestsForSameTab(
+    const PermissionRequestID& request,
+    const PermissionRequestID& other_request) {
+  content::WebContents* web_contents = tab_util::GetWebContentsByFrameID(
+      request.render_process_id(), request.render_frame_id());
+  content::WebContents* other_web_contents = tab_util::GetWebContentsByFrameID(
+      other_request.render_process_id(), other_request.render_frame_id());
+
+  return web_contents == other_web_contents;
 }
 
+}  // anonymous namespace
 
 class PermissionQueueController::PendingInfobarRequest {
  public:
   PendingInfobarRequest(ContentSettingsType type,
                         const PermissionRequestID& id,
                         const GURL& requesting_frame,
                         const GURL& embedder,
                         const PermissionDecidedCallback& callback);
   ~PendingInfobarRequest();
 
@@ skipping 113 matching lines @@
   if (!AlreadyShowingInfoBarForTab(id))
     ShowQueuedInfoBarForTab(id);
 }
 
 void PermissionQueueController::CancelInfoBarRequest(
     const PermissionRequestID& id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   for (PendingInfobarRequests::iterator i(pending_infobar_requests_.begin());
        i != pending_infobar_requests_.end(); ++i) {
-    if (i->id().Equals(id)) {
-      if (i->has_infobar())
-        GetInfoBarService(id)->RemoveInfoBar(i->infobar());
-      else
-        pending_infobar_requests_.erase(i);
-      return;
-    }
+    if (!i->id().Equals(id))
+      continue;
+
+    InfoBarService* infobar_service = GetInfoBarService(id);
+    if (infobar_service && i->has_infobar())
+      infobar_service->RemoveInfoBar(i->infobar());
+    else
+      pending_infobar_requests_.erase(i);
+    return;
   }
 }
 
 void PermissionQueueController::OnPermissionSet(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     bool update_content_setting,
     bool allowed) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ skipping 89 matching lines @@
       return;
     }
   }
 }
 
 bool PermissionQueueController::AlreadyShowingInfoBarForTab(
     const PermissionRequestID& id) const {
   for (PendingInfobarRequests::const_iterator i(
            pending_infobar_requests_.begin());
        i != pending_infobar_requests_.end(); ++i) {
-    if (i->id().IsForSameTabAs(id) && i->has_infobar())
+    if (ArePermissionRequestsForSameTab(i->id(), id) && i->has_infobar())
       return true;
   }
   return false;
 }
 
 void PermissionQueueController::ShowQueuedInfoBarForTab(
     const PermissionRequestID& id) {
   DCHECK(!AlreadyShowingInfoBarForTab(id));
 
   // We can get here for example during tab shutdown, when the InfoBarService is
   // removing all existing infobars, thus calling back to Observe(). In this
   // case the service still exists, and is supplied as the source of the
   // notification we observed, but is no longer accessible from its WebContents.
   // In this case we should just go ahead and cancel further infobars for this
   // tab instead of trying to access the service.
   //
   // Similarly, if we're being destroyed, we should also avoid showing further
   // infobars.
   InfoBarService* infobar_service = GetInfoBarService(id);
   if (!infobar_service || in_shutdown_) {
     ClearPendingInfobarRequestsForTab(id);
     return;
   }
 
   for (PendingInfobarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ++i) {
-    if (i->id().IsForSameTabAs(id) && !i->has_infobar()) {
+    if (ArePermissionRequestsForSameTab(i->id(), id) && !i->has_infobar()) {
       RegisterForInfoBarNotifications(infobar_service);
       i->CreateInfoBar(
           this, profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
       return;
     }
   }
 
   UnregisterForInfoBarNotifications(infobar_service);
 }
 
 void PermissionQueueController::ClearPendingInfobarRequestsForTab(
     const PermissionRequestID& id) {
   for (PendingInfobarRequests::iterator i = pending_infobar_requests_.begin();
        i != pending_infobar_requests_.end(); ) {
-    if (i->id().IsForSameTabAs(id)) {
+    if (ArePermissionRequestsForSameTab(i->id(), id)) {
       DCHECK(!i->has_infobar());
       i = pending_infobar_requests_.erase(i);
     } else {
       ++i;
     }
   }
 }
 
 void PermissionQueueController::RegisterForInfoBarNotifications(
     InfoBarService* infobar_service) {
@@ skipping 36 matching lines @@
       ContentSettingsPattern::Wildcard() :
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());
 
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       embedder_pattern,
       type_,
       std::string(),
       content_setting);
 }