Call crypto::InitializeTPMToken on the IO thread

chromeos/network/network_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_handler.h"
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/cert_loader.h"
 #include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
@@ skipping 21 matching lines @@
   managed_network_configuration_handler_.reset(
       new ManagedNetworkConfigurationHandler());
   network_connection_handler_.reset(new NetworkConnectionHandler());
   geolocation_handler_.reset(new GeolocationHandler());
 }
 
 NetworkHandler::~NetworkHandler() {
   network_event_log::Shutdown();
 }
 
-void NetworkHandler::Init() {
+void NetworkHandler::Init(
+    const scoped_refptr<base::SequencedTaskRunner>& io_task_runner) {
+  cert_loader_->Init(io_task_runner);
   network_state_handler_->InitShillPropertyHandler();
   network_configuration_handler_->Init(network_state_handler_.get());
   managed_network_configuration_handler_->Init(
       network_state_handler_.get(),
       network_profile_handler_.get(),
       network_configuration_handler_.get());
   network_connection_handler_->Init(network_state_handler_.get(),
                                     network_configuration_handler_.get());
   geolocation_handler_->Init();
 }
 
 // static
-void NetworkHandler::Initialize() {
+void NetworkHandler::Initialize(
+    const scoped_refptr<base::SequencedTaskRunner>& io_task_runner) {
   CHECK(!g_network_handler);
   g_network_handler = new NetworkHandler();
-  g_network_handler->Init();
+  g_network_handler->Init(io_task_runner);
 }
 
 // static
+void NetworkHandler::InitializeForTest() {
+  CHECK(!g_network_handler);
+  g_network_handler = new NetworkHandler();
+  // For Test, run IO operations on the curent thread.
+  scoped_refptr<base::SequencedTaskRunner> io_task_runner =
+      base::MessageLoopProxy::current();
+  g_network_handler->Init(io_task_runner);
+}
+
+// static
 void NetworkHandler::Shutdown() {
   CHECK(g_network_handler);
   delete g_network_handler;
   g_network_handler = NULL;
 }
 
 // static
 NetworkHandler* NetworkHandler::Get() {
   CHECK(g_network_handler)
       << "NetworkHandler::Get() called before Initialize()";
@@ skipping 28 matching lines @@
 
 NetworkConnectionHandler* NetworkHandler::network_connection_handler() {
   return network_connection_handler_.get();
 }
 
 GeolocationHandler* NetworkHandler::geolocation_handler() {
   return geolocation_handler_.get();
 }
 
 }  // namespace chromeos