bluetooth: Standardize Bluetooth adapter access in Adapter service.

device/bluetooth/adapter.h

Index: device/bluetooth/adapter.h
diff --git a/device/bluetooth/adapter.h b/device/bluetooth/adapter.h
index e6e03940e0c504c2983e77c655bc2e442ecef65f..6ae2a7f43399a888881b749b8fff42fecf44208a 100644
--- a/device/bluetooth/adapter.h
+++ b/device/bluetooth/adapter.h
@@ -7,22 +7,26 @@
 
 #include "base/macros.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/public/interfaces/adapter.mojom.h"
 
 namespace bluetooth {
 
-// Implementation of Mojo BluetoothAdapter located in
-// device/bluetooth/public/interfaces/bluetooth.mojom.
+// Implementation of Mojo Adapter located in
+// device/bluetooth/public/interfaces/adapter.mojom.
 // It handles requests for Bluetooth adapter capabilities
 // and devices and uses the platform abstraction of device/bluetooth.
 class Adapter : public mojom::Adapter,
                 public device::BluetoothAdapter::Observer {
  public:
-  Adapter();
+  Adapter(scoped_refptr<device::BluetoothAdapter> adapter,
+          mojom::AdapterClientPtr client);
   ~Adapter() override;
 
-  // Creates an Adapter with a strong Mojo binding to |request|
-  static void Create(mojom::AdapterRequest request);
+  // Creates an Adapter with a strong Mojo binding to |request|.
+  static void Create(mojom::AdapterRequest request,
+                     mojom::AdapterClientPtr client,
+                     scoped_refptr<device::BluetoothAdapter> adapter);
 
   // mojom::Adapter overrides:
   void GetDevices(const GetDevicesCallback& callback) override;
@@ -35,13 +39,10 @@ class Adapter : public mojom::Adapter,
                      device::BluetoothDevice* device) override;
 
  private:
-  mojom::DeviceInfoPtr ConstructDeviceInfoStruct(
-      const device::BluetoothDevice* device) const;
+  // Creates a mojom::DeviceInfo using info from the given |device|.
+  static mojom::DeviceInfoPtr ConstructDeviceInfoStruct(
+      const device::BluetoothDevice* const device);
 
-  void GetDevicesImpl(const GetDevicesCallback& callback);
-
-  void OnGetAdapter(const base::Closure& continuation,
-                    scoped_refptr<device::BluetoothAdapter> adapter);
   // The current Bluetooth adapter.
   scoped_refptr<device::BluetoothAdapter> adapter_;