bluetooth: Use WebBluetoothDeviceId instead of string

content/renderer/bluetooth/web_bluetooth_impl.cc

 // Copyright 2014 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 "content/renderer/bluetooth/web_bluetooth_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "content/child/mojo/type_converters.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/renderer/bluetooth/bluetooth_type_converters.h"
 #include "ipc/ipc_message.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDevice.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDeviceInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristicInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTService.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebRequestDeviceOptions.h"
 
+using web_bluetooth::WebBluetoothDeviceId;
+
 namespace content {
 
 WebBluetoothImpl::WebBluetoothImpl(shell::InterfaceProvider* remote_interfaces)
     : remote_interfaces_(remote_interfaces), binding_(this) {}
 
 WebBluetoothImpl::~WebBluetoothImpl() {
 }
 
 void WebBluetoothImpl::requestDevice(
     const blink::WebRequestDeviceOptions& options,
     blink::WebBluetoothRequestDeviceCallbacks* callbacks) {
   GetWebBluetoothService().RequestDevice(
       blink::mojom::WebBluetoothRequestDeviceOptions::From(options),
       base::Bind(&WebBluetoothImpl::OnRequestDeviceComplete,
                  base::Unretained(this),
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::connect(
     const blink::WebString& device_id,
     blink::WebBluetoothDevice* device,
     blink::WebBluetoothRemoteGATTServerConnectCallbacks* callbacks) {
   // TODO(crbug.com/495270): After the Bluetooth Tree is implemented, there will
   // only be one object per device. But for now we replace the previous object.
-  connected_devices_[device_id.utf8()] = device;
+  WebBluetoothDeviceId device_id_obj = WebBluetoothDeviceId(device_id.utf8());
+  connected_devices_[device_id_obj] = device;
 
   GetWebBluetoothService().RemoteServerConnect(
-      mojo::String::From(device_id),
+      std::move(device_id_obj),
       base::Bind(&WebBluetoothImpl::OnConnectComplete, base::Unretained(this),
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::disconnect(const blink::WebString& device_id) {
-  connected_devices_.erase(device_id.utf8());
+  WebBluetoothDeviceId device_id_obj = WebBluetoothDeviceId(device_id.utf8());
+  connected_devices_.erase(device_id_obj);
 
-  GetWebBluetoothService().RemoteServerDisconnect(
-      mojo::String::From(device_id));
+  GetWebBluetoothService().RemoteServerDisconnect(std::move(device_id_obj));
 }
 
 void WebBluetoothImpl::getPrimaryServices(
     const blink::WebString& device_id,
-
     blink::mojom::WebBluetoothGATTQueryQuantity quantity,
     const blink::WebString& services_uuid,
     blink::WebBluetoothGetPrimaryServicesCallbacks* callbacks) {
   GetWebBluetoothService().RemoteServerGetPrimaryServices(
-      mojo::String::From(device_id), quantity,
+      WebBluetoothDeviceId(device_id.utf8()), quantity,
       services_uuid.isEmpty()
           ? base::nullopt
           : base::make_optional(device::BluetoothUUID(services_uuid.utf8())),
       base::Bind(&WebBluetoothImpl::OnGetPrimaryServicesComplete,
                  base::Unretained(this), device_id,
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::getCharacteristics(
     const blink::WebString& service_instance_id,
@@ skipping 83 matching lines @@
 void WebBluetoothImpl::OnRequestDeviceComplete(
     std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
     const blink::mojom::WebBluetoothError error,
     blink::mojom::WebBluetoothDevicePtr device) {
   if (error == blink::mojom::WebBluetoothError::SUCCESS) {
     blink::WebVector<blink::WebString> uuids(device->uuids.size());
     for (size_t i = 0; i < device->uuids.size(); ++i)
       uuids[i] = blink::WebString::fromUTF8(device->uuids[i]);
 
     callbacks->onSuccess(base::WrapUnique(new blink::WebBluetoothDeviceInit(
-        blink::WebString::fromUTF8(device->id),
+        blink::WebString::fromUTF8(device->id.str()),
         blink::WebString::fromUTF8(device->name), uuids)));
   } else {
     callbacks->onError(error);
   }
 }
 
-void WebBluetoothImpl::GattServerDisconnected(const mojo::String& device_id) {
+void WebBluetoothImpl::GattServerDisconnected(
+    const WebBluetoothDeviceId& device_id) {
   auto device_iter = connected_devices_.find(device_id);
   if (device_iter != connected_devices_.end()) {
     // Remove device from the map before calling dispatchGattServerDisconnected
     // to avoid removing a device the gattserverdisconnected event handler might
     // have re-connected.
     blink::WebBluetoothDevice* device = device_iter->second;
     connected_devices_.erase(device_iter);
     device->dispatchGattServerDisconnected();
   }
 }
@@ skipping 108 matching lines @@
     // Create an associated interface ptr and pass it to the WebBluetoothService
     // so that it can send us events without us prompting.
     blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo ptr_info;
     binding_.Bind(&ptr_info, web_bluetooth_service_.associated_group());
     web_bluetooth_service_->SetClient(std::move(ptr_info));
   }
   return *web_bluetooth_service_;
 }
 
 }  // namespace content