[CrOS Tether] Refactor BleScanner so that it takes a BluetoothAdapter in its constructor instead of…

chromeos/components/tether/ble_connection_manager.h

Index: chromeos/components/tether/ble_connection_manager.h
diff --git a/chromeos/components/tether/ble_connection_manager.h b/chromeos/components/tether/ble_connection_manager.h
index a62057aef2117b2c43db7c3bee8339afafa365e8..fdc26905500d69e62ef640b52793634ba71a8234 100644
--- a/chromeos/components/tether/ble_connection_manager.h
+++ b/chromeos/components/tether/ble_connection_manager.h
@@ -109,6 +109,20 @@ class BleConnectionManager : public BleScanner::Observer {
       cryptauth::RemoteDevice remote_device) override;
 
  protected:
+  class TimerFactory {
+   public:
+    virtual std::unique_ptr<base::Timer> CreateTimer();
+  };
+
+  BleConnectionManager(
+      cryptauth::CryptAuthService* cryptauth_service,
+      scoped_refptr<device::BluetoothAdapter> adapter,
+      std::unique_ptr<BleScanner> ble_scanner,
+      std::unique_ptr<BleAdvertiser> ble_advertiser,
+      std::unique_ptr<BleAdvertisementDeviceQueue> device_queue,
+      std::unique_ptr<TimerFactory> timer_factory,
+      cryptauth::BluetoothThrottler* bluetooth_throttler);
+
   void SendMessageReceivedEvent(const cryptauth::RemoteDevice& remote_device,
                                 const std::string& payload);
   void SendSecureChannelStatusChangeEvent(
@@ -170,19 +184,6 @@ class BleConnectionManager : public BleScanner::Observer {
     base::WeakPtrFactory<ConnectionMetadata> weak_ptr_factory_;
   };
 
-  class TimerFactory {
-   public:
-    virtual std::unique_ptr<base::Timer> CreateTimer();
-  };
-
-  BleConnectionManager(
-      cryptauth::CryptAuthService* cryptauth_service,
-      scoped_refptr<device::BluetoothAdapter> adapter,
-      std::unique_ptr<BleScanner> ble_scanner,
-      std::unique_ptr<BleAdvertiser> ble_advertiser,
-      std::unique_ptr<BleAdvertisementDeviceQueue> device_queue,
-      std::unique_ptr<TimerFactory> timer_factory,
-      cryptauth::BluetoothThrottler* bluetooth_throttler);
 
   std::shared_ptr<ConnectionMetadata> GetConnectionMetadata(
       const cryptauth::RemoteDevice& remote_device) const;