Typemap WebBluetoothDeviceId to WTF::String

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.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 "modules/bluetooth/BluetoothRemoteGATTServer.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "modules/bluetooth/Bluetooth.h"
 #include "modules/bluetooth/BluetoothDevice.h"
 #include "modules/bluetooth/BluetoothError.h"
 #include "modules/bluetooth/BluetoothRemoteGATTService.h"
 #include "modules/bluetooth/BluetoothUUID.h"
+#include <utility>
 
 namespace blink {
 
 namespace {
 
 const char kGATTServerDisconnected[] =
     "GATT Server disconnected while retrieving services.";
 const char kGATTServerNotConnected[] =
     "GATT Server is disconnected. Cannot retrieve services.";
 
@@ skipping 42 matching lines @@
   }
 }
 
 ScriptPromise BluetoothRemoteGATTServer::connect(ScriptState* scriptState) {
   m_device->bluetooth()->addDevice(device()->id(), device());
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   mojom::blink::WebBluetoothService* service = m_device->bluetooth()->service();
-  mojom::blink::WebBluetoothDeviceIdPtr deviceId =
-      BluetoothDevice::createMojoDeviceId(device()->id());
   service->RemoteServerConnect(
-      std::move(deviceId),
-      convertToBaseCallback(
-          WTF::bind(&BluetoothRemoteGATTServer::ConnectCallback,
-                    wrapPersistent(this), wrapPersistent(resolver))));
+      device()->id(), convertToBaseCallback(WTF::bind(
+                          &BluetoothRemoteGATTServer::ConnectCallback,
+                          wrapPersistent(this), wrapPersistent(resolver))));
 
   return promise;
 }
 
 void BluetoothRemoteGATTServer::disconnect(ScriptState* scriptState) {
   if (!m_connected)
     return;
   device()->cleanupDisconnectedDeviceAndFireEvent();
   m_device->bluetooth()->removeDevice(device()->id());
   mojom::blink::WebBluetoothService* service = m_device->bluetooth()->service();
-  mojom::blink::WebBluetoothDeviceIdPtr deviceId =
-      BluetoothDevice::createMojoDeviceId(device()->id());
-  service->RemoteServerDisconnect(std::move(deviceId));
+  service->RemoteServerDisconnect(device()->id());
 }
 
 // Callback that allows us to resolve the promise with a single service or
 // with a vector owning the services.
 void BluetoothRemoteGATTServer::GetPrimaryServicesCallback(
     mojom::blink::WebBluetoothGATTQueryQuantity quantity,
     ScriptPromiseResolver* resolver,
     mojom::blink::WebBluetoothResult result,
     Optional<Vector<mojom::blink::WebBluetoothRemoteGATTServicePtr>> services) {
   if (!resolver->getExecutionContext() ||
       resolver->getExecutionContext()->isContextDestroyed())
     return;
 
   // If the resolver is not in the set of ActiveAlgorithms then the frame
   // disconnected so we reject.
   if (!RemoveFromActiveAlgorithms(resolver)) {
     resolver->reject(
         DOMException::create(NetworkError, kGATTServerDisconnected));
     return;
   }
 
   if (result == mojom::blink::WebBluetoothResult::SUCCESS) {
     DCHECK(services);
 
     if (quantity == mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE) {
       DCHECK_EQ(1u, services->size());
       resolver->resolve(m_device->getOrCreateRemoteGATTService(
-          services.value()[0]->instance_id, services.value()[0]->uuid,
-          true /* isPrimary */, device()->id()));
+          std::move(services.value()[0]), true /* isPrimary */,
+          device()->id()));
       return;
     }
 
     HeapVector<Member<BluetoothRemoteGATTService>> gattServices;
     gattServices.reserveInitialCapacity(services->size());
 
-    for (const auto& service : services.value()) {
+    for (auto& service : services.value()) {
       gattServices.push_back(m_device->getOrCreateRemoteGATTService(
-          service->instance_id, service->uuid, true /* isPrimary */,
-          device()->id()));
+          std::move(service), true /* isPrimary */, device()->id()));
     }
     resolver->resolve(gattServices);
   } else {
     resolver->reject(BluetoothError::take(resolver, result));
   }
 }
 
 ScriptPromise BluetoothRemoteGATTServer::getPrimaryService(
     ScriptState* scriptState,
     const StringOrUnsignedLong& service,
@@ skipping 36 matching lines @@
     return ScriptPromise::rejectWithDOMException(
         scriptState,
         DOMException::create(NetworkError, kGATTServerNotConnected));
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
   AddToActiveAlgorithms(resolver);
 
   mojom::blink::WebBluetoothService* service = m_device->bluetooth()->service();
-  mojom::blink::WebBluetoothDeviceIdPtr deviceId =
-      BluetoothDevice::createMojoDeviceId(device()->id());
   WTF::Optional<String> uuid = WTF::nullopt;
   if (!servicesUUID.isEmpty())
     uuid = servicesUUID;
 
   service->RemoteServerGetPrimaryServices(
-      std::move(deviceId), quantity, uuid,
+      device()->id(), quantity, uuid,
       convertToBaseCallback(
           WTF::bind(&BluetoothRemoteGATTServer::GetPrimaryServicesCallback,
                     wrapPersistent(this), quantity, wrapPersistent(resolver))));
   return promise;
 }
 
 }  // namespace blink