bluetooth: Move GetCharacteristic(s) over to Mojo

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 <vector>
 
 #include "base/memory/ptr_util.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_dispatcher.h"
 #include "ipc/ipc_message.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"
+#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristicInit.h"
 
 namespace content {
 
 WebBluetoothImpl::WebBluetoothImpl(ServiceRegistry* service_registry,
                                    ThreadSafeSender* thread_safe_sender,
                                    int frame_routing_id)
     : service_registry_(service_registry),
       binding_(this),
       thread_safe_sender_(thread_safe_sender),
       frame_routing_id_(frame_routing_id) {}
@@ skipping 18 matching lines @@
 }
 
 void WebBluetoothImpl::getPrimaryService(
     const blink::WebString& device_id,
     const blink::WebString& service_uuid,
     blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks) {
   GetDispatcher()->getPrimaryService(frame_routing_id_, device_id, service_uuid,
                                      callbacks);
 }
 
-void WebBluetoothImpl::getCharacteristic(
-    const blink::WebString& service_instance_id,
-    const blink::WebString& characteristics_uuid,
-    blink::WebBluetoothGetCharacteristicCallbacks* callbacks) {
-  GetDispatcher()->getCharacteristic(frame_routing_id_, service_instance_id,
-                                     characteristics_uuid, callbacks);
-}
-
 void WebBluetoothImpl::getCharacteristics(
     const blink::WebString& service_instance_id,
-    const blink::WebString& characteristic_uuid,
+    bool single_characteristic,
+    const blink::WebString& characteristics_uuid,
     blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) {
-  GetDispatcher()->getCharacteristics(frame_routing_id_, service_instance_id,
-                                      characteristic_uuid, callbacks);
+  GetWebBluetoothService().RemoteServiceGetCharacteristics(
+      mojo::String::From(service_instance_id), single_characteristic,
+      characteristics_uuid.isEmpty() ? nullptr
+                                     : mojo::String::From(characteristics_uuid),
+      base::Bind(&WebBluetoothImpl::OnGetCharacteristicsComplete,
+                 base::Unretained(this), service_instance_id,
+                 characteristics_uuid,
+                 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),
       base::Bind(&WebBluetoothImpl::OnReadValueComplete, base::Unretained(this),
                  base::Passed(base::WrapUnique(callbacks))));
 }
@@ skipping 51 matching lines @@
     mojo::Array<uint8_t> value) {
   // We post a task so that the event is fired after any pending promises have
   // resolved.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&WebBluetoothImpl::DispatchCharacteristicValueChanged,
                  base::Unretained(this), characteristic_instance_id,
                  value.PassStorage()));
 }
 
+void WebBluetoothImpl::OnGetCharacteristicsComplete(
+    const blink::WebString& service_instance_id,
+    const blink::WebString& characteristics_uuid,
+    std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
+    blink::mojom::WebBluetoothError error,
+    mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
+        characteristics) {
+  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    blink::WebVector<blink::WebBluetoothRemoteGATTCharacteristicInit*>

[Jeffrey Yasskin, 2016/04/22 01:16:38]

Keep dcheng's TODO here, to make this work with smart pointers.

[ortuno, 2016/04/25 15:29:45]

Done.

+        promise_characteristics(characteristics.size());
+
+    for (size_t i = 0; i < characteristics.size(); i++) {
+      promise_characteristics[i] =
+          new blink::WebBluetoothRemoteGATTCharacteristicInit(
+              service_instance_id,
+              blink::WebString::fromUTF8(characteristics[i]->instance_id),
+              characteristics_uuid.isEmpty()
+                  ? blink::WebString::fromUTF8(characteristics[i]->uuid)
+                  : characteristics_uuid,
+              characteristics[i]->properties);
+    }
+    callbacks->onSuccess(promise_characteristics);

[Jeffrey Yasskin, 2016/04/22 01:16:38]

std::move the vector?

[ortuno, 2016/04/25 15:29:45]

This is passed by reference. Is that wrong?

[Jeffrey Yasskin, 2016/04/25 17:26:10]

Eventually, we should make as much as possible move things all the way through,
but it's probably not a big problem, and may not even be making a copy
underneath. So never mind.

[ortuno, 2016/04/25 20:37:41]

Acknowledge.

+  } else {
+    callbacks->onError(error);
+  }
+}
+
 void WebBluetoothImpl::OnReadValueComplete(
     std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
     blink::mojom::WebBluetoothError error,
     mojo::Array<uint8_t> value) {
   if (error == blink::mojom::WebBluetoothError::SUCCESS) {
     callbacks->onSuccess(value.PassStorage());
   } else {
     callbacks->onError(error);
   }
 }
@@ skipping 45 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