Remove RenderFrameHost pointer from ChooserController.

chrome/browser/usb/web_usb_permission_provider.cc

Index: chrome/browser/usb/web_usb_permission_provider.cc
diff --git a/chrome/browser/usb/web_usb_permission_provider.cc b/chrome/browser/usb/web_usb_permission_provider.cc
index c7f1913913c45da69eb376679af9b9559467a0f0..f1af27d33ec5d39efb0d59e2f6dd855138ca6c5e 100644
--- a/chrome/browser/usb/web_usb_permission_provider.cc
+++ b/chrome/browser/usb/web_usb_permission_provider.cc
@@ -50,20 +50,33 @@ bool FindOriginInDescriptorSet(const device::WebUsbAllowedOrigins* set,
 
 }  // 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 =
@@ -82,7 +95,7 @@ bool WebUSBPermissionProvider::HasDevicePermission(
     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);
   }
@@ -90,25 +103,6 @@ bool WebUSBPermissionProvider::HasDevicePermission(
   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 {