| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 class NetworkConnectionHandlerTest : public testing::Test { | 56 class NetworkConnectionHandlerTest : public testing::Test { |
| 57 public: | 57 public: |
| 58 NetworkConnectionHandlerTest() | 58 NetworkConnectionHandlerTest() |
| 59 : user_("userhash"), | 59 : user_("userhash"), |
| 60 test_manager_client_(NULL), | 60 test_manager_client_(NULL), |
| 61 test_service_client_(NULL) {} | 61 test_service_client_(NULL) {} |
| 62 | 62 |
| 63 virtual ~NetworkConnectionHandlerTest() { | 63 virtual ~NetworkConnectionHandlerTest() { |
| 64 } | 64 } |
| 65 | 65 |
| 66 virtual void SetUp() OVERRIDE { | 66 virtual void SetUp() override { |
| 67 ASSERT_TRUE(user_.constructed_successfully()); | 67 ASSERT_TRUE(user_.constructed_successfully()); |
| 68 user_.FinishInit(); | 68 user_.FinishInit(); |
| 69 | 69 |
| 70 test_nssdb_.reset(new net::NSSCertDatabaseChromeOS( | 70 test_nssdb_.reset(new net::NSSCertDatabaseChromeOS( |
| 71 crypto::GetPublicSlotForChromeOSUser(user_.username_hash()), | 71 crypto::GetPublicSlotForChromeOSUser(user_.username_hash()), |
| 72 crypto::GetPrivateSlotForChromeOSUser( | 72 crypto::GetPrivateSlotForChromeOSUser( |
| 73 user_.username_hash(), | 73 user_.username_hash(), |
| 74 base::Callback<void(crypto::ScopedPK11Slot)>()))); | 74 base::Callback<void(crypto::ScopedPK11Slot)>()))); |
| 75 test_nssdb_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy()); | 75 test_nssdb_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy()); |
| 76 | 76 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 NULL /* network_device_handler */); | 114 NULL /* network_device_handler */); |
| 115 | 115 |
| 116 network_connection_handler_.reset(new NetworkConnectionHandler); | 116 network_connection_handler_.reset(new NetworkConnectionHandler); |
| 117 network_connection_handler_->Init(network_state_handler_.get(), | 117 network_connection_handler_->Init(network_state_handler_.get(), |
| 118 network_config_handler_.get(), | 118 network_config_handler_.get(), |
| 119 managed_config_handler_.get()); | 119 managed_config_handler_.get()); |
| 120 | 120 |
| 121 base::RunLoop().RunUntilIdle(); | 121 base::RunLoop().RunUntilIdle(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 virtual void TearDown() OVERRIDE { | 124 virtual void TearDown() override { |
| 125 managed_config_handler_.reset(); | 125 managed_config_handler_.reset(); |
| 126 network_profile_handler_.reset(); | 126 network_profile_handler_.reset(); |
| 127 network_connection_handler_.reset(); | 127 network_connection_handler_.reset(); |
| 128 network_config_handler_.reset(); | 128 network_config_handler_.reset(); |
| 129 network_state_handler_.reset(); | 129 network_state_handler_.reset(); |
| 130 CertLoader::Shutdown(); | 130 CertLoader::Shutdown(); |
| 131 TPMTokenLoader::Shutdown(); | 131 TPMTokenLoader::Shutdown(); |
| 132 LoginState::Shutdown(); | 132 LoginState::Shutdown(); |
| 133 DBusThreadManager::Shutdown(); | 133 DBusThreadManager::Shutdown(); |
| 134 } | 134 } |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 SetupPolicy(kPolicy, global_config, false /* load as device policy */); | 509 SetupPolicy(kPolicy, global_config, false /* load as device policy */); |
| 510 EXPECT_EQ(shill::kStateIdle, | 510 EXPECT_EQ(shill::kStateIdle, |
| 511 GetServiceStringProperty("wifi0", shill::kStateProperty)); | 511 GetServiceStringProperty("wifi0", shill::kStateProperty)); |
| 512 EXPECT_EQ(shill::kStateOnline, | 512 EXPECT_EQ(shill::kStateOnline, |
| 513 GetServiceStringProperty("wifi1", shill::kStateProperty)); | 513 GetServiceStringProperty("wifi1", shill::kStateProperty)); |
| 514 } | 514 } |
| 515 | 515 |
| 516 } // namespace chromeos | 516 } // namespace chromeos |
| 517 | 517 |
| 518 #endif | 518 #endif |
| OLD | NEW |