Remove usage of singleton software_slot_ in nss on ChromeOS

chromeos/tpm_token_loader.h

 // 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.
 
 #ifndef CHROMEOS_TPM_TOKEN_LOADER_H_
 #define CHROMEOS_TPM_TOKEN_LOADER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 63 matching lines @@
  private:
   explicit TPMTokenLoader(bool for_test);
   virtual ~TPMTokenLoader();
 
   // Starts tpm token initialization if the user is logged in and the crypto
   // task runner is set.
   void MaybeStartTokenInitialization();
 
   // This is the cyclic chain of callbacks to initialize the TPM token.
   void ContinueTokenInitialization();
-  void OnPersistentNSSDBOpened();
+  void OnTPMTokenEnabledForNSS();
   void OnTpmIsEnabled(DBusMethodCallStatus call_status,
                       bool tpm_is_enabled);
   void OnPkcs11IsTpmTokenReady(DBusMethodCallStatus call_status,
                                bool is_tpm_token_ready);
   void OnPkcs11GetTpmTokenInfo(DBusMethodCallStatus call_status,
                                const std::string& token_name,
                                const std::string& user_pin,
                                int token_slot_id);
   void OnTPMTokenInitialized(bool success);
 
   // If token initialization step fails (e.g. if tpm token is not yet ready)
   // schedules the initialization step retry attempt after a timeout.
   void RetryTokenInitializationLater();
 
   // Notifies observers that the TPM token is ready.
   void NotifyTPMTokenReady();
 
   // LoginState::Observer
   virtual void LoggedInStateChanged() OVERRIDE;
 
   bool initialized_for_test_;
 
   ObserverList<Observer> observers_;
 
   // The states are traversed in this order but some might get omitted or never
   // be left.
   enum TPMTokenState {
     TPM_STATE_UNKNOWN,
     TPM_INITIALIZATION_STARTED,
-    TPM_DB_OPENED,
+    TPM_TOKEN_ENABLED_FOR_NSS,
     TPM_DISABLED,
     TPM_ENABLED,
     TPM_TOKEN_READY,
     TPM_TOKEN_INFO_RECEIVED,
     TPM_TOKEN_INITIALIZED,
   };
   TPMTokenState tpm_token_state_;
 
   // The current request delay before the next attempt to initialize the
   // TPM. Will be adapted after each attempt.
@@ skipping 10 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> crypto_task_runner_;
 
   base::WeakPtrFactory<TPMTokenLoader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TPMTokenLoader);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_TPM_TOKEN_LOADER_H_