Extract ScopedTestNSSDB from nss_util.

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 e9d4870daf6bb9119e5865d7ac7205f01e1a7e60..31c119adc2c624636a12b1f107d32e4b0edbd134 100644
--- a/crypto/nss_util_internal.h
+++ b/crypto/nss_util_internal.h
@@ -21,11 +21,20 @@ class FilePath;
 
 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.