Proximity Auth: Remove final kMultiDeviceApi flagging.

R=hansberry@chromium.org

Bug: 899324
Test: none
Change-Id: Ic9ea29d50b11385db9641a0d106a80b68ea0b1da
Reviewed-on: https://chromium-review.googlesource.com/c/1327417Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606949}

chromeos/components/proximity_auth/messenger_impl_unittest.cc

@@ -80,19 +80,7 @@ class ProximityAuthMessengerImplTest : public testing::Test {
  protected:
   ProximityAuthMessengerImplTest() = default;
 
-  void SetMultiDeviceApiState(bool enabled) {
-    if (enabled) {
-      scoped_feature_list_.InitAndEnableFeature(
-          chromeos::features::kMultiDeviceApi);
-    } else {
-      scoped_feature_list_.InitAndDisableFeature(
-          chromeos::features::kMultiDeviceApi);
-    }
-  }
-
   void CreateMessenger(bool is_multi_device_api_enabled) {
-    SetMultiDeviceApiState(is_multi_device_api_enabled);
-
     auto fake_channel =
         std::make_unique<chromeos::secure_channel::FakeClientChannel>();
     fake_channel_ = fake_channel.get();

chromeos/components/proximity_auth/proximity_auth_profile_pref_manager_unittest.cc

@@ -46,7 +46,6 @@ class ProximityAuthProfilePrefManagerTest : public testing::Test {
     scoped_feature_list_.InitWithFeatures(
         std::vector<base::Feature>() /* enable_features */,
         std::vector<base::Feature>{
-            chromeos::features::kMultiDeviceApi,
             chromeos::features::
                 kEnableUnifiedMultiDeviceSetup} /* disable_features */);
   }

chromeos/components/proximity_auth/proximity_auth_system_unittest.cc

@@ -169,7 +169,6 @@ class ProximityAuthSystemTest : public testing::Test {
 
   void SetMultiDeviceApi(bool enabled) {
     static const std::vector<base::Feature> kFeatures{
-        chromeos::features::kMultiDeviceApi,
         chromeos::features::kEnableUnifiedMultiDeviceSetup};
 
     scoped_feature_list_.InitWithFeatures(

chromeos/components/proximity_auth/proximity_monitor_impl_unittest.cc

@@ -109,8 +109,6 @@ class ProximityAuthProximityMonitorImplTest : public testing::Test {
   ~ProximityAuthProximityMonitorImplTest() override {}
 
   void InitializeTest(bool multidevice_flags_enabled) {
-    SetMultiDeviceApiState(multidevice_flags_enabled /* enabled */);
-
     fake_multidevice_setup_client_ = std::make_unique<
         chromeos::multidevice_setup::FakeMultiDeviceSetupClient>();
     pref_manager_ = std::make_unique<NiceMock<MockProximityAuthPrefManager>>(
@@ -128,16 +126,6 @@ class ProximityAuthProximityMonitorImplTest : public testing::Test {
         .WillByDefault(Return(kProximityThresholdPrefValue));
   }
 
-  void SetMultiDeviceApiState(bool enabled) {
-    if (enabled) {
-      scoped_feature_list_.InitAndEnableFeature(
-          chromeos::features::kMultiDeviceApi);
-    } else {
-      scoped_feature_list_.InitAndDisableFeature(
-          chromeos::features::kMultiDeviceApi);
-    }
-  }
-
   void RunPendingTasks() { task_runner_->RunPendingTasks(); }
 
   void ProvideRssi(base::Optional<int32_t> rssi) {

chromeos/components/proximity_auth/remote_device_life_cycle_impl_unittest.cc

@@ -182,16 +182,6 @@ class ProximityAuthRemoteDeviceLifeCycleImplTest
         std::move(fake_connection_attempt));
   }
 
-  void SetMultiDeviceApiState(bool enabled) {
-    if (enabled) {
-      scoped_feature_list_.InitAndEnableFeature(
-          chromeos::features::kMultiDeviceApi);
-    } else {
-      scoped_feature_list_.InitAndDisableFeature(
-          chromeos::features::kMultiDeviceApi);
-    }
-  }
-
   void StartLifeCycle() {
     EXPECT_EQ(RemoteDeviceLifeCycle::State::STOPPED, life_cycle_.GetState());
     life_cycle_.AddObserver(this);
@@ -274,7 +264,6 @@ class ProximityAuthRemoteDeviceLifeCycleImplTest
 
 TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
        MultiDeviceApiEnabled_Success) {
-  SetMultiDeviceApiState(true /* enabled */);
   CreateFakeConnectionAttempt();
 
   StartLifeCycle();
@@ -283,7 +272,6 @@ TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
 
 TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
        MultiDeviceApiEnabled_Failure) {
-  SetMultiDeviceApiState(true /* enabled */);
   CreateFakeConnectionAttempt();
 
   StartLifeCycle();
@@ -296,7 +284,6 @@ TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
 
 TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
        MultiDeviceApiEnabled_Failure_BluetoothNotPresent) {
-  SetMultiDeviceApiState(true /* enabled */);
   CreateFakeConnectionAttempt();
 
   StartLifeCycle();
@@ -308,7 +295,6 @@ TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
 
 TEST_F(ProximityAuthRemoteDeviceLifeCycleImplTest,
        MultiDeviceApiEnabled_Failure_BluetoothNotPowered) {
-  SetMultiDeviceApiState(true /* enabled */);
   CreateFakeConnectionAttempt();
 
   StartLifeCycle();

chromeos/components/proximity_auth/unlock_manager_impl_unittest.cc

@@ -201,7 +201,6 @@ class ProximityAuthUnlockManagerImplTest : public testing::Test {
 
   void SetMultiDeviceApi(bool enabled) {
     static const std::vector<base::Feature> kFeatures{
-        chromeos::features::kMultiDeviceApi,
         chromeos::features::kEnableUnifiedMultiDeviceSetup};
 
     scoped_feature_list_.InitWithFeatures(