Remove WebUSB descriptor data from device.mojom.

chrome/browser/usb/usb_chooser_context.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/usb_chooser_context.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
@@ skipping 134 matching lines @@
                           std::move(device_dict));
   } else {
     ephemeral_devices_[std::make_pair(requesting_origin, embedding_origin)]
         .insert(guid);
   }
 }
 
 bool UsbChooserContext::HasDevicePermission(
     const GURL& requesting_origin,
     const GURL& embedding_origin,
-    const device::usb::DeviceInfo& device_info) {
+    scoped_refptr<const device::UsbDevice> device) {
   auto it = ephemeral_devices_.find(
       std::make_pair(requesting_origin, embedding_origin));
   if (it != ephemeral_devices_.end() &&
-      ContainsValue(it->second, device_info.guid)) {
+      ContainsValue(it->second, device->guid())) {
     return true;
   }
 
   std::vector<scoped_ptr<base::DictionaryValue>> device_list =
       GetGrantedObjects(requesting_origin, embedding_origin);
   for (const scoped_ptr<base::DictionaryValue>& device_dict : device_list) {
     int vendor_id;
     int product_id;
-    std::string serial_number;
+    base::string16 serial_number;
     if (device_dict->GetInteger(kVendorIdKey, &vendor_id) &&
-        device_info.vendor_id == vendor_id &&
+        device->vendor_id() == vendor_id &&
         device_dict->GetInteger(kProductIdKey, &product_id) &&
-        device_info.product_id == product_id &&
+        device->product_id() == product_id &&
         device_dict->GetString(kSerialNumberKey, &serial_number) &&
-        device_info.serial_number == serial_number) {
+        device->serial_number() == serial_number) {
       return true;
     }
   }
 
   return false;
 }
 
 bool UsbChooserContext::IsValidObject(const base::DictionaryValue& object) {
   return object.size() == 4 && object.HasKey(kDeviceNameKey) &&
          object.HasKey(kVendorIdKey) && object.HasKey(kProductIdKey) &&
          object.HasKey(kSerialNumberKey);
 }
 
 void UsbChooserContext::OnDeviceRemoved(scoped_refptr<UsbDevice> device) {
   for (auto& map_entry : ephemeral_devices_)
     map_entry.second.erase(device->guid());
 }