WebUSB bindings part 5

Source/modules/webusb/USB.cpp

 // 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 "config.h"
 #include "modules/webusb/USB.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 37 matching lines @@
         if (filter.hasProtocolCode())
             webFilter.protocolCode = filter.protocolCode();
     }
 }
 
 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the
 // getDevices() promise with a HeapVector owning USBDevices.
 class DeviceArray {
     WTF_MAKE_NONCOPYABLE(DeviceArray);
 public:
-    using WebType = WebVector<WebUSBDevice*>;
+    using WebType = OwnPtr<WebVector<WebUSBDevice*>>;
 
-    static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver*, PassOwnPtr<WebType> webDevices)
+    static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver*, PassOwnPtr<WebVector<WebUSBDevice*>> webDevices)
     {
         HeapVector<Member<USBDevice>> devices;
         for (const auto webDevice : *webDevices)
             devices.append(USBDevice::create(adoptPtr(webDevice)));
         return devices;
     }
 
 private:
     DeviceArray() = delete;
 };
 
 } // namespace
 
 USB::USB(LocalFrame& frame)
     : m_controller(USBController::from(frame))
 {
 }
 
 ScriptPromise USB::getDevices(ScriptState* scriptState, const USBDeviceEnumerationOptions& options)
 {
     WebUSBClient* client = m_controller->client();
     if (!client)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     WebUSBDeviceEnumerationOptions webOptions;
     convertDeviceEnumerationOptions(options, &webOptions);
-
-    // TODO(rockot): Re-enable this after CPA changes land.
-    // That's https://codereview.chromium.org/1240763002/ and dependent patches.
-    // client->getDevices(webOptions, new CallbackPromiseAdapter<DeviceArray, USBError>(resolver));
-    ASSERT_NOT_REACHED();
-
+    client->getDevices(webOptions, new CallbackPromiseAdapter<DeviceArray, USBError>(resolver));
     return promise;
 }
 
 DEFINE_TRACE(USB)
 {
     visitor->trace(m_controller);
 }
 
 } // namespace blink