bluetooth: Move requestDevice 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>
 
 #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 "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"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTService.h"
+#include "third_party/WebKit/public/platform/modules/bluetooth/WebRequestDeviceOptions.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) {}
+WebBluetoothImpl::WebBluetoothImpl(ServiceRegistry* service_registry)
+    : service_registry_(service_registry), binding_(this) {}
 
 WebBluetoothImpl::~WebBluetoothImpl() {
 }
 
 void WebBluetoothImpl::requestDevice(
     const blink::WebRequestDeviceOptions& options,
     blink::WebBluetoothRequestDeviceCallbacks* callbacks) {
-  GetDispatcher()->requestDevice(frame_routing_id_, options, callbacks);
+  GetWebBluetoothService().RequestDevice(
+      blink::mojom::WebBluetoothRequestDeviceOptions::From(options),
+      base::Bind(&WebBluetoothImpl::OnRequestDeviceComplete,
+                 base::Unretained(this),
+                 base::Passed(base::WrapUnique(callbacks))));
 }
 
 void WebBluetoothImpl::connect(
     const blink::WebString& device_id,
     blink::WebBluetoothDevice* device,
     blink::WebBluetoothRemoteGATTServerConnectCallbacks* callbacks) {
   // TODO(crbug.com/495270): After the Bluetooth Tree is implemented, there will
   // only be one object per device. But for now we replace the previous object.
   connected_devices_[device_id.utf8()] = device;
 
@@ skipping 97 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::OnRequestDeviceComplete(
+    std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
+    const blink::mojom::WebBluetoothError error,
+    blink::mojom::WebBluetoothDevicePtr device) {
+  if (error == blink::mojom::WebBluetoothError::SUCCESS) {
+    blink::WebVector<blink::WebString> uuids(device->uuids.size());
+    for (size_t i = 0; i < device->uuids.size(); ++i)
+      uuids[i] = blink::WebString::fromUTF8(device->uuids[i]);
+
+    callbacks->onSuccess(base::WrapUnique(new blink::WebBluetoothDeviceInit(
+        blink::WebString::fromUTF8(device->id),
+        blink::WebString::fromUTF8(device->name), uuids)));
+  } else {
+    callbacks->onError(error);
+  }
+}
+
 void WebBluetoothImpl::GattServerDisconnected(const mojo::String& device_id) {
   auto device_iter = connected_devices_.find(device_id);
   if (device_iter != connected_devices_.end()) {
     device_iter->second->dispatchGattServerDisconnected();
     connected_devices_.erase(device_iter);
   }
 }
 
 void WebBluetoothImpl::OnConnectComplete(
     std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
@@ skipping 86 matching lines @@
 
 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