Extract ScopedTestNSSDB from nss_util.

crypto/nss_util_internal.h

 // Copyright (c) 2012 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 CRYPTO_NSS_UTIL_INTERNAL_H_
 #define CRYPTO_NSS_UTIL_INTERNAL_H_
 
 #include <secmodt.h>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "crypto/crypto_export.h"
 #include "crypto/scoped_nss_types.h"
 
 namespace base {
 class FilePath;
 }
 
 // These functions return a type defined in an NSS header, and so cannot be
 // declared in nss_util.h.  Hence, they are declared here.
 
 namespace crypto {
 
+#if defined(USE_NSS)
+// Opens a user database in folder |path|. Returns the slot for the opened
+// database. Returns NULL if the database couln't be opened.

[Ryan Sleevi, 2014/07/22 01:25:32]

This is not really a "user" DB concept, and I think conflating Chrome and
ChromeOS terms.

"Opens an NSS software database in folder |path|, with the (potentially)
user-visible description |description|. Returns the slot for the opened
database, or NULL if the database could not be opened."

[pneubeck (no reviews), 2014/07/22 14:11:05]

Done.

+ScopedPK11Slot OpenUserDB(const base::FilePath& path,
+                          const std::string& description);
+
+#if !defined(OS_CHROMEOS)
 // Returns a reference to the default NSS key slot for storing persistent data.
 // Caller must release returned reference with PK11_FreeSlot.
 // TODO(mattm): this should be if !defined(OS_CHROMEOS), but some tests need to
 // be fixed first.

[Ryan Sleevi, 2014/07/22 01:25:32]

Guess you can remove lines 33-34 :)

[pneubeck (no reviews), 2014/07/22 14:11:05]

Done.

 CRYPTO_EXPORT PK11SlotInfo* GetPersistentNSSKeySlot() WARN_UNUSED_RESULT;
+#endif
+#endif
 
 // A helper class that acquires the SECMOD list read lock while the
 // AutoSECMODListReadLock is in scope.
 class CRYPTO_EXPORT AutoSECMODListReadLock {
  public:
   AutoSECMODListReadLock();
   ~AutoSECMODListReadLock();
 
  private:
   SECMODListLock* lock_;
@@ skipping 44 matching lines @@
 // loaded and |callback| is non-null, the |callback| will be run once the slot
 // is loaded.
 CRYPTO_EXPORT ScopedPK11Slot GetPrivateSlotForChromeOSUser(
     const std::string& username_hash,
     const base::Callback<void(ScopedPK11Slot)>& callback) WARN_UNUSED_RESULT;
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace crypto
 
 #endif  // CRYPTO_NSS_UTIL_INTERNAL_H_