Remove usage of singleton software_slot_ in nss on ChromeOS

crypto/nss_util_internal.h

Index: crypto/nss_util_internal.h
diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h
index 262a59a1ba93fa059a0fd8bb2bb61bb49fcbfaf5..f8c852cb02cdd7bbf27c80f4d9e08df682ec9685 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -47,12 +47,16 @@ class CRYPTO_EXPORT AutoSECMODListReadLock {
 
 #if defined(OS_CHROMEOS)
 // Prepare per-user NSS slot mapping. It is safe to call this function multiple
-// times. Returns true if the user was added, or false if it already existed.
+// times. If |provisional| is set, the user's mapping and public NSS slot will
+// get initialized, but another |InitializeNSSForChromeOSUser| call will be
+// required before the mapping becomes usable.
+// Returns true if the user was added or confimed, false if it already

[Ryan Sleevi, 2014/07/01 18:51:33]

typo: confirmed?

+// existed and was not provisional.
 CRYPTO_EXPORT bool InitializeNSSForChromeOSUser(
     const std::string& email,
     const std::string& username_hash,
-    bool is_primary_user,
-    const base::FilePath& path) WARN_UNUSED_RESULT;
+    const base::FilePath& path,
+    bool provisional) WARN_UNUSED_RESULT;
 
 // Use TPM slot |slot_id| for user.  InitializeNSSForChromeOSUser must have been
 // called first.