OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/network/network_connection_handler.h" | 5 #include "chromeos/network/network_connection_handler.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <memory> | 8 #include <memory> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ASSERT_TRUE(test_nssdb_.is_open()); | 94 ASSERT_TRUE(test_nssdb_.is_open()); |
95 | 95 |
96 // Use the same DB for public and private slot. | 96 // Use the same DB for public and private slot. |
97 test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS( | 97 test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS( |
98 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())), | 98 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())), |
99 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())))); | 99 crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())))); |
100 test_nsscertdb_->SetSlowTaskRunnerForTest(message_loop_.task_runner()); | 100 test_nsscertdb_->SetSlowTaskRunnerForTest(message_loop_.task_runner()); |
101 | 101 |
102 CertLoader::Initialize(); | 102 CertLoader::Initialize(); |
103 CertLoader::ForceHardwareBackedForTesting(); | 103 CertLoader::ForceHardwareBackedForTesting(); |
| 104 CertLoader::Get()->SetSlowTaskRunnerForTest(message_loop_.task_runner()); |
104 | 105 |
105 DBusThreadManager::Initialize(); | 106 DBusThreadManager::Initialize(); |
106 | 107 |
107 NetworkStateTest::SetUp(); | 108 NetworkStateTest::SetUp(); |
108 | 109 |
109 LoginState::Initialize(); | 110 LoginState::Initialize(); |
110 | 111 |
111 network_config_handler_.reset( | 112 network_config_handler_.reset( |
112 NetworkConfigurationHandler::InitializeForTest( | 113 NetworkConfigurationHandler::InitializeForTest( |
113 network_state_handler(), nullptr /* network_device_handler */)); | 114 network_state_handler(), nullptr /* network_device_handler */)); |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 Connect(kNoNetwork); | 442 Connect(kNoNetwork); |
442 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, | 443 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, |
443 GetResultAndReset()); | 444 GetResultAndReset()); |
444 | 445 |
445 EXPECT_FALSE(ConfigureService(kConfigConnectable).empty()); | 446 EXPECT_FALSE(ConfigureService(kConfigConnectable).empty()); |
446 Disconnect(kWifi0); | 447 Disconnect(kWifi0); |
447 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); | 448 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); |
448 } | 449 } |
449 | 450 |
450 } // namespace chromeos | 451 } // namespace chromeos |
OLD | NEW |