Remove WebUSB descriptor data from device.mojom.

device/usb/mojo/mock_permission_provider.h

Index: device/usb/mojo/mock_permission_provider.h
diff --git a/device/usb/mojo/mock_permission_provider.h b/device/usb/mojo/mock_permission_provider.h
index 8440326990b4036fe839f34018dc2b9561e60d1a..c6bf6501eb85f3db23808a9f73403426a613878d 100644
--- a/device/usb/mojo/mock_permission_provider.h
+++ b/device/usb/mojo/mock_permission_provider.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "device/usb/mojo/permission_provider.h"
+#include "device/usb/usb_device.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace device {
@@ -20,14 +21,15 @@ class MockPermissionProvider : public PermissionProvider {
   ~MockPermissionProvider() override;
 
   base::WeakPtr<PermissionProvider> GetWeakPtr();
-  MOCK_CONST_METHOD1(HasDevicePermission, bool(const DeviceInfo& device_info));
+  MOCK_CONST_METHOD1(HasDevicePermission,
+                     bool(scoped_refptr<const UsbDevice> device_info));

[juncai, 2016/04/01 17:05:24]

change device_info parameter name to device.

[Reilly Grant (use Gerrit), 2016/04/01 21:56:33]

Done.

   MOCK_CONST_METHOD2(HasConfigurationPermission,
                      bool(uint8_t requested_configuration,
-                          const DeviceInfo& device_info));
+                          scoped_refptr<const UsbDevice> device_info));

[juncai, 2016/04/01 17:05:24]

ditto

[Reilly Grant (use Gerrit), 2016/04/01 21:56:33]

Done.

   MOCK_CONST_METHOD3(HasFunctionPermission,
                      bool(uint8_t requested_function,
                           uint8_t configuration_value,
-                          const DeviceInfo& device_info));
+                          scoped_refptr<const UsbDevice> device_info));

[juncai, 2016/04/01 17:05:24]

ditto

[Reilly Grant (use Gerrit), 2016/04/01 21:56:33]

Done.

 
  private:
   base::WeakPtrFactory<PermissionProvider> weak_factory_;