bluetooth: Move connect/disconnect 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 <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 23 matching lines @@
 
 void WebBluetoothImpl::requestDevice(
     const blink::WebRequestDeviceOptions& options,
     blink::WebBluetoothRequestDeviceCallbacks* callbacks) {
   GetDispatcher()->requestDevice(frame_routing_id_, options, callbacks);
 }
 
 void WebBluetoothImpl::connect(
     const blink::WebString& device_id,
     blink::WebBluetoothRemoteGATTServerConnectCallbacks* callbacks) {
-  GetDispatcher()->connect(frame_routing_id_, device_id, callbacks);
+  GetWebBluetoothService().RemoteServerConnect(
+      mojo::String::From(device_id),
+      base::Bind(&WebBluetoothImpl::OnConnectComplete, base::Unretained(this),
+                 base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::disconnect(const blink::WebString& device_id) {

[Jeffrey Yasskin, 2016/05/03 01:15:57]

We need this to cancel every in-progress operation for |device_id|, and for all
operations to check that their device is logically connected to this frame:
https://crbug.com/608538

[ortuno, 2016/05/03 16:11:54]

Acknowledged. Thanks for opening the issue!

-  GetDispatcher()->disconnect(frame_routing_id_, device_id);
+  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),
       base::Bind(&WebBluetoothImpl::OnGetPrimaryServiceComplete,
                  base::Unretained(this), device_id,
@@ skipping 76 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::OnConnectComplete(
+    std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
+        callbacks,
+    blink::mojom::WebBluetoothError error) {
+  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    callbacks->onSuccess();
+  } else {
+    callbacks->onError(error);
+  }
+}
+
 void WebBluetoothImpl::OnGetPrimaryServiceComplete(
     const blink::WebString& device_id,
     std::unique_ptr<blink::WebBluetoothGetPrimaryServiceCallbacks> callbacks,
     blink::mojom::WebBluetoothError error,
     blink::mojom::WebBluetoothRemoteGATTServicePtr service) {
   if (error == blink::mojom::WebBluetoothError::SUCCESS) {
     callbacks->onSuccess(
         base::WrapUnique(new blink::WebBluetoothRemoteGATTService(
             blink::WebString::fromUTF8(service->instance_id),
             blink::WebString::fromUTF8(service->uuid), true /* isPrimary */,
@@ skipping 86 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