Remove RenderFrameHost pointer from ChooserController.

chrome/browser/usb/web_usb_permission_provider.cc

 // Copyright 2015 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/usb/web_usb_permission_provider.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/stl_util.h"
@@ skipping 32 matching lines @@
         continue;
       if (base::ContainsValue(function.origins, origin))
         return true;
     }
   }
   return false;
 }
 
 }  // namespace
 
-// static
+WebUSBPermissionProvider::WebUSBPermissionProvider(
+    RenderFrameHost* render_frame_host)
+    : render_frame_host_(render_frame_host), weak_factory_(this) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(render_frame_host_);
+}
+
+WebUSBPermissionProvider::~WebUSBPermissionProvider() {}
+
+base::WeakPtr<device::usb::PermissionProvider>
+WebUSBPermissionProvider::GetWeakPtr() {
+  return weak_factory_.GetWeakPtr();
+}
+
 bool WebUSBPermissionProvider::HasDevicePermission(
-    RenderFrameHost* render_frame_host,
-    scoped_refptr<const device::UsbDevice> device) {
+    scoped_refptr<const device::UsbDevice> device) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (UsbBlocklist::Get().IsExcluded(device))
     return false;
 
   WebContents* web_contents =
-      WebContents::FromRenderFrameHost(render_frame_host);
+      WebContents::FromRenderFrameHost(render_frame_host_);
   RenderFrameHost* main_frame = web_contents->GetMainFrame();
   GURL embedding_origin = main_frame->GetLastCommittedURL().GetOrigin();
-  GURL requesting_origin = render_frame_host->GetLastCommittedURL().GetOrigin();
+  GURL requesting_origin =
+      render_frame_host_->GetLastCommittedURL().GetOrigin();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   UsbChooserContext* chooser_context =
       UsbChooserContextFactory::GetForProfile(profile);
 
   if (!chooser_context->HasDevicePermission(requesting_origin, embedding_origin,
                                             device)) {
     return false;
   }
 
   // On Android it is not possible to read the WebUSB descriptors until Chrome
   // has been granted permission to open it. Instead we grant provisional access
   // to the device and perform the allowed origins check when the client tries
   // to open it.
   if (!device->permission_granted())
     return true;
 
   // Embedded frames must have their origin in the list provided by the device.
-  if (render_frame_host != main_frame) {
+  if (render_frame_host_ != main_frame) {
     return FindOriginInDescriptorSet(device->webusb_allowed_origins(),
                                      requesting_origin, nullptr, nullptr);
   }
 
   return true;
 }
 
-WebUSBPermissionProvider::WebUSBPermissionProvider(
-    RenderFrameHost* render_frame_host)
-    : render_frame_host_(render_frame_host), weak_factory_(this) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DCHECK(render_frame_host_);
-}
-
-WebUSBPermissionProvider::~WebUSBPermissionProvider() {}
-
-base::WeakPtr<device::usb::PermissionProvider>
-WebUSBPermissionProvider::GetWeakPtr() {
-  return weak_factory_.GetWeakPtr();
-}
-
-bool WebUSBPermissionProvider::HasDevicePermission(
-    scoped_refptr<const device::UsbDevice> device) const {
-  return HasDevicePermission(render_frame_host_, device);
-}
-
 bool WebUSBPermissionProvider::HasConfigurationPermission(
     uint8_t requested_configuration_value,
     scoped_refptr<const device::UsbDevice> device) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Embedded frames may only access configurations if their origin in the list
   // provided by the device.
   RenderFrameHost* main_frame =
       WebContents::FromRenderFrameHost(render_frame_host_)->GetMainFrame();
   if (render_frame_host_ != main_frame) {
@@ skipping 34 matching lines @@
   tab_helper->IncrementConnectionCount(render_frame_host_);
 }
 
 void WebUSBPermissionProvider::DecrementConnectionCount() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   WebContents* web_contents =
       WebContents::FromRenderFrameHost(render_frame_host_);
   UsbTabHelper* tab_helper = UsbTabHelper::FromWebContents(web_contents);
   tab_helper->DecrementConnectionCount(render_frame_host_);
 }