Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(367)

Side by Side Diff: chromeos/network/network_connection_handler_unittest.cc

Issue 2689223002: Defer NetworkConfigurationHandler::CreateShillConfiguration callback (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 network_config_handler_.get(), 154 network_config_handler_.get(),
155 managed_config_handler_.get()); 155 managed_config_handler_.get());
156 network_connection_observer_.reset(new TestNetworkConnectionObserver); 156 network_connection_observer_.reset(new TestNetworkConnectionObserver);
157 network_connection_handler_->AddObserver( 157 network_connection_handler_->AddObserver(
158 network_connection_observer_.get()); 158 network_connection_observer_.get());
159 159
160 base::RunLoop().RunUntilIdle(); 160 base::RunLoop().RunUntilIdle();
161 } 161 }
162 162
163 void TearDown() override { 163 void TearDown() override {
164 network_state_handler_->Shutdown();
164 managed_config_handler_.reset(); 165 managed_config_handler_.reset();
165 network_profile_handler_.reset(); 166 network_profile_handler_.reset();
166 network_connection_handler_->RemoveObserver( 167 network_connection_handler_->RemoveObserver(
167 network_connection_observer_.get()); 168 network_connection_observer_.get());
168 network_connection_observer_.reset(); 169 network_connection_observer_.reset();
169 network_connection_handler_.reset(); 170 network_connection_handler_.reset();
170 network_config_handler_.reset(); 171 network_config_handler_.reset();
171 network_state_handler_.reset(); 172 network_state_handler_.reset();
172 CertLoader::Shutdown(); 173 CertLoader::Shutdown();
173 LoginState::Shutdown(); 174 LoginState::Shutdown();
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 Connect(kNoNetwork); 491 Connect(kNoNetwork);
491 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, 492 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed,
492 GetResultAndReset()); 493 GetResultAndReset());
493 494
494 EXPECT_TRUE(Configure(kConfigConnectable)); 495 EXPECT_TRUE(Configure(kConfigConnectable));
495 Disconnect(kWifi0); 496 Disconnect(kWifi0);
496 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); 497 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset());
497 } 498 }
498 499
499 } // namespace chromeos 500 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_configuration_handler_unittest.cc ('k') | chromeos/network/network_device_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698