Consume Mojo services directly in Blink's WebUSB implementation.

third_party/WebKit/Source/modules/webusb/USBDevice.h

Index: third_party/WebKit/Source/modules/webusb/USBDevice.h
diff --git a/third_party/WebKit/Source/modules/webusb/USBDevice.h b/third_party/WebKit/Source/modules/webusb/USBDevice.h
index a5e01eecfc79aa19ed09b9093ba3e04a1c5a0434..4db0c0aeda1281be5517042743324d6464e11664 100644
--- a/third_party/WebKit/Source/modules/webusb/USBDevice.h
+++ b/third_party/WebKit/Source/modules/webusb/USBDevice.h
@@ -10,9 +10,10 @@
 #include "bindings/modules/v8/UnionTypesModules.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/page/PageLifecycleObserver.h"
+#include "device/usb/public/interfaces/device.mojom-blink.h"
+#include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "mojo/public/cpp/bindings/struct_ptr.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/webusb/WebUSBDevice.h"
-#include "public/platform/modules/webusb/WebUSBDeviceInfo.h"
 #include "wtf/BitVector.h"
 #include "wtf/Vector.h"
 
@@ -25,25 +26,21 @@ class USBControlTransferParameters;
 
 class USBDevice
     : public GarbageCollectedFinalized<USBDevice>
-    , public ContextLifecycleObserver
     , public ScriptWrappable
+    , public ContextLifecycleObserver
     , public PageLifecycleObserver {
     USING_GARBAGE_COLLECTED_MIXIN(USBDevice);
     DEFINE_WRAPPERTYPEINFO();
 public:
-    using WebType = OwnPtr<WebUSBDevice>;
-
-    static USBDevice* create(PassOwnPtr<WebUSBDevice> device, ExecutionContext* context)
+    static USBDevice* create(device::usb::blink::DeviceInfoPtr deviceInfo, device::usb::blink::DevicePtr device, ExecutionContext* context)
     {
-        return new USBDevice(device, context);
+        return new USBDevice(std::move(deviceInfo), std::move(device), context);
     }
 
-    static USBDevice* take(ScriptPromiseResolver*, PassOwnPtr<WebUSBDevice>);
-
-    explicit USBDevice(PassOwnPtr<WebUSBDevice>, ExecutionContext*);
-    virtual ~USBDevice() { }
+    explicit USBDevice(device::usb::blink::DeviceInfoPtr, device::usb::blink::DevicePtr, ExecutionContext*);
+    virtual ~USBDevice();
 
-    const WebUSBDeviceInfo& info() const { return m_device->info(); }
+    const device::usb::blink::DeviceInfo& info() const { return *m_deviceInfo; }
     void onDeviceOpenedOrClosed(bool);
     void onConfigurationSelected(bool success, size_t configurationIndex);
     void onInterfaceClaimedOrUnclaimed(bool claimed, size_t interfaceIndex);
@@ -53,20 +50,20 @@ public:
 
     // IDL exposed interface:
     String guid() const { return info().guid; }
-    uint8_t usbVersionMajor() { return info().usbVersionMajor; }
-    uint8_t usbVersionMinor() { return info().usbVersionMinor; }
-    uint8_t usbVersionSubminor() { return info().usbVersionSubminor; }
-    uint8_t deviceClass() { return info().deviceClass; }
-    uint8_t deviceSubclass() const { return info().deviceSubclass; }
-    uint8_t deviceProtocol() const { return info().deviceProtocol; }
-    uint16_t vendorId() const { return info().vendorID; }
-    uint16_t productId() const { return info().productID; }
-    uint8_t deviceVersionMajor() const { return info().deviceVersionMajor; }
-    uint8_t deviceVersionMinor() const { return info().deviceVersionMinor; }
-    uint8_t deviceVersionSubminor() const { return info().deviceVersionSubminor; }
-    String manufacturerName() const { return info().manufacturerName; }
-    String productName() const { return info().productName; }
-    String serialNumber() const { return info().serialNumber; }
+    uint8_t usbVersionMajor() const { return info().usb_version_major; }
+    uint8_t usbVersionMinor() const { return info().usb_version_minor; }
+    uint8_t usbVersionSubminor() const { return info().usb_version_subminor; }
+    uint8_t deviceClass() const { return info().class_code; }
+    uint8_t deviceSubclass() const { return info().subclass_code; }
+    uint8_t deviceProtocol() const { return info().protocol_code; }
+    uint16_t vendorId() const { return info().vendor_id; }
+    uint16_t productId() const { return info().product_id; }
+    uint8_t deviceVersionMajor() const { return info().device_version_major; }
+    uint8_t deviceVersionMinor() const { return info().device_version_minor; }
+    uint8_t deviceVersionSubminor() const { return info().device_version_subminor; }
+    String manufacturerName() const { return info().manufacturer_name; }
+    String productName() const { return info().product_name; }
+    String serialNumber() const { return info().serial_number; }
     USBConfiguration* configuration() const;
     HeapVector<Member<USBConfiguration>> configurations() const;
     bool opened() const { return m_opened; }
@@ -105,10 +102,11 @@ private:
     bool ensureInterfaceClaimed(uint8_t interfaceNumber, ScriptPromiseResolver*) const;
     bool ensureEndpointAvailable(bool inTransfer, uint8_t endpointNumber, ScriptPromiseResolver*) const;
     bool anyInterfaceChangeInProgress() const;
-    bool convertControlTransferParameters(WebUSBDevice::TransferDirection, const USBControlTransferParameters&, WebUSBDevice::ControlTransferParameters*, ScriptPromiseResolver*) const;
+    device::usb::blink::ControlTransferParamsPtr convertControlTransferParameters(const USBControlTransferParameters&, ScriptPromiseResolver*) const;
     void setEndpointsForInterface(size_t interfaceIndex, bool set);
 
-    OwnPtr<WebUSBDevice> m_device;
+    device::usb::blink::DeviceInfoPtr m_deviceInfo;
+    device::usb::blink::DevicePtr m_device;
     bool m_opened;
     bool m_deviceStateChangeInProgress;
     int m_configurationIndex;