Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/auto_connect_handler.h" | 5 #include "chromeos/network/auto_connect_handler.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 auto_connect_handler_.reset(new AutoConnectHandler()); | 130 auto_connect_handler_.reset(new AutoConnectHandler()); |
| 131 auto_connect_handler_->Init(client_cert_resolver_.get(), | 131 auto_connect_handler_->Init(client_cert_resolver_.get(), |
| 132 nullptr, // no connection handler | 132 nullptr, // no connection handler |
| 133 network_state_handler_.get(), | 133 network_state_handler_.get(), |
| 134 managed_config_handler_.get()); | 134 managed_config_handler_.get()); |
| 135 | 135 |
| 136 base::RunLoop().RunUntilIdle(); | 136 base::RunLoop().RunUntilIdle(); |
| 137 } | 137 } |
| 138 | 138 |
| 139 void TearDown() override { | 139 void TearDown() override { |
| 140 network_state_handler_->Shutdown(); | |
|
tbarzic
2017/02/10 22:47:48
not strictly part of this cl, but I wonder if we c
stevenjb
2017/02/10 22:50:20
Yep, we could. There are a lot of them though, so
| |
| 140 auto_connect_handler_.reset(); | 141 auto_connect_handler_.reset(); |
| 141 client_cert_resolver_.reset(); | 142 client_cert_resolver_.reset(); |
| 142 managed_config_handler_.reset(); | 143 managed_config_handler_.reset(); |
| 143 network_profile_handler_.reset(); | 144 network_profile_handler_.reset(); |
| 144 network_config_handler_.reset(); | 145 network_config_handler_.reset(); |
| 145 network_state_handler_.reset(); | 146 network_state_handler_.reset(); |
| 146 CertLoader::Shutdown(); | 147 CertLoader::Shutdown(); |
| 147 LoginState::Shutdown(); | 148 LoginState::Shutdown(); |
| 148 DBusThreadManager::Shutdown(); | 149 DBusThreadManager::Shutdown(); |
| 149 } | 150 } |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 501 // Applying the user policy after login would usually trigger connecting to | 502 // Applying the user policy after login would usually trigger connecting to |
| 502 // the 'best' network. But the manual connect prevents this. | 503 // the 'best' network. But the manual connect prevents this. |
| 503 SetupPolicy(std::string(), // no network configs | 504 SetupPolicy(std::string(), // no network configs |
| 504 base::DictionaryValue(), // no global config | 505 base::DictionaryValue(), // no global config |
| 505 true); // load as user policy | 506 true); // load as user policy |
| 506 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0")); | 507 EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0")); |
| 507 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1")); | 508 EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1")); |
| 508 } | 509 } |
| 509 | 510 |
| 510 } // namespace chromeos | 511 } // namespace chromeos |
| OLD | NEW |