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..a81b648138ce6b93892d66d4552a69dc30dac5f9 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -51,8 +51,14 @@ class CRYPTO_EXPORT AutoSECMODListReadLock {
 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);
+
+// Returns whether TPM for ChromeOS user still needs initialization. If
+// true is returned, the caller must proceed to initialize TPM slot for the
+// user. All subsequent calls will return false.
+// |InitializeNSSForChromeOSUser| must have been called first.
+CRYPTO_EXPORT bool RequestInitializeTPMForChromeOSUser(
+    const std::string& username_hash) WARN_UNUSED_RESULT;
 
 // Use TPM slot |slot_id| for user.  InitializeNSSForChromeOSUser must have been
 // called first.