Call crypto::InitializeTPMToken on the IO thread

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index a5abbd1621b2192ea4ca82a2c5324ae37124d180..ef8a25cf45093e9d8602ddfb897ecda54a9b5fb2 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -304,7 +304,9 @@ class DBusServices {
 
     // Always initialize these handlers which should not conflict with
     // NetworkLibrary.
-    NetworkHandler::Initialize();
+    NetworkHandler::Initialize(
+        content::BrowserThread::GetMessageLoopProxyForThread(
+            content::BrowserThread::IO));
     CertLibrary::Initialize();
 
     // Initialize the network change notifier for Chrome OS. The network
@@ -835,6 +837,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   // trigger MergeSessionThrottle::ShouldShowMergeSessionPage, which requires
   // the UserManager to exist.
   UserManager::Destroy();
+
+  // Destroy DBus services after g_borowser_process and Ash are destroyed

[Ryan Sleevi, 2013/06/06 23:03:41]

s/borowser_process/browser_process/

[stevenjb, 2013/06/07 02:37:47]

Done.

+  // and before destroying threads.
+  dbus_services_.reset();

[Ryan Sleevi, 2013/06/06 23:03:41]

THREADING: The Chaps token implicitly relies on DBus to be able to proxy
requests to chapsd. The IO thread is where the Chaps token is added/removed. If
you shut down dbus before the IO thread, is that going to create issues? Seems
likely.

[stevenjb, 2013/06/07 02:37:47]

Does "The Chaps token" use DBusThreadManager? Can you point me to the code in
question?

That said... it probably is cleaner to finish running any tasks before we shut
down these services. Any code that uses them at that point would be flawed. I
will move this to PostDestroyThreads.

[Ryan Sleevi, 2013/06/07 23:12:43]

No clue. From the view of the network stack, the Chaps proxy is an .so we load,
so it "shouldn't" be able to reach into Chrome internals.

However, I brought it up in the event that shutting down "DBus services" means
"No DBus calls could possibly work" - which would almost certainly cause issues.

[stevenjb, 2013/06/08 02:06:50]

OK, cool, we should be fine then either way.

 }
 
 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {