| Index: content/renderer/bluetooth/web_bluetooth_impl.h
|
| diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
|
| index 00658ddf7c62c9213037f1d65bbd803ed46397f0..e1257d03999103932621bc5642de11f53259e8b7 100644
|
| --- a/content/renderer/bluetooth/web_bluetooth_impl.h
|
| +++ b/content/renderer/bluetooth/web_bluetooth_impl.h
|
| @@ -16,7 +16,6 @@
|
| #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"
|
| @@ -89,7 +88,7 @@
|
| void RemoteCharacteristicValueChanged(
|
| const mojo::String& characteristic_instance_id,
|
| mojo::Array<uint8_t> value) override;
|
| - void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
|
| + void GattServerDisconnected(const mojo::String& device_id) override;
|
|
|
| // Callbacks for WebBluetoothService calls:
|
| void OnRequestDeviceComplete(
|
| @@ -143,9 +142,7 @@
|
| // 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<WebBluetoothDeviceId,
|
| - blink::WebBluetoothDevice*,
|
| - WebBluetoothDeviceIdHash>
|
| + std::unordered_map<std::string, blink::WebBluetoothDevice*>
|
| connected_devices_;
|
|
|
| // Binding associated with |web_bluetooth_service_|.
|
|
|