Store USB device permissions in website settings.

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 "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/usb/usb_chooser_context.h"
+#include "chrome/browser/usb/usb_chooser_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/web_contents.h"
 #include "device/core/device_client.h"
 
 using content::BrowserThread;
 using content::RenderFrameHost;
 using content::WebContents;
 using content::WebContentsObserver;
@@ skipping 66 matching lines @@
       render_frame_host_(render_frame_host) {
   bindings_.set_connection_error_handler(base::Bind(
       &WebUSBPermissionProvider::OnConnectionError, base::Unretained(this)));
   bindings_.AddBinding(this, request.Pass());
 }
 
 void WebUSBPermissionProvider::HasDevicePermission(
     mojo::Array<device::usb::DeviceInfoPtr> requested_devices,
     const HasDevicePermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  GURL origin = render_frame_host_->GetLastCommittedURL().GetOrigin();
+  GURL embedding_origin =
+      web_contents()->GetMainFrame()->GetLastCommittedURL().GetOrigin();
+  GURL requesting_origin =
+      render_frame_host_->GetLastCommittedURL().GetOrigin();
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+  UsbChooserContext* chooser_context =
+      UsbChooserContextFactory::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())
+    if (FindOriginInDescriptorSet(device->webusb_allowed_origins.get(),
+                                  requesting_origin, nullptr, nullptr) &&
+        (EnableWebUsbOnAnyOrigin() ||
+         chooser_context->HasDevicePermission(requesting_origin,
+                                              embedding_origin, device->guid)))
       allowed_guids.push_back(device->guid);
   }
   callback.Run(allowed_guids.Pass());
 }
 
 void WebUSBPermissionProvider::HasConfigurationPermission(
     uint8_t requested_configuration_value,
     device::usb::DeviceInfoPtr device,
     const HasInterfacePermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 23 matching lines @@
 void WebUSBPermissionProvider::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
   if (render_frame_host == render_frame_host_)
     delete this;
 }
 
 void WebUSBPermissionProvider::OnConnectionError() {
   if (bindings_.empty())
     delete this;
 }