[CrOS Tether] Update SecureChannel and BleConnectionManager to use CryptAuthService instead of a Del

chromeos/components/tether/ble_connection_manager.cc

Index: chromeos/components/tether/ble_connection_manager.cc
diff --git a/chromeos/components/tether/ble_connection_manager.cc b/chromeos/components/tether/ble_connection_manager.cc
index b4860790fab1d11a1c24be2a5e6bbc61ff2a2715..f435ded4cda1941cd19f9ab16388ac28aa6b412d 100644
--- a/chromeos/components/tether/ble_connection_manager.cc
+++ b/chromeos/components/tether/ble_connection_manager.cc
@@ -6,6 +6,7 @@
 
 #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"
 #include "device/bluetooth/bluetooth_uuid.h"
 
@@ -165,13 +166,13 @@ std::unique_ptr<base::Timer> BleConnectionManager::TimerFactory::CreateTimer() {
 }
 
 BleConnectionManager::BleConnectionManager(
-    std::unique_ptr<Delegate> delegate,
+    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(
-          std::move(delegate),
+          cryptauth_service,
           adapter,
           // TODO(khorimoto): Inject |adapter| into |BleScanner|.
           base::MakeUnique<BleScanner>(local_device_data_provider),
@@ -183,14 +184,14 @@ BleConnectionManager::BleConnectionManager(
           bluetooth_throttler) {}
 
 BleConnectionManager::BleConnectionManager(
-    std::unique_ptr<Delegate> delegate,
+    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)
-    : delegate_(std::move(delegate)),
+    : cryptauth_service_(cryptauth_service),
       adapter_(adapter),
       ble_scanner_(std::move(ble_scanner)),
       ble_advertiser_(std::move(ble_advertiser)),
@@ -329,8 +330,8 @@ void BleConnectionManager::OnReceivedAdvertisementFromDevice(
                       device::BluetoothUUID(std::string(kGattServerUuid)),
                       bluetooth_throttler_);
   std::unique_ptr<cryptauth::SecureChannel> secure_channel =
-      cryptauth::SecureChannel::Factory::NewInstance(
-          std::move(connection), delegate_->CreateSecureChannelDelegate());
+      cryptauth::SecureChannel::Factory::NewInstance(std::move(connection),
+                                                     cryptauth_service_);
   connection_metadata->SetSecureChannel(std::move(secure_channel));
 
   // Stop trying to connect to that device, since a connection already exists.