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

Unified Diff: chromeos/network/network_handler.cc

Issue 16512003: Configure networks requiring a certificate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update error strings Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_handler.cc
diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc
index 5eb2a87649014c88835bd890d3473fb5630d46b6..cbe059526337e122767b76f57ac5a403ea56ec88 100644
--- a/chromeos/network/network_handler.cc
+++ b/chromeos/network/network_handler.cc
@@ -46,7 +46,8 @@ void NetworkHandler::Init() {
network_state_handler_.get(),
network_profile_handler_.get(),
network_configuration_handler_.get());
- network_connection_handler_->Init(network_state_handler_.get(),
+ network_connection_handler_->Init(cert_loader_.get(),
+ network_state_handler_.get(),
network_configuration_handler_.get());
geolocation_handler_->Init();
}
@@ -59,6 +60,15 @@ void NetworkHandler::Initialize() {
}
// static
+void NetworkHandler::InitializeForTest() {
+ CHECK(!g_network_handler);
+ if (!LoginState::IsInitialized())
+ LoginState::Initialize(); // OK not to shutdown LoginState for tests.
+ g_network_handler = new NetworkHandler();
+ g_network_handler->Init();
+}
+
+// static
void NetworkHandler::Shutdown() {
CHECK(g_network_handler);
delete g_network_handler;
« no previous file with comments | « chromeos/network/network_handler.h ('k') | chromeos/network/network_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698