Revert of bluetooth: Use WebBluetoothDeviceId instead of string

content/browser/bluetooth/web_bluetooth_service_impl.h

 // Copyright 2016 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_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 78 matching lines @@
   void NotifyCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       std::vector<uint8_t> value);
 
   // WebBluetoothService methods:
   void SetClient(
       blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo client) override;
   void RequestDevice(blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
                      const RequestDeviceCallback& callback) override;
   void RemoteServerConnect(
-      const WebBluetoothDeviceId& device_id,
+      const mojo::String& device_id,
       const RemoteServerConnectCallback& callback) override;
-  void RemoteServerDisconnect(const WebBluetoothDeviceId& device_id) override;
+  void RemoteServerDisconnect(const mojo::String& device_id) override;
   void RemoteServerGetPrimaryServices(
-      const WebBluetoothDeviceId& device_id,
+      const mojo::String& device_id,
       blink::mojom::WebBluetoothGATTQueryQuantity quantity,
-      const base::Optional<device::BluetoothUUID>& service_uuid,
+      const base::Optional<device::BluetoothUUID>& services_uuid,
       const RemoteServerGetPrimaryServicesCallback& callback) override;
   void RemoteServiceGetCharacteristics(
       const mojo::String& service_instance_id,
       blink::mojom::WebBluetoothGATTQueryQuantity quantity,
       const base::Optional<device::BluetoothUUID>& characteristics_uuid,
       const RemoteServiceGetCharacteristicsCallback& callback) override;
   void RemoteCharacteristicReadValue(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicReadValueCallback& callback) override;
   void RemoteCharacteristicWriteValue(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value,
       const RemoteCharacteristicWriteValueCallback& callback) override;
   void RemoteCharacteristicStartNotifications(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicStartNotificationsCallback& callback) override;
   void RemoteCharacteristicStopNotifications(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicStopNotificationsCallback& callback) override;
 
   void RequestDeviceImpl(
       blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
       const RequestDeviceCallback& callback,
       device::BluetoothAdapter* adapter);
 
   // Should only be run after the services have been discovered for
   // |device_address|.
   void RemoteServerGetPrimaryServicesImpl(
-      const WebBluetoothDeviceId& device_id,
+      const mojo::String& device_id,
       blink::mojom::WebBluetoothGATTQueryQuantity quantity,
       const base::Optional<device::BluetoothUUID>& services_uuid,
       const RemoteServerGetPrimaryServicesCallback& callback,
       device::BluetoothDevice* device);
 
   // Callbacks for BluetoothDeviceChooserController::GetDevice.
   void OnGetDeviceSuccess(
       const RequestDeviceCallback& callback,
       blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
       const std::string& device_id);
   void OnGetDeviceFailed(const RequestDeviceCallback& callback,
                          blink::mojom::WebBluetoothError error);
 
   // Callbacks for BluetoothDevice::CreateGattConnection.
   void OnCreateGATTConnectionSuccess(
-      const WebBluetoothDeviceId& device_id,
+      const std::string& device_id,
       base::TimeTicks start_time,
       const RemoteServerConnectCallback& callback,
       std::unique_ptr<device::BluetoothGattConnection> connection);
   void OnCreateGATTConnectionFailed(
+      const std::string& device_id,
       base::TimeTicks start_time,
       const RemoteServerConnectCallback& callback,
       device::BluetoothDevice::ConnectErrorCode error_code);
 
   // Callbacks for BluetoothRemoteGattCharacteristic::ReadRemoteCharacteristic.
   void OnReadValueSuccess(const RemoteCharacteristicReadValueCallback& callback,
                           const std::vector<uint8_t>& value);
   void OnReadValueFailed(
       const RemoteCharacteristicReadValueCallback& callback,
       device::BluetoothRemoteGattService::GattErrorCode error_code);
@@ skipping 21 matching lines @@
   // Functions to query the platform cache for the bluetooth object.
   // result.outcome == CacheQueryOutcome::SUCCESS if the object was found in the
   // cache. Otherwise result.outcome that can used to record the outcome and
   // result.error will contain the error that should be sent to the renderer.
   // One of the possible outcomes is BAD_RENDERER. In this case we crash the
   // renderer, record the reason and close the pipe, so it's safe to drop
   // any callbacks.
 
   // Queries the platform cache for a Device with |device_id| for |origin|.
   // Fills in the |outcome| field and the |device| field if successful.
-  CacheQueryResult QueryCacheForDevice(const WebBluetoothDeviceId& device_id);
+  CacheQueryResult QueryCacheForDevice(const std::string& device_id);
 
   // Queries the platform cache for a Service with |service_instance_id|. Fills
   // in the |outcome| field, and |device| and |service| fields if successful.
   CacheQueryResult QueryCacheForService(const std::string& service_instance_id);
 
   // Queries the platform cache for a characteristic with
   // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
   // |service| and |characteristic| fields if successful.
   CacheQueryResult QueryCacheForCharacteristic(
       const std::string& characteristic_instance_id);
@@ skipping 40 matching lines @@
   mojo::Binding<blink::mojom::WebBluetoothService> binding_;
 
   base::WeakPtrFactory<WebBluetoothServiceImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_