Call crypto::InitializeTPMToken on the IO thread (Take 2)

chromeos/network/network_connection_handler_unittest.cc

 // Copyright (c) 2012 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_connection_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 34 matching lines @@
     DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()
         ->ClearServices();
     message_loop_.RunUntilIdle();
     LoginState::Initialize();
     network_state_handler_.reset(NetworkStateHandler::InitializeForTest());
     network_configuration_handler_.reset(
         NetworkConfigurationHandler::InitializeForTest(
             network_state_handler_.get()));
     network_connection_handler_.reset(new NetworkConnectionHandler);
     // TODO(stevenjb): Test integration with CertLoader using a stub or mock.
-    network_connection_handler_->Init(NULL /* cert_loader */,
-                                      network_state_handler_.get(),
+    network_connection_handler_->Init(network_state_handler_.get(),
                                       network_configuration_handler_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     network_connection_handler_.reset();
     network_configuration_handler_.reset();
     network_state_handler_.reset();
     LoginState::Shutdown();
     DBusThreadManager::Shutdown();
   }
@@ skipping 155 matching lines @@
        NetworkConnectionHandlerDisconnectFailure) {
   Connect("no-network");
   EXPECT_EQ(NetworkConnectionHandler::kErrorNotFound, GetResultAndReset());
 
   EXPECT_TRUE(Configure(kConfigConnectable));
   Disconnect("wifi0");
   EXPECT_EQ(NetworkConnectionHandler::kErrorNotConnected, GetResultAndReset());
 }
 
 }  // namespace chromeos