Store USB device permissions in website settings.

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 33e54597394cd4ee4158aba99da40b99f296ce50..e7b4cc5b35cfa369b734cd03e05991522f94a05b 100644
--- a/chrome/browser/usb/web_usb_permission_provider.cc
+++ b/chrome/browser/usb/web_usb_permission_provider.cc
@@ -6,9 +6,12 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/usb/usb_permission_context.h"
+#include "chrome/browser/usb/usb_permission_context_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "device/core/device_client.h"
 
 using device::usb::WebUsbDescriptorSet;
@@ -87,13 +90,18 @@ void WebUSBPermissionProvider::HasDevicePermission(
     const HasDevicePermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin();
+  Profile* profile = Profile::FromBrowserContext(
+      render_frame_host_->GetProcess()->GetBrowserContext());
+  UsbPermissionContext* permission_context =
+      UsbPermissionContextFactory::GetForProfile(profile);
 
   mojo::Array<mojo::String> allowed_guids(0);
   for (size_t i = 0; i < requested_devices.size(); ++i) {
     const device::usb::DeviceInfoPtr& device = requested_devices[i];
     if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(), origin,
                                   nullptr, nullptr) &&
-        EnableWebUsbOnAnyOrigin())
+        (EnableWebUsbOnAnyOrigin() ||
+         permission_context->HasDevicePermission(origin, device->guid)))
       allowed_guids.push_back(device->guid);
   }
   callback.Run(allowed_guids.Pass());