bluetooth: Use BluetoothUUID instead of string when sending uuids

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/public/common/service_registry.h"
 #include "content/renderer/bluetooth/bluetooth_type_converters.h"
 #include "ipc/ipc_message.h"
 #include "mojo/public/cpp/bindings/array.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"
@@ skipping 37 matching lines @@
 
   GetWebBluetoothService().RemoteServerDisconnect(
       mojo::String::From(device_id));
 }
 
 void WebBluetoothImpl::getPrimaryService(
     const blink::WebString& device_id,
     const blink::WebString& service_uuid,
     blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks) {
   GetWebBluetoothService().RemoteServerGetPrimaryService(
-      mojo::String::From(device_id), mojo::String::From(service_uuid),
+      mojo::String::From(device_id),
+      base::make_optional(device::BluetoothUUID(service_uuid.utf8())),
       base::Bind(&WebBluetoothImpl::OnGetPrimaryServiceComplete,
                  base::Unretained(this), device_id,
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::getCharacteristics(
     const blink::WebString& service_instance_id,
     blink::mojom::WebBluetoothGATTQueryQuantity quantity,
     const blink::WebString& characteristics_uuid,
     blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) {
   GetWebBluetoothService().RemoteServiceGetCharacteristics(
       mojo::String::From(service_instance_id), quantity,
-      characteristics_uuid.isEmpty() ? nullptr
-                                     : mojo::String::From(characteristics_uuid),
+      characteristics_uuid.isEmpty()
+          ? base::nullopt
+          : base::make_optional(
+                device::BluetoothUUID(characteristics_uuid.utf8())),
       base::Bind(&WebBluetoothImpl::OnGetCharacteristicsComplete,
                  base::Unretained(this), service_instance_id,
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::readValue(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothReadValueCallbacks* callbacks) {
   GetWebBluetoothService().RemoteCharacteristicReadValue(
       mojo::String::From(characteristic_instance_id),
@@ skipping 191 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