Instant Tethering: Remove final kMultiDeviceApi flagging.

R=hansberry@chromium.org

Bug: 903991
Test: none
Change-Id: Ifdeeb97fee9a964bca4fdeaece3df139e6c7584c
Reviewed-on: https://chromium-review.googlesource.com/c/1344250
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609793}

chromeos/components/tether/asynchronous_shutdown_object_container_impl_unittest.cc

@@ -8,9 +8,7 @@
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_disconnect_tethering_request_sender.h"
 #include "chromeos/components/tether/fake_tether_host_fetcher.h"
 #include "chromeos/components/tether/tether_component_impl.h"
@@ -57,8 +55,6 @@ class AsynchronousShutdownObjectContainerImplTest : public testing::Test {
       : test_device_(cryptauth::CreateRemoteDeviceRefListForTest(1u)[0]) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     was_shutdown_callback_invoked_ = false;
 
     fake_remote_device_provider_factory_ =
@@ -107,7 +103,6 @@ class AsynchronousShutdownObjectContainerImplTest : public testing::Test {
 
   const base::test::ScopedTaskEnvironment scoped_task_environment_;
   const cryptauth::RemoteDeviceRef test_device_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<cryptauth::FakeCryptAuthService> fake_cryptauth_service_;
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;

chromeos/components/tether/connect_tethering_operation_unittest.cc

@@ -11,10 +11,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_ble_connection_manager.h"
 #include "chromeos/components/tether/message_wrapper.h"
 #include "chromeos/components/tether/mock_tether_host_response_recorder.h"
@@ -125,8 +123,6 @@ class ConnectTetheringOperationTest : public testing::Test {
         test_device_(cryptauth::CreateRemoteDeviceRefListForTest(1)[0]) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -223,7 +219,6 @@ class ConnectTetheringOperationTest : public testing::Test {
 
   const std::string connect_tethering_request_string_;
   const cryptauth::RemoteDeviceRef test_device_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/disconnect_tethering_operation_unittest.cc

@@ -9,10 +9,8 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_ble_connection_manager.h"
 #include "chromeos/components/tether/message_wrapper.h"
 #include "chromeos/components/tether/proto/tether.pb.h"
@@ -69,8 +67,6 @@ class DisconnectTetheringOperationTest : public testing::Test {
         test_device_(cryptauth::CreateRemoteDeviceRefListForTest(1)[0]) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -120,7 +116,6 @@ class DisconnectTetheringOperationTest : public testing::Test {
 
   const std::string disconnect_tethering_request_string_;
   const cryptauth::RemoteDeviceRef test_device_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/disconnect_tethering_request_sender_impl_unittest.cc

@@ -7,9 +7,7 @@
 #include <memory>
 
 #include "base/memory/ptr_util.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/disconnect_tethering_operation.h"
 #include "chromeos/components/tether/disconnect_tethering_request_sender.h"
 #include "chromeos/components/tether/fake_tether_host_fetcher.h"
@@ -103,8 +101,6 @@ class DisconnectTetheringRequestSenderTest : public testing::Test {
   ~DisconnectTetheringRequestSenderTest() override = default;
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -187,7 +183,6 @@ class DisconnectTetheringRequestSenderTest : public testing::Test {
   }
 
   const cryptauth::RemoteDeviceRefList test_devices_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/host_connection_metrics_logger_unittest.cc

@@ -7,9 +7,7 @@
 #include <memory>
 
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/simple_test_clock.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_active_host.h"
 #include "components/cryptauth/remote_device_ref.h"
 #include "components/cryptauth/remote_device_test_util.h"
@@ -117,8 +115,6 @@ class HostConnectionMetricsLoggerTest : public testing::Test {
   base::HistogramTester histogram_tester_;
   base::SimpleTestClock test_clock_;
 
-  base::test::ScopedFeatureList scoped_feature_list_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(HostConnectionMetricsLoggerTest);
 };

chromeos/components/tether/host_scan_scheduler_impl.cc

@@ -10,7 +10,6 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_clock.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/components/proximity_auth/logging/logging.h"
 #include "chromeos/network/network_handler.h"

chromeos/components/tether/host_scan_scheduler_impl_unittest.cc

@@ -9,12 +9,10 @@
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/timer/mock_timer.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_host_scanner.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ -173,8 +171,6 @@ class HostScanSchedulerImplTest : public NetworkStateTest {
   std::unique_ptr<base::HistogramTester> histogram_tester_;
 
   std::unique_ptr<HostScanSchedulerImpl> host_scan_scheduler_;
-
-  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 TEST_F(HostScanSchedulerImplTest, AttemptScanIfOffline) {

chromeos/components/tether/host_scanner_impl_unittest.cc

@@ -11,11 +11,9 @@
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/time.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/fake_connection_preserver.h"
 #include "chromeos/components/tether/fake_host_scan_cache.h"
@@ -202,8 +200,6 @@ class HostScannerImplTest : public NetworkStateTest {
   }
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     DBusThreadManager::Initialize();
     NetworkHandler::Initialize();
     NetworkStateTest::SetUp();
@@ -407,7 +403,6 @@ class HostScannerImplTest : public NetworkStateTest {
   const cryptauth::RemoteDeviceRefList test_devices_;
   const std::vector<HostScannerOperation::ScannedDeviceInfo>
       test_scanned_device_infos;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/host_scanner_operation_unittest.cc

@@ -11,11 +11,9 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/test_simple_task_runner.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_ble_connection_manager.h"
 #include "chromeos/components/tether/fake_connection_preserver.h"
 #include "chromeos/components/tether/host_scan_device_prioritizer.h"
@@ -138,8 +136,6 @@ class HostScannerOperationTest : public testing::Test {
         test_devices_(cryptauth::CreateRemoteDeviceRefListForTest(5)) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -273,7 +269,6 @@ class HostScannerOperationTest : public testing::Test {
 
   const std::string tether_availability_request_string_;
   const cryptauth::RemoteDeviceRefList test_devices_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/keep_alive_operation_unittest.cc

@@ -10,10 +10,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/fake_ble_connection_manager.h"
 #include "chromeos/components/tether/message_wrapper.h"
 #include "chromeos/components/tether/proto/tether.pb.h"
@@ -83,8 +81,6 @@ class KeepAliveOperationTest : public testing::Test {
         test_device_(cryptauth::CreateRemoteDeviceRefListForTest(1)[0]) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -118,7 +114,6 @@ class KeepAliveOperationTest : public testing::Test {
   const base::test::ScopedTaskEnvironment scoped_task_environment_;
   const std::string keep_alive_tickle_string_;
   const cryptauth::RemoteDeviceRef test_device_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/keep_alive_scheduler_unittest.cc

@@ -8,9 +8,7 @@
 #include <vector>
 
 #include "base/memory/ptr_util.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/timer/mock_timer.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/fake_active_host.h"
 #include "chromeos/components/tether/fake_host_scan_cache.h"
@@ -101,8 +99,6 @@ class KeepAliveSchedulerTest : public testing::Test {
       : test_devices_(cryptauth::CreateRemoteDeviceRefListForTest(2)) {}
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     fake_device_sync_client_ =
         std::make_unique<device_sync::FakeDeviceSyncClient>();
     fake_secure_channel_client_ =
@@ -158,7 +154,6 @@ class KeepAliveSchedulerTest : public testing::Test {
   }
 
   const cryptauth::RemoteDeviceRefList test_devices_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<device_sync::FakeDeviceSyncClient> fake_device_sync_client_;
   std::unique_ptr<secure_channel::SecureChannelClient>

chromeos/components/tether/message_transfer_operation_unittest.cc

@@ -8,7 +8,6 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/timer/mock_timer.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/message_wrapper.h"
 #include "chromeos/components/tether/proto_test_util.h"
 #include "chromeos/components/tether/timer_factory.h"

chromeos/components/tether/tether_connector_impl_unittest.cc

@@ -9,8 +9,6 @@
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/metrics/histogram_tester.h"
-#include "base/test/scoped_feature_list.h"
-#include "chromeos/chromeos_features.h"
 #include "chromeos/components/tether/connect_tethering_operation.h"
 #include "chromeos/components/tether/device_id_tether_network_guid_map.h"
 #include "chromeos/components/tether/fake_active_host.h"
@@ -143,8 +141,6 @@ class TetherConnectorImplTest : public NetworkStateTest {
   ~TetherConnectorImplTest() override = default;
 
   void SetUp() override {
-    scoped_feature_list_.InitAndDisableFeature(features::kMultiDeviceApi);
-
     DBusThreadManager::Initialize();
     NetworkStateTest::SetUp();
     network_state_handler()->SetTetherTechnologyState(
@@ -350,7 +346,6 @@ class TetherConnectorImplTest : public NetworkStateTest {
 
   std::string result_;
   base::HistogramTester histogram_tester_;
-  base::test::ScopedFeatureList scoped_feature_list_;
 
   std::unique_ptr<TetherConnectorImpl> tether_connector_;
 

chromeos/components/tether/tether_host_fetcher_impl.cc

@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "base/memory/ptr_util.h"
-#include "chromeos/chromeos_features.h"
 #include "components/cryptauth/remote_device.h"
 
 namespace chromeos {