Typemap WebBluetoothDeviceId to WTF::String

third_party/WebKit/Source/modules/bluetooth/Bluetooth.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/Bluetooth.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 142 matching lines @@
 
 void Bluetooth::RequestDeviceCallback(
     ScriptPromiseResolver* resolver,
     mojom::blink::WebBluetoothResult result,
     mojom::blink::WebBluetoothDevicePtr device) {
   if (!resolver->getExecutionContext() ||
       resolver->getExecutionContext()->isContextDestroyed())
     return;
 
   if (result == mojom::blink::WebBluetoothResult::SUCCESS) {
-    BluetoothDevice* bluetoothDevice = getBluetoothDeviceRepresentingDevice(
-        device->id->device_id, device->name, resolver);
+    BluetoothDevice* bluetoothDevice =
+        getBluetoothDeviceRepresentingDevice(std::move(device), resolver);
     resolver->resolve(bluetoothDevice);
   } else {
     resolver->reject(BluetoothError::take(resolver, result));
   }
 }
 
 // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-requestdevice
 ScriptPromise Bluetooth::requestDevice(ScriptState* scriptState,
                                        const RequestDeviceOptions& options,
                                        ExceptionState& exceptionState) {
@@ skipping 54 matching lines @@
 
   // Subsequent steps are handled in the browser process.
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   service()->RequestDevice(
       std::move(deviceOptions),
       convertToBaseCallback(WTF::bind(&Bluetooth::RequestDeviceCallback,
                                       wrapPersistent(this),
                                       wrapPersistent(resolver))));
+

[scheib, 2017/01/07 01:25:53]

nit: avoid whitespace changes

[juncai, 2017/01/09 20:25:50]

Done.

   return promise;
 }
 
 void Bluetooth::addDevice(const String& deviceId, BluetoothDevice* device) {
   m_connectedDevices.add(deviceId, device);
 }
 
 void Bluetooth::removeDevice(const String& deviceId) {
   m_connectedDevices.remove(deviceId);
 }
@@ skipping 19 matching lines @@
 
 void Bluetooth::RemoteCharacteristicValueChanged(
     const WTF::String& characteristicInstanceId,
     const WTF::Vector<uint8_t>& value) {
   BluetoothRemoteGATTCharacteristic* characteristic =
       m_activeCharacteristics.get(characteristicInstanceId);
   if (characteristic)
     characteristic->dispatchCharacteristicValueChanged(value);
 }
 
-void Bluetooth::GattServerDisconnected(
-    mojom::blink::WebBluetoothDeviceIdPtr deviceId) {
-  BluetoothDevice* device = m_connectedDevices.get(deviceId->device_id);
+void Bluetooth::GattServerDisconnected(const WTF::String& deviceId) {
+  BluetoothDevice* device = m_connectedDevices.get(deviceId);
   if (device) {
     // Remove device from the map before calling dispatchGattServerDisconnected
     // to avoid removing a device the gattserverdisconnected event handler might
     // have re-connected.
-    m_connectedDevices.remove(deviceId->device_id);
+    m_connectedDevices.remove(deviceId);
     device->dispatchGattServerDisconnected();
   }
 }
 
 BluetoothDevice* Bluetooth::getBluetoothDeviceRepresentingDevice(
-    const String& id,
-    const String& name,
+    mojom::blink::WebBluetoothDevicePtr device,

[scheib, 2017/01/07 01:25:53]

I recommend renaming the parameter 'device_ptr' and below using just 'device'
for the BluetoothDevice.

[juncai, 2017/01/09 20:25:50]

Done.

     ScriptPromiseResolver* resolver) {
-  BluetoothDevice* device = m_deviceInstanceMap.get(id);
-  if (!device) {
-    device = BluetoothDevice::take(resolver, id, name, this);
-    auto result = m_deviceInstanceMap.add(id, device);
+  WTF::String id = device->id;
+  BluetoothDevice* bluetoothDevice = m_deviceInstanceMap.get(id);
+  if (!bluetoothDevice) {
+    bluetoothDevice = BluetoothDevice::take(resolver, std::move(device), this);
+    auto result = m_deviceInstanceMap.add(id, bluetoothDevice);
     DCHECK(result.isNewEntry);
   }
-  return device;
+  return bluetoothDevice;
 }
 
 }  // namespace blink