Remove NSSCertDatabase from ClientCertStoreChromeOS unittest.

net/test/cert_test_util.h

Index: net/test/cert_test_util.h
diff --git a/net/test/cert_test_util.h b/net/test/cert_test_util.h
index 31b768ae583b27f19bfa27b7760647e113d29a37..1d458b6b24ac8b02a6b9894a8fd3ed9fc99ddca4 100644
--- a/net/test/cert_test_util.h
+++ b/net/test/cert_test_util.h
@@ -11,6 +11,11 @@
 #include "net/cert/x509_cert_types.h"
 #include "net/cert/x509_certificate.h"
 
+#if defined(USE_NSS)
+#include "base/memory/scoped_ptr.h"
+#include "crypto/rsa_private_key.h"

[Ryan Sleevi, 2014/07/16 19:32:18]

Forward declare RSAPrivateKey.

The caller of this function will then include the header when they call this
function.

See http://www.chromium.org/developers/coding-style/cpp-dos-and-donts

[pneubeck (no reviews), 2014/07/16 19:49:44]

Ops. Will change.

[pneubeck (no reviews), 2014/07/17 13:26:43]

Done.

+#endif
+
 namespace base {
 class FilePath;
 }
@@ -19,8 +24,18 @@ namespace net {
 
 class EVRootCAMetadata;
 
-// Imports all of the certificates in |cert_file|, a file in |certs_dir|,
-// // into a CertificateList.
+#if defined(USE_NSS)
+// Imports a private key from file |key_filename| in |dir|. The file must
+// contain a PKCS#8 PrivateKeyInfo in DER encoding. The key is imported to
+// |slot|.
+scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
+    const base::FilePath& dir,
+    const std::string& key_filename,
+    PK11SlotInfo* slot);
+#endif
+
+// Imports all of the certificates in |cert_file|, a file in |certs_dir|, into a
+// CertificateList.
 CertificateList CreateCertificateListFromFile(const base::FilePath& certs_dir,
                                               const std::string& cert_file,
                                               int format);