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

chrome/browser/chromeos/settings/device_settings_service.cc

Index: chrome/browser/chromeos/settings/device_settings_service.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_service.cc b/chrome/browser/chromeos/settings/device_settings_service.cc
index 8e6ce758768dd221721294e63e066a27ceeb62c1..14a89dda9163ad93bf9fe2abf15eeaaff2ea2c19 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
+#include "chromeos/network/network_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ -75,10 +76,14 @@ DeviceSettingsService::DeviceSettingsService()
       weak_factory_(this),
       store_status_(STORE_SUCCESS),
       load_retries_left_(kMaxLoadRetries) {
+  if (NetworkHandler::IsInitialized())

[Mattias Nissler (ping if slow), 2013/07/25 08:56:24]

I'm a bit uncomfortable about the fact that we now depend on network stuff,
where all we need is the NSSDB.

[pneubeck (no reviews), 2013/07/25 09:08:43]

CertLoader itself doesn't depend on any of the other Network classes.
To cleanup these dependencies, CertLoader could be separated from
NetworkHandler.

[stevenjb, 2013/07/25 17:02:27]

OK, I'll make CertLoader its own singleton. I agree it's a bit confusing as it
currently is.

Done.

+    NetworkHandler::Get()->cert_loader()->AddObserver(this);
 }
 
 DeviceSettingsService::~DeviceSettingsService() {
   DCHECK(pending_operations_.empty());
+  if (NetworkHandler::IsInitialized())
+    NetworkHandler::Get()->cert_loader()->RemoveObserver(this);
 }
 
 void DeviceSettingsService::SetSessionManager(
@@ -208,6 +213,14 @@ void DeviceSettingsService::PropertyChangeComplete(bool success) {
   EnsureReload(false);
 }
 
+void DeviceSettingsService::OnCertificatesLoaded(
+    const net::CertificateList& cert_list,
+    bool initial_load) {
+  // CertLoader initializes the TPM and NSS database which is necessary to
+  // determine ownership. Force a reload once we know these are initialized.
+  EnsureReload(true);
+}
+
 void DeviceSettingsService::Enqueue(SessionManagerOperation* operation) {
   pending_operations_.push_back(operation);
   if (pending_operations_.front() == operation)