Revert "[CrOS PhoneHub] Add ConnectionMedium parameter to SecureChannelClient"

This reverts commit 5afc937a.

Reason for revert: compile failure on chromeos-amd64-generic-dbg https://ci.chromium.org/p/chromium/builders/ci/chromeos-amd64-generic-dbg/15678?

Original change's description:
> [CrOS PhoneHub] Add ConnectionMedium parameter to SecureChannelClient
> 
> Additionally, update all existing clients to use the kBluetoothLowEnergy
> client.
> 
> Bug: 1106937
> Change-Id: I064abe879b2a74612ff4a096f9305eef25e5bd11
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391739
> Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
> Reviewed-by: James Vecore <vecore@google.com>
> Cr-Commit-Position: refs/heads/master@{#804286}

TBR=khorimoto@chromium.org,vecore@google.com

Change-Id: I9c66c9f09594b4a0dec2b934d2ead408ef0d5967
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1106937
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392713Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804290}

chromeos/components/proximity_auth/remote_device_life_cycle_impl.cc

@@ -80,7 +80,6 @@ void RemoteDeviceLifeCycleImpl::TransitionToState(
 void RemoteDeviceLifeCycleImpl::FindConnection() {
   connection_attempt_ = secure_channel_client_->ListenForConnectionFromDevice(
       remote_device_, *local_device_, kSmartLockFeatureName,
-      chromeos::secure_channel::ConnectionMedium::kBluetoothLowEnergy,
       chromeos::secure_channel::ConnectionPriority::kHigh);
   connection_attempt_->SetDelegate(this);
 

chromeos/components/tether/connection_preserver_impl.cc

@@ -175,8 +175,7 @@ void ConnectionPreserverImpl::SetPreservedConnection(
 
   connection_attempt_ = secure_channel_client_->ListenForConnectionFromDevice(
       *remote_device, *device_sync_client_->GetLocalDeviceMetadata(),
-      kTetherFeature, secure_channel::ConnectionMedium::kBluetoothLowEnergy,
-      secure_channel::ConnectionPriority::kLow);
+      kTetherFeature, secure_channel::ConnectionPriority::kLow);
   connection_attempt_->SetDelegate(this);
 
   preserved_connection_timer_->Start(

chromeos/components/tether/message_transfer_operation.cc

@@ -133,9 +133,7 @@ void MessageTransferOperation::Initialize() {
             this, remote_device,
             secure_channel_client_->ListenForConnectionFromDevice(
                 remote_device, *device_sync_client_->GetLocalDeviceMetadata(),
-                kTetherFeature,
-                secure_channel::ConnectionMedium::kBluetoothLowEnergy,
-                connection_priority_));
+                kTetherFeature, connection_priority_));
   }
 }
 

chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.cc

@@ -14,12 +14,10 @@ FakeSecureChannelClient::ConnectionRequestArguments::ConnectionRequestArguments(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
-    ConnectionPriority connection_priority)
+    const ConnectionPriority& connection_priority)
     : device_to_connect(device_to_connect),
       local_device(local_device),
       feature(feature),
-      connection_medium(connection_medium),
       connection_priority(connection_priority) {}
 
 FakeSecureChannelClient::ConnectionRequestArguments::
@@ -37,7 +35,6 @@ FakeSecureChannelClient::InitiateConnectionToDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority) {
   auto remote_local_pair = std::make_pair(device_to_connect, local_device);
   std::unique_ptr<ConnectionAttempt> connection_attempt = std::move(
@@ -51,7 +48,6 @@ FakeSecureChannelClient::ListenForConnectionFromDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority) {
   auto remote_local_pair = std::make_pair(device_to_connect, local_device);
   std::unique_ptr<ConnectionAttempt> connection_attempt = std::move(

chromeos/services/secure_channel/public/cpp/client/fake_secure_channel_client.h

@@ -26,14 +26,12 @@ class FakeSecureChannelClient : public SecureChannelClient {
     ConnectionRequestArguments(multidevice::RemoteDeviceRef device_to_connect,
                                multidevice::RemoteDeviceRef local_device,
                                const std::string& feature,
-                               ConnectionMedium connection_medium,
-                               ConnectionPriority connection_priority);
+                               const ConnectionPriority& connection_priority);
     ~ConnectionRequestArguments();
 
     multidevice::RemoteDeviceRef device_to_connect;
     multidevice::RemoteDeviceRef local_device;
     std::string feature;
-    ConnectionMedium connection_medium;
     ConnectionPriority connection_priority;
 
    private:
@@ -123,13 +121,11 @@ class FakeSecureChannelClient : public SecureChannelClient {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) override;
   std::unique_ptr<ConnectionAttempt> ListenForConnectionFromDevice(
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) override;
 
  private:

chromeos/services/secure_channel/public/cpp/client/secure_channel_client.h

@@ -39,9 +39,7 @@ class ConnectionAttempt;
 //    |local_device| but different features, those clients will share the same
 //    underlying connection, but their messages will be routed to the correct
 //    clients based on the |feature| identifier of the message.
-// 4) |connection_medium|:
-//    The medium (e.g., BLE) to use.
-// 5) |connection_priority|:
+// 4) |connection_priority|:
 //    The priority of this connection request. Please make higher priority
 //    requests only when necessary.
 //
@@ -59,13 +57,11 @@ class SecureChannelClient {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) = 0;
   virtual std::unique_ptr<ConnectionAttempt> ListenForConnectionFromDevice(
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) = 0;
 
  protected:

chromeos/services/secure_channel/public/cpp/client/secure_channel_client_impl.cc

@@ -50,7 +50,6 @@ SecureChannelClientImpl::InitiateConnectionToDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority) {
   auto connection_attempt = ConnectionAttemptImpl::Factory::Create();
 
@@ -61,8 +60,7 @@ SecureChannelClientImpl::InitiateConnectionToDevice(
       base::BindOnce(
           &SecureChannelClientImpl::PerformInitiateConnectionToDevice,
           weak_ptr_factory_.GetWeakPtr(), device_to_connect, local_device,
-          feature, connection_medium, connection_priority,
-          connection_attempt->GenerateRemote()));
+          feature, connection_priority, connection_attempt->GenerateRemote()));
 
   return connection_attempt;
 }
@@ -72,7 +70,6 @@ SecureChannelClientImpl::ListenForConnectionFromDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority) {
   auto connection_attempt = ConnectionAttemptImpl::Factory::Create();
 
@@ -84,8 +81,7 @@ SecureChannelClientImpl::ListenForConnectionFromDevice(
       base::BindOnce(
           &SecureChannelClientImpl::PerformListenForConnectionFromDevice,
           weak_ptr_factory_.GetWeakPtr(), device_to_connect, local_device,
-          feature, connection_medium, connection_priority,
-          connection_attempt->GenerateRemote()));
+          feature, connection_priority, connection_attempt->GenerateRemote()));
 
   return connection_attempt;
 }
@@ -94,12 +90,11 @@ void SecureChannelClientImpl::PerformInitiateConnectionToDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority,
     mojo::PendingRemote<mojom::ConnectionDelegate> connection_delegate_remote) {
   secure_channel_remote_->InitiateConnectionToDevice(
       device_to_connect.GetRemoteDevice(), local_device.GetRemoteDevice(),
-      feature, connection_medium, connection_priority,
+      feature, ConnectionMedium::kBluetoothLowEnergy, connection_priority,
       std::move(connection_delegate_remote));
 }
 
@@ -107,12 +102,11 @@ void SecureChannelClientImpl::PerformListenForConnectionFromDevice(
     multidevice::RemoteDeviceRef device_to_connect,
     multidevice::RemoteDeviceRef local_device,
     const std::string& feature,
-    ConnectionMedium connection_medium,
     ConnectionPriority connection_priority,
     mojo::PendingRemote<mojom::ConnectionDelegate> connection_delegate_remote) {
   secure_channel_remote_->ListenForConnectionFromDevice(
       device_to_connect.GetRemoteDevice(), local_device.GetRemoteDevice(),
-      feature, connection_medium, connection_priority,
+      feature, ConnectionMedium::kBluetoothLowEnergy, connection_priority,
       std::move(connection_delegate_remote));
 }
 

chromeos/services/secure_channel/public/cpp/client/secure_channel_client_impl.h

@@ -53,20 +53,17 @@ class SecureChannelClientImpl : public SecureChannelClient {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) override;
   std::unique_ptr<ConnectionAttempt> ListenForConnectionFromDevice(
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) override;
 
   void PerformInitiateConnectionToDevice(
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority,
       mojo::PendingRemote<mojom::ConnectionDelegate>
           connection_delegate_remote);
@@ -74,7 +71,6 @@ class SecureChannelClientImpl : public SecureChannelClient {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority,
       mojo::PendingRemote<mojom::ConnectionDelegate>
           connection_delegate_remote);

chromeos/services/secure_channel/public/cpp/client/secure_channel_client_impl_unittest.cc

@@ -163,11 +163,9 @@ class SecureChannelClientImplTest : public testing::Test {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) {
     auto connection_attempt = client_->ListenForConnectionFromDevice(
-        device_to_connect, local_device, feature, connection_medium,
-        connection_priority);
+        device_to_connect, local_device, feature, connection_priority);
     auto fake_connection_attempt = base::WrapUnique(
         static_cast<FakeConnectionAttempt*>(connection_attempt.release()));
     fake_connection_attempt->SetDelegate(
@@ -184,11 +182,9 @@ class SecureChannelClientImplTest : public testing::Test {
       multidevice::RemoteDeviceRef device_to_connect,
       multidevice::RemoteDeviceRef local_device,
       const std::string& feature,
-      ConnectionMedium connection_medium,
       ConnectionPriority connection_priority) {
     auto connection_attempt = client_->InitiateConnectionToDevice(
-        device_to_connect, local_device, feature, connection_medium,
-        connection_priority);
+        device_to_connect, local_device, feature, connection_priority);
     auto fake_connection_attempt = base::WrapUnique(
         static_cast<FakeConnectionAttempt*>(connection_attempt.release()));
     fake_connection_attempt->SetDelegate(
@@ -231,8 +227,7 @@ class SecureChannelClientImplTest : public testing::Test {
 TEST_F(SecureChannelClientImplTest, TestInitiateConnectionToDevice) {
   auto fake_connection_attempt = CallInitiateConnectionToDevice(
       test_remote_device_ref_list_[1], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
 
   base::RunLoop run_loop;
 
@@ -254,8 +249,7 @@ TEST_F(SecureChannelClientImplTest, TestInitiateConnectionToDevice) {
 TEST_F(SecureChannelClientImplTest, TestInitiateConnectionToDevice_Failure) {
   auto fake_connection_attempt = CallInitiateConnectionToDevice(
       test_remote_device_ref_list_[1], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
 
   base::RunLoop run_loop;
 
@@ -276,8 +270,7 @@ TEST_F(SecureChannelClientImplTest, TestInitiateConnectionToDevice_Failure) {
 TEST_F(SecureChannelClientImplTest, TestListenForConnectionFromDevice) {
   auto fake_connection_attempt = CallListenForConnectionFromDevice(
       test_remote_device_ref_list_[1], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
 
   base::RunLoop run_loop;
 
@@ -299,8 +292,7 @@ TEST_F(SecureChannelClientImplTest, TestListenForConnectionFromDevice) {
 TEST_F(SecureChannelClientImplTest, TestListenForConnectionFromDevice_Failure) {
   auto fake_connection_attempt = CallListenForConnectionFromDevice(
       test_remote_device_ref_list_[1], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
 
   base::RunLoop run_loop;
 
@@ -321,8 +313,7 @@ TEST_F(SecureChannelClientImplTest, TestListenForConnectionFromDevice_Failure) {
 TEST_F(SecureChannelClientImplTest, TestMultipleConnections) {
   auto fake_connection_attempt_1 = CallInitiateConnectionToDevice(
       test_remote_device_ref_list_[1], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
   base::RunLoop run_loop_1;
   fake_connection_attempt_1->set_on_connection_callback(
       run_loop_1.QuitClosure());
@@ -340,8 +331,7 @@ TEST_F(SecureChannelClientImplTest, TestMultipleConnections) {
 
   auto fake_connection_attempt_2 = CallListenForConnectionFromDevice(
       test_remote_device_ref_list_[2], test_remote_device_ref_list_[0],
-      "feature", ConnectionMedium::kBluetoothLowEnergy,
-      ConnectionPriority::kLow);
+      "feature", ConnectionPriority::kLow);
   base::RunLoop run_loop_2;
   fake_connection_attempt_2->set_on_connection_callback(
       run_loop_2.QuitClosure());