bluetooth: Move requestDevice to mojo

content/renderer/bluetooth/web_bluetooth_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 #define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 19 matching lines @@
 class BluetoothDispatcher;
 class ThreadSafeSender;
 class ServiceRegistry;
 
 // Implementation of blink::WebBluetooth. Passes calls through to the thread
 // specific BluetoothDispatcher.
 class CONTENT_EXPORT WebBluetoothImpl
     : NON_EXPORTED_BASE(public blink::mojom::WebBluetoothServiceClient),
       NON_EXPORTED_BASE(public blink::WebBluetooth) {
  public:
-  WebBluetoothImpl(ServiceRegistry* service_registry,
-                   ThreadSafeSender* thread_safe_sender,
-                   int frame_routing_id);
+  WebBluetoothImpl(ServiceRegistry* service_registry);
   ~WebBluetoothImpl() override;
 
   // blink::WebBluetooth interface:
   void requestDevice(
       const blink::WebRequestDeviceOptions& options,
       blink::WebBluetoothRequestDeviceCallbacks* callbacks) override;
   void connect(
       const blink::WebString& device_id,
       blink::WebBluetoothDevice* device,
       blink::WebBluetoothRemoteGATTServerConnectCallbacks* callbacks) override;
@@ skipping 27 matching lines @@
 
  private:
   struct GetCharacteristicsCallback;
   // WebBluetoothServiceClient methods:
   void RemoteCharacteristicValueChanged(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value) override;
   void GattServerDisconnected(const mojo::String& device_id) override;
 
   // Callbacks for WebBluetoothService calls:
+  void OnRequestDeviceComplete(
+      std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
+      const blink::mojom::WebBluetoothError error,
+      blink::mojom::WebBluetoothDevicePtr device);
   void OnConnectComplete(
       std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
           callbacks,
       blink::mojom::WebBluetoothError error);
   void OnGetPrimaryServiceComplete(
       const blink::WebString& device_id,
       std::unique_ptr<blink::WebBluetoothGetPrimaryServiceCallbacks> callbacks,
       blink::mojom::WebBluetoothError error,
       blink::mojom::WebBluetoothRemoteGATTServicePtr service);
   void OnGetCharacteristicsComplete(
@@ skipping 13 matching lines @@
   void OnStartNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
       blink::mojom::WebBluetoothError error);
   void OnStopNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks);
 
   void DispatchCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       const std::vector<uint8_t>& value);
 
-  BluetoothDispatcher* GetDispatcher();
-
   blink::mojom::WebBluetoothService& GetWebBluetoothService();
   ServiceRegistry* const service_registry_;
   blink::mojom::WebBluetoothServicePtr web_bluetooth_service_;
 
   // Map of characteristic_instance_ids to
   // WebBluetoothRemoteGATTCharacteristics. When characteristicObjectRemoved is
   // called the characteristic should be removed from the map.
   // Keeps track of what characteristics have listeners.
   std::unordered_map<std::string, blink::WebBluetoothRemoteGATTCharacteristic*>
       active_characteristics_;
 
   // Map of device_ids to WebBluetoothDevices. Added in connect() and removed in
   // disconnect(). This means a device may not actually be connected while in
   // this map, but that it will definitely be removed when the page navigates.
   std::unordered_map<std::string, blink::WebBluetoothDevice*>
       connected_devices_;
 
   // Binding associated with |web_bluetooth_service_|.
   mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
 
-  const scoped_refptr<ThreadSafeSender> thread_safe_sender_;
-  const int frame_routing_id_;
-
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_