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

chromeos/components/tether/ble_connection_manager.cc

 // 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.
 
 #include "chromeos/components/tether/ble_connection_manager.h"
 
 #include "chromeos/components/tether/ble_constants.h"
 #include "components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h"
 #include "components/cryptauth/cryptauth_service.h"
 #include "components/proximity_auth/logging/logging.h"
@@ skipping 160 matching lines @@
 
 BleConnectionManager::BleConnectionManager(
     cryptauth::CryptAuthService* cryptauth_service,
     scoped_refptr<device::BluetoothAdapter> adapter,
     const LocalDeviceDataProvider* local_device_data_provider,
     const cryptauth::RemoteBeaconSeedFetcher* remote_beacon_seed_fetcher,
     cryptauth::BluetoothThrottler* bluetooth_throttler)
     : BleConnectionManager(
           cryptauth_service,
           adapter,
-          // TODO(khorimoto): Inject |adapter| into |BleScanner|.
-          base::MakeUnique<BleScanner>(local_device_data_provider),
+          base::MakeUnique<BleScanner>(adapter, local_device_data_provider),
           base::MakeUnique<BleAdvertiser>(adapter,
                                           local_device_data_provider,
                                           remote_beacon_seed_fetcher),
           base::MakeUnique<BleAdvertisementDeviceQueue>(),
           base::WrapUnique<TimerFactory>(new TimerFactory()),
           bluetooth_throttler) {}
 
 BleConnectionManager::BleConnectionManager(
     cryptauth::CryptAuthService* cryptauth_service,
     scoped_refptr<device::BluetoothAdapter> adapter,
@@ skipping 311 matching lines @@
                << cryptauth::SecureChannel::StatusToString(new_status);
   for (auto& observer : observer_list_) {
     observer.OnSecureChannelStatusChanged(remote_device, old_status,
                                           new_status);
   }
 }
 
 }  // namespace tether
 
 }  // namespace chromeos