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

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

Issue 2679423008: Defer NetworkConfigurationHandler::CreateShillConfiguration callback (Closed)
Patch Set: Fix tests 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 network_config_handler_.get(), 153 network_config_handler_.get(),
154 managed_config_handler_.get()); 154 managed_config_handler_.get());
155 network_connection_observer_.reset(new TestNetworkConnectionObserver); 155 network_connection_observer_.reset(new TestNetworkConnectionObserver);
156 network_connection_handler_->AddObserver( 156 network_connection_handler_->AddObserver(
157 network_connection_observer_.get()); 157 network_connection_observer_.get());
158 158
159 base::RunLoop().RunUntilIdle(); 159 base::RunLoop().RunUntilIdle();
160 } 160 }
161 161
162 void TearDown() override { 162 void TearDown() override {
163 network_state_handler_->Shutdown();
163 managed_config_handler_.reset(); 164 managed_config_handler_.reset();
164 network_profile_handler_.reset(); 165 network_profile_handler_.reset();
165 network_connection_handler_->RemoveObserver( 166 network_connection_handler_->RemoveObserver(
166 network_connection_observer_.get()); 167 network_connection_observer_.get());
167 network_connection_observer_.reset(); 168 network_connection_observer_.reset();
168 network_connection_handler_.reset(); 169 network_connection_handler_.reset();
169 network_config_handler_.reset(); 170 network_config_handler_.reset();
170 network_state_handler_.reset(); 171 network_state_handler_.reset();
171 CertLoader::Shutdown(); 172 CertLoader::Shutdown();
172 LoginState::Shutdown(); 173 LoginState::Shutdown();
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 Connect(kNoNetwork); 490 Connect(kNoNetwork);
490 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed, 491 EXPECT_EQ(NetworkConnectionHandler::kErrorConfigureFailed,
491 GetResultAndReset()); 492 GetResultAndReset());
492 493
493 EXPECT_TRUE(Configure(kConfigConnectable)); 494 EXPECT_TRUE(Configure(kConfigConnectable));
494 Disconnect(kWifi0); 495 Disconnect(kWifi0);
495 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset()); 496 EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset());
496 } 497 }
497 498
498 } // namespace chromeos 499 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698