bluetooth: Use WebBluetoothDeviceId instead of string

content/renderer/bluetooth/web_bluetooth_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 #define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "content/common/bluetooth/web_bluetooth_device_id.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 
 namespace blink {
 class WebBluetoothRemoteGATTCharacteristic;
 }
 
 namespace shell {
@@ skipping 52 matching lines @@
   void registerCharacteristicObject(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
 
  private:
   struct GetCharacteristicsCallback;
   // WebBluetoothServiceClient methods:
   void RemoteCharacteristicValueChanged(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value) override;
-  void GattServerDisconnected(const mojo::String& device_id) override;
+  void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
 
   // Callbacks for WebBluetoothService calls:
   void OnRequestDeviceComplete(
       std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
       const blink::mojom::WebBluetoothError error,
       blink::mojom::WebBluetoothDevicePtr device);
   void OnConnectComplete(
       std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
           callbacks,
       blink::mojom::WebBluetoothError error);
@@ skipping 33 matching lines @@
   // Map of characteristic_instance_ids to
   // WebBluetoothRemoteGATTCharacteristics. When characteristicObjectRemoved is
   // called the characteristic should be removed from the map.
   // Keeps track of what characteristics have listeners.
   std::unordered_map<std::string, blink::WebBluetoothRemoteGATTCharacteristic*>
       active_characteristics_;
 
   // Map of device_ids to WebBluetoothDevices. Added in connect() and removed in
   // disconnect(). This means a device may not actually be connected while in
   // this map, but that it will definitely be removed when the page navigates.
-  std::unordered_map<std::string, blink::WebBluetoothDevice*>
+  std::unordered_map<WebBluetoothDeviceId,
+                     blink::WebBluetoothDevice*,
+                     WebBluetoothDeviceIdHash>
       connected_devices_;
 
   // Binding associated with |web_bluetooth_service_|.
   mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_