bluetooth: Move read value 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"
@@ skipping 53 matching lines @@
     const blink::WebString& service_instance_id,
     const blink::WebString& characteristic_uuid,
     blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) {
   GetDispatcher()->getCharacteristics(frame_routing_id_, service_instance_id,
                                       characteristic_uuid, callbacks);
 }
 
 void WebBluetoothImpl::readValue(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothReadValueCallbacks* callbacks) {
-  GetDispatcher()->readValue(frame_routing_id_, characteristic_instance_id,
-                             callbacks);
+  GetWebBluetoothService().RemoteCharacteristicReadValue(
+      mojo::String::From(characteristic_instance_id),
+      base::Bind(&WebBluetoothImpl::OnReadValueComplete, base::Unretained(this),
+                 base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::writeValue(
     const blink::WebString& characteristic_instance_id,
     const blink::WebVector<uint8_t>& value,
     blink::WebBluetoothWriteValueCallbacks* callbacks) {
   GetWebBluetoothService().RemoteCharacteristicWriteValue(
       mojo::String::From(characteristic_instance_id),
       mojo::Array<uint8_t>::From(value),
       base::Bind(&WebBluetoothImpl::OnWriteValueComplete,
@@ skipping 33 matching lines @@
   // TODO(ortuno): After the Bluetooth Tree is implemented, there will
   // only be one object per characteristic. But for now we replace
   // the previous object.
   // https://crbug.com/495270
   active_characteristics_[characteristic_instance_id.utf8()] = characteristic;
 }
 
 void WebBluetoothImpl::RemoteCharacteristicValueChanged(
     const mojo::String& characteristic_instance_id,
     mojo::Array<uint8_t> value) {
-  auto active_iter = active_characteristics_.find(characteristic_instance_id);
-  if (active_iter != active_characteristics_.end()) {
-    active_iter->second->dispatchCharacteristicValueChanged(
-        value.PassStorage());
+  // We post a task so that the event is fired after any pending promises have
+  // resolved.
+  base::ThreadTaskRunnerHandle::Get()->PostTask(

[Jeffrey Yasskin, 2016/04/15 20:59:35]

Actually, don't post this task:
https://github.com/WebBluetoothCG/web-bluetooth/pull/209 reversed the order of
the event and promise resolution.

[Jeffrey Yasskin, 2016/04/15 21:01:55]

Or you can hold off on changing this and the tests. I filed
https://crbug.com/604028 to track it.

[ortuno, 2016/04/15 21:34:07]

Interesting. So we don't need to post a task on the browser side either! I'll
hold off.

+      FROM_HERE,
+      base::Bind(&WebBluetoothImpl::DispatchCharacteristicValueChanged,
+                 base::Unretained(this), characteristic_instance_id,
+                 value.PassStorage()));
+}
+
+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);
   }
 }
 
 void WebBluetoothImpl::OnWriteValueComplete(
     const blink::WebVector<uint8_t>& value,
     std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
     blink::mojom::WebBluetoothError error) {
   if (error == blink::mojom::WebBluetoothError::SUCCESS) {
     callbacks->onSuccess(value);
   } else {
     callbacks->onError(error);
   }
 }
 
 void WebBluetoothImpl::OnStartNotificationsComplete(
     std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
     blink::mojom::WebBluetoothError error) {
   if (error == blink::mojom::WebBluetoothError::SUCCESS) {
     callbacks->onSuccess();
   } else {
     callbacks->onError(error);
   }
 }
 
 void WebBluetoothImpl::OnStopNotificationsComplete(
     std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks) {
   callbacks->onSuccess();
 }
 
+void WebBluetoothImpl::DispatchCharacteristicValueChanged(
+    const std::string& characteristic_instance_id,
+    const std::vector<uint8_t>& value) {
+  auto active_iter = active_characteristics_.find(characteristic_instance_id);
+  if (active_iter != active_characteristics_.end()) {
+    active_iter->second->dispatchCharacteristicValueChanged(value);
+  }
+}
+
 BluetoothDispatcher* WebBluetoothImpl::GetDispatcher() {
   return BluetoothDispatcher::GetOrCreateThreadSpecificInstance(
       thread_safe_sender_.get());
 }
 
 blink::mojom::WebBluetoothService& WebBluetoothImpl::GetWebBluetoothService() {
   if (!web_bluetooth_service_) {
     service_registry_->ConnectToRemoteService(
         mojo::GetProxy(&web_bluetooth_service_));
     // 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