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

chromeos/components/tether/ble_connection_manager.h

 // Copyright 2017 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 CHROMEOS_COMPONENTS_TETHER_BLE_CONNECTION_MANAGER_H_
 #define CHROMEOS_COMPONENTS_TETHER_BLE_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 91 matching lines @@
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // BleScanner::Observer:
   void OnReceivedAdvertisementFromDevice(
       const std::string& device_address,
       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(
       const cryptauth::RemoteDevice& remote_device,
       const cryptauth::SecureChannel::Status& old_status,
       const cryptauth::SecureChannel::Status& new_status);
 
  private:
   friend class BleConnectionManagerTest;
 
@@ skipping 41 matching lines @@
 
     cryptauth::RemoteDevice remote_device_;
     std::set<MessageType> active_connection_reasons_;
     std::shared_ptr<cryptauth::SecureChannel> secure_channel_;
     std::shared_ptr<base::Timer> connection_attempt_timeout_timer_;
     base::WeakPtr<BleConnectionManager> manager_;
 
     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;
   std::shared_ptr<ConnectionMetadata> AddMetadataForDevice(
       const cryptauth::RemoteDevice& remote_device);
 
   void UpdateConnectionAttempts();
   void UpdateAdvertisementQueue();
 
   void StartConnectionAttempt(const cryptauth::RemoteDevice& remote_device);
@@ skipping 22 matching lines @@
   base::WeakPtrFactory<BleConnectionManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BleConnectionManager);
 };
 
 }  // namespace tether
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_COMPONENTS_TETHER_BLE_CONNECTION_MANAGER_H_