Remove usage of singleton software_slot_ in nss on ChromeOS

chrome/browser/chromeos/ownership/owner_settings_service.cc

 // Copyright 2014 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/ownership/owner_settings_service.h"
 
 #include <string>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "crypto/nss_util.h"
@@ skipping 170 matching lines @@
 void OwnerSettingsService::OnTPMTokenReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
   waiting_for_tpm_token_ = false;
 
   // TPMTokenLoader initializes the TPM and NSS database which is necessary to
   // determine ownership. Force a reload once we know these are initialized.
   ReloadPrivateKey();
 }
 
 // static
+void OwnerSettingsService::IsOwnerForSafeModeAsync(
+    const std::string& user_id,
+    const std::string& user_hash,
+    const IsOwnerCallback& callback) {
+  CHECK(chromeos::LoginState::Get()->IsInSafeMode());
+
+  // Make sure NSS is initialzied and NSS DB is loaded for the user before

[pneubeck (no reviews), 2014/07/01 14:37:17]

typo: initialzied -> initialized

[tbarzic, 2014/07/01 23:55:03]

Done.

+  // serching for the owner key.

[pneubeck (no reviews), 2014/07/01 14:37:17]

typo: serching -> searching

[tbarzic, 2014/07/01 23:55:03]

Done.

+  BrowserThread::PostTaskAndReply(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(base::IgnoreResult(&crypto::InitializeNSSForChromeOSUser),
+                 user_id,
+                 user_hash,
+                 ProfileHelper::GetProfilePathByUserIdHash(user_hash),
+                 true /* provisional */),

[pneubeck (no reviews), 2014/07/01 14:37:17]

How about always initializing NSS in the parallel authenticator (e.g. in
ParallelAuthenticator::ResolveState()) instead of in the UserManager? Then we
wouldn't need this provisional flag and would always initialize the slots at the
same time.

[tbarzic, 2014/07/01 16:33:07]

The NSS is actually initialized in profile_io_data.cc. The reason I need a flag
like this is not to block initialization there.

What's initialized in UserManager is CertLoader.

+      base::Bind(&OwnerSettingsService::IsPrivateKeyExistAsync,
+                 callback));
+}
+
+// static
 void OwnerSettingsService::IsPrivateKeyExistAsync(
     const IsOwnerCallback& callback) {
   scoped_refptr<OwnerKeyUtil> owner_key_util;
   if (g_owner_key_util_for_testing)
     owner_key_util = *g_owner_key_util_for_testing;
   else
     owner_key_util = OwnerKeyUtil::Create();
   scoped_refptr<base::TaskRunner> task_runner =
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
@@ skipping 72 matching lines @@
 DeviceSettingsService* OwnerSettingsService::GetDeviceSettingsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (g_device_settings_service_for_testing)
     return g_device_settings_service_for_testing;
   if (DeviceSettingsService::IsInitialized())
     return DeviceSettingsService::Get();
   return NULL;
 }
 
 }  // namespace chromeos