Chromium Code Reviews| Index: chromeos/components/tether/initializer_unittest.cc |
| diff --git a/chromeos/components/tether/initializer_unittest.cc b/chromeos/components/tether/initializer_unittest.cc |
| index 614ad7805852e72e00274d8ce4c68ad3f5653c18..24241151262ddcdcf08e54eb623c24d5fc7ae56d 100644 |
| --- a/chromeos/components/tether/initializer_unittest.cc |
| +++ b/chromeos/components/tether/initializer_unittest.cc |
| @@ -10,9 +10,11 @@ |
| #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" |
| @@ -111,11 +113,13 @@ class InitializerTest : public NetworkStateTest { |
| 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; |
| } |
| @@ -158,6 +162,10 @@ TEST_F(InitializerTest, TestCreateAndDestroy) { |
| 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>); |
| @@ -170,8 +178,9 @@ TEST_F(InitializerTest, TestCreateAndDestroy) { |
| 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 |