Add ClientCertStoreChromeOS which only returns the certs for a given user.

BUG=302125

Review URL: https://codereview.chromium.org/112533002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241080 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 50 insertions, 1 deletions

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 5b8c6f5..571ee1f 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -31,7 +31,6 @@
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/files/scoped_temp_dir.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -470,6 +469,14 @@ class NSSInitSingleton {
 
     return chromeos_user_map_[username_hash]->GetPrivateSlot(callback);
   }
+
+  void CloseTestChromeOSUser(const std::string& username_hash) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    ChromeOSUserMap::iterator i = chromeos_user_map_.find(username_hash);
+    DCHECK(i != chromeos_user_map_.end());
+    delete i->second;
+    chromeos_user_map_.erase(i);
+  }
 #endif  // defined(OS_CHROMEOS)
 
 
@@ -983,6 +990,27 @@ bool InitializeTPMToken(int token_slot_id) {
   return g_nss_singleton.Get().InitializeTPMToken(token_slot_id);
 }
 
+ScopedTestNSSChromeOSUser::ScopedTestNSSChromeOSUser(
+    const std::string& username_hash)
+    : username_hash_(username_hash), constructed_successfully_(false) {
+  if (!temp_dir_.CreateUniqueTempDir())
+    return;
+  constructed_successfully_ =
+      InitializeNSSForChromeOSUser(username_hash,
+                                   username_hash,
+                                   false /* is_primary_user */,
+                                   temp_dir_.path());
+}
+
+ScopedTestNSSChromeOSUser::~ScopedTestNSSChromeOSUser() {
+  if (constructed_successfully_)
+    g_nss_singleton.Get().CloseTestChromeOSUser(username_hash_);
+}
+
+void ScopedTestNSSChromeOSUser::FinishInit() {
+  InitializePrivateSoftwareSlotForChromeOSUser(username_hash_);
+}
+
 bool InitializeNSSForChromeOSUser(
     const std::string& email,
     const std::string& username_hash,
diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index 4d3d3e2..cf93cb5 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/files/scoped_temp_dir.h"
 #include "crypto/crypto_export.h"
 
 namespace base {
@@ -119,6 +120,26 @@ CRYPTO_EXPORT bool IsTPMTokenReady(const base::Closure& callback)
 
 // Initialize the TPM token.  Does nothing if it is already initialized.
 CRYPTO_EXPORT bool InitializeTPMToken(int token_slot_id);
+
+// Exposed for unittests only.
+class CRYPTO_EXPORT_PRIVATE ScopedTestNSSChromeOSUser {
+ public:
+  explicit ScopedTestNSSChromeOSUser(const std::string& username_hash);
+  ~ScopedTestNSSChromeOSUser();
+
+  std::string username_hash() const { return username_hash_; }
+  bool constructed_successfully() const { return constructed_successfully_; }
+
+  // Completes initialization of user. Causes any waiting private slot callbacks
+  // to run.
+  void FinishInit();
+
+ private:
+  const std::string username_hash_;
+  base::ScopedTempDir temp_dir_;
+  bool constructed_successfully_;
+  DISALLOW_COPY_AND_ASSIGN(ScopedTestNSSChromeOSUser);
+};
 #endif
 
 // Convert a NSS PRTime value into a base::Time object.