Remove the configuration of Tether-associated Wi-Fi networks once connectivity is lost.

chromeos/components/tether/initializer_unittest.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/initializer.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/scoped_task_environment.h"
 #include "chromeos/components/tether/active_host.h"
+#include "chromeos/components/tether/fake_managed_network_configuration_handler.h"
 #include "chromeos/components/tether/fake_notification_presenter.h"
 #include "chromeos/components/tether/host_scan_device_prioritizer.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state_test.h"
 #include "components/cryptauth/cryptauth_device_manager.h"
 #include "components/cryptauth/cryptauth_enroller.h"
 #include "components/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/cryptauth/fake_cryptauth_gcm_manager.h"
 #include "components/cryptauth/fake_cryptauth_service.h"
 #include "components/cryptauth/proto/cryptauth_api.pb.h"
 #include "components/cryptauth/secure_message_delegate.h"
@@ skipping 78 matching lines @@
     NetworkStateTest::TearDown();
     DBusThreadManager::Shutdown();
   }
 
   void InitializeAndDestroy(
       cryptauth::CryptAuthService* cryptauth_service,
       std::unique_ptr<NotificationPresenter> notification_presenter,
       PrefService* pref_service,
       ProfileOAuth2TokenService* token_service,
       NetworkStateHandler* network_state_handler,
+      ManagedNetworkConfigurationHandler* managed_network_configuration_handler,
       NetworkConnect* network_connect,
       scoped_refptr<device::BluetoothAdapter> adapter) {
-    Initializer* initializer = new Initializer(
-        cryptauth_service, std::move(notification_presenter), pref_service,
-        token_service, network_state_handler, network_connect);
+    Initializer* initializer =
+        new Initializer(cryptauth_service, std::move(notification_presenter),
+                        pref_service, token_service, network_state_handler,
+                        managed_network_configuration_handler, network_connect);
     initializer->OnBluetoothAdapterAdvertisingIntervalSet(adapter);
     delete initializer;
   }
 
   base::test::ScopedTaskEnvironment scoped_task_environment_;
 
   std::unique_ptr<TestingPrefServiceSimple> test_pref_service_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InitializerTest);
@@ skipping 22 matching lines @@
       mock_device_manager.get());
   fake_cryptauth_service->set_cryptauth_enrollment_manager(
       mock_enrollment_manager.get());
 
   std::unique_ptr<TestingPrefServiceSimple> test_pref_service =
       base::MakeUnique<TestingPrefServiceSimple>();
 
   std::unique_ptr<FakeProfileOAuth2TokenService> fake_token_service =
       base::MakeUnique<FakeProfileOAuth2TokenService>();
 
+  std::unique_ptr<ManagedNetworkConfigurationHandler>
+      managed_network_configuration_handler =
+          base::WrapUnique(new FakeManagedNetworkConfigurationHandler());

[Kyle Horimoto, 2017/04/17 20:34:53]

MakeUnique

[Ryan Hansberry, 2017/04/20 20:57:57]

Done.

+
   std::unique_ptr<MockNetworkConnect> mock_network_connect =
       base::WrapUnique(new NiceMock<MockNetworkConnect>);
 
   scoped_refptr<NiceMock<device::MockBluetoothAdapter>> mock_adapter =
       make_scoped_refptr(new NiceMock<device::MockBluetoothAdapter>());
 
   // Call an instance method of the test instead of initializing and destroying
   // here because the friend relationship between Initializer and
   // InitializerTest only applies to the class itself, not these test functions.
   InitializeAndDestroy(fake_cryptauth_service.get(),
                        base::MakeUnique<FakeNotificationPresenter>(),
                        test_pref_service_.get(), fake_token_service.get(),
-                       network_state_handler(), mock_network_connect.get(),
-                       mock_adapter);
+                       network_state_handler(),
+                       managed_network_configuration_handler.get(),
+                       mock_network_connect.get(), mock_adapter);
 }
 
 }  // namespace tether
 
 }  // namespace chromeos