Index: chromeos/network/network_handler.cc |
diff --git a/chromeos/network/network_handler.cc b/chromeos/network/network_handler.cc |
index 272a1de915750d4d9d82726b255e803164131fdd..7a8562f8c6c1dbe2b2987d5d7d0d544477ba4afe 100644 |
--- a/chromeos/network/network_handler.cc |
+++ b/chromeos/network/network_handler.cc |
@@ -4,9 +4,11 @@ |
#include "chromeos/network/network_handler.h" |
+#include "base/threading/worker_pool.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
#include "chromeos/network/geolocation_handler.h" |
#include "chromeos/network/managed_network_configuration_handler.h" |
+#include "chromeos/network/network_cert_migrator.h" |
#include "chromeos/network/network_configuration_handler.h" |
#include "chromeos/network/network_connection_handler.h" |
#include "chromeos/network/network_device_handler.h" |
@@ -28,6 +30,8 @@ NetworkHandler::NetworkHandler() { |
network_state_handler_.reset(new NetworkStateHandler()); |
network_device_handler_.reset(new NetworkDeviceHandler()); |
network_profile_handler_.reset(new NetworkProfileHandler()); |
+ if (CertLoader::IsInitialized()) |
+ network_cert_migrator_.reset(new NetworkCertMigrator()); |
network_configuration_handler_.reset(new NetworkConfigurationHandler()); |
managed_network_configuration_handler_.reset( |
new ManagedNetworkConfigurationHandler()); |
@@ -42,6 +46,8 @@ NetworkHandler::~NetworkHandler() { |
void NetworkHandler::Init() { |
network_state_handler_->InitShillPropertyHandler(); |
network_profile_handler_->Init(network_state_handler_.get()); |
+ if (network_cert_migrator_) |
+ network_cert_migrator_->Init(network_state_handler_.get()); |
network_configuration_handler_->Init(network_state_handler_.get()); |
managed_network_configuration_handler_->Init( |
network_state_handler_.get(), |