| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/components/tether/initializer.h" | 5 #include "chromeos/components/tether/initializer.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 protected: | 89 protected: |
| 90 InitializerTest() : NetworkStateTest() {} | 90 InitializerTest() : NetworkStateTest() {} |
| 91 ~InitializerTest() override {} | 91 ~InitializerTest() override {} |
| 92 | 92 |
| 93 void SetUp() override { | 93 void SetUp() override { |
| 94 DBusThreadManager::Initialize(); | 94 DBusThreadManager::Initialize(); |
| 95 NetworkHandler::Initialize(); | 95 NetworkHandler::Initialize(); |
| 96 NetworkStateTest::SetUp(); | 96 NetworkStateTest::SetUp(); |
| 97 | 97 |
| 98 test_pref_service_ = base::MakeUnique<TestingPrefServiceSimple>(); | 98 test_pref_service_ = base::MakeUnique<TestingPrefServiceSimple>(); |
| 99 HostScanDevicePrioritizer::RegisterPrefs(test_pref_service_->registry()); | 99 Initializer::RegisterProfilePrefs(test_pref_service_->registry()); |
| 100 ActiveHost::RegisterPrefs(test_pref_service_->registry()); | |
| 101 } | 100 } |
| 102 | 101 |
| 103 void TearDown() override { | 102 void TearDown() override { |
| 104 ShutdownNetworkState(); | 103 ShutdownNetworkState(); |
| 105 NetworkStateTest::TearDown(); | 104 NetworkStateTest::TearDown(); |
| 106 DBusThreadManager::Shutdown(); | 105 DBusThreadManager::Shutdown(); |
| 107 } | 106 } |
| 108 | 107 |
| 109 void InitializeAndDestroy( | 108 void InitializeAndDestroy( |
| 110 cryptauth::CryptAuthService* cryptauth_service, | 109 cryptauth::CryptAuthService* cryptauth_service, |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 InitializeAndDestroy(fake_cryptauth_service.get(), | 170 InitializeAndDestroy(fake_cryptauth_service.get(), |
| 172 base::MakeUnique<FakeNotificationPresenter>(), | 171 base::MakeUnique<FakeNotificationPresenter>(), |
| 173 test_pref_service_.get(), fake_token_service.get(), | 172 test_pref_service_.get(), fake_token_service.get(), |
| 174 network_state_handler(), mock_network_connect.get(), | 173 network_state_handler(), mock_network_connect.get(), |
| 175 mock_adapter); | 174 mock_adapter); |
| 176 } | 175 } |
| 177 | 176 |
| 178 } // namespace tether | 177 } // namespace tether |
| 179 | 178 |
| 180 } // namespace chromeos | 179 } // namespace chromeos |
| OLD | NEW |