bluetooth: Use BluetoothUUID instead of string when sending uuids

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>
 
 #include "base/macros.h"
+#include "base/optional.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
 #include "content/browser/bluetooth/cache_query_result.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_gatt_connection.h"
 #include "device/bluetooth/bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
@@ skipping 71 matching lines @@
   void SetClient(
       blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo client) override;
   void RequestDevice(blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
                      const RequestDeviceCallback& callback) override;
   void RemoteServerConnect(
       const mojo::String& device_id,
       const RemoteServerConnectCallback& callback) override;
   void RemoteServerDisconnect(const mojo::String& device_id) override;
   void RemoteServerGetPrimaryService(
       const mojo::String& device_id,
-      const mojo::String& service_uuid,
+      const base::Optional<device::BluetoothUUID>& service_uuid,
       const RemoteServerGetPrimaryServiceCallback& callback) override;
   void RemoteServiceGetCharacteristics(
       const mojo::String& service_instance_id,
       blink::mojom::WebBluetoothGATTQueryQuantity quantity,
-      const mojo::String& characteristics_uuid,
+      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 RemoteServerGetPrimaryServiceImpl(
-      const std::string& service_uuid,
+      const base::Optional<device::BluetoothUUID>& service_uuid,
       const RemoteServerGetPrimaryServiceCallback& 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);
@@ skipping 102 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_