Show "Paired" for already paired WebUSB devices on the chooser

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 a6a9bc6b530c6c5197d4d95abec8c853fa2e0957..fe270111cb401d4df78ada9c3b5a974a7e1b21e8 100644
--- a/chrome/browser/usb/web_usb_permission_provider.cc
+++ b/chrome/browser/usb/web_usb_permission_provider.cc
@@ -54,29 +54,16 @@ bool FindOriginInDescriptorSet(const device::WebUsbAllowedOrigins* set,
 
 }  // namespace
 
-WebUSBPermissionProvider::WebUSBPermissionProvider(
-    content::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();
-}
-
+// static
 bool WebUSBPermissionProvider::HasDevicePermission(
-    scoped_refptr<const device::UsbDevice> device) const {
+    content::RenderFrameHost* render_frame_host,
+    scoped_refptr<const device::UsbDevice> device) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   WebContents* web_contents =
-      WebContents::FromRenderFrameHost(render_frame_host_);
+      WebContents::FromRenderFrameHost(render_frame_host);
   GURL embedding_origin =
       web_contents->GetMainFrame()->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 =
@@ -98,6 +85,25 @@ bool WebUSBPermissionProvider::HasDevicePermission(
                                    requesting_origin, nullptr, nullptr);
 }
 
+WebUSBPermissionProvider::WebUSBPermissionProvider(
+    content::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 {