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

chrome/browser/chromeos/settings/device_settings_service.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 "chrome/browser/chromeos/settings/device_settings_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/settings/owner_key_util.h"
 #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"
 #include "crypto/rsa_private_key.h"
 
 namespace em = enterprise_management;
 
 namespace {
 
 // Delay between load retries when there was a validation error.
@@ skipping 42 matching lines @@
 DeviceSettingsService* DeviceSettingsService::Get() {
   CHECK(g_device_settings_service);
   return g_device_settings_service;
 }
 
 DeviceSettingsService::DeviceSettingsService()
     : session_manager_client_(NULL),
       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(
     SessionManagerClient* session_manager_client,
     scoped_refptr<OwnerKeyUtil> owner_key_util) {
   DCHECK(session_manager_client);
   DCHECK(owner_key_util.get());
   DCHECK(!session_manager_client_);
   DCHECK(!owner_key_util_.get());
 
@@ skipping 109 matching lines @@
 
 void DeviceSettingsService::PropertyChangeComplete(bool success) {
   if (!success) {
     LOG(ERROR) << "Policy update failed.";
     return;
   }
 
   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)
     StartNextOperation();
 }
 
 void DeviceSettingsService::EnqueueLoad(bool force_key_load) {
   SessionManagerOperation* operation =
       new LoadSettingsOperation(
           base::Bind(&DeviceSettingsService::HandleCompletedOperation,
@@ skipping 96 matching lines @@
 
 ScopedTestDeviceSettingsService::ScopedTestDeviceSettingsService() {
   DeviceSettingsService::Initialize();
 }
 
 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() {
   DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos