Use user specific NSSDatabase in CertLoader.

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 17 matching lines @@
 // should all be called from the UI thread. When the TPM token is loaded,
 // or if the TPM should stay disabled for the session, the observers are
 // notified using |OnTPMTokenReady|.
 class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {
  public:
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called when the TPM token initialization is done or the case where TPM
-    // should stay disabled is detected (e.g. on guest login). If TPM is
-    // disabled, |tpm_user_pin|, |tpm_token_name| and |tpm_token_slot_id| will
-    // not be set.
-    virtual void OnTPMTokenReady(const std::string& tpm_user_pin,
-                                 const std::string& tpm_token_name,
-                                 int tpm_token_slot_id) = 0;
+    // should stay disabled is detected (e.g. on guest login).
+    virtual void OnTPMTokenReady() = 0;
   };
 
   // Sets the global instance. Must be called before any calls to Get().
   // The global instance will immediately start observing |LoginState|.
   static void Initialize();
 
   // Destroys the global instance.
   static void Shutdown();
 
   // Gets the global instance. Initialize() must be called before this.
@@ skipping 13 matching lines @@
   // token loading.
   void SetCryptoTaskRunner(
       const scoped_refptr<base::SequencedTaskRunner>& crypto_task_runner);
 
   void AddObserver(TPMTokenLoader::Observer* observer);
   void RemoveObserver(TPMTokenLoader::Observer* observer);
 
   // Checks if the TPM token in ready to be used.
   bool IsTPMTokenReady() const;
 
+  std::string tpm_user_pin() const { return tpm_user_pin_; }
+
  private:
   TPMTokenLoader();
   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();
@@ skipping 51 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_