Revert of Don't use RSAPrivateKey in NSS integration code.

net/test/cert_test_util_nss.cc

Index: net/test/cert_test_util_nss.cc
diff --git a/net/test/cert_test_util_nss.cc b/net/test/cert_test_util_nss.cc
index 4427cebe117deb1de458b46f4bf70f63db0209a8..74884c7dd6c53117f202a7200d845e16ec0a10b7 100644
--- a/net/test/cert_test_util_nss.cc
+++ b/net/test/cert_test_util_nss.cc
@@ -9,22 +9,30 @@
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "crypto/nss_key_util.h"
 #include "crypto/nss_util.h"
-#include "crypto/scoped_nss_types.h"
+#include "crypto/rsa_private_key.h"
 #include "net/cert/cert_type.h"
 
 namespace net {
 
-bool ImportSensitiveKeyFromFile(const base::FilePath& dir,
-                                const std::string& key_filename,
-                                PK11SlotInfo* slot) {
+scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
+    const base::FilePath& dir,
+    const std::string& key_filename,
+    PK11SlotInfo* slot) {
+#if defined(USE_OPENSSL)
+  // TODO(davidben): Port RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo away
+  // from RSAPrivateKey so it doesn't make assumptions about the internal crypto
+  // library. Instead, return a ScopedSECKEYPrivateKey or have this function
+  // just return bool. https://crbug.com/478777
+  NOTIMPLEMENTED();
+  return nullptr;
+#else
   base::FilePath key_path = dir.AppendASCII(key_filename);
   std::string key_pkcs8;
   bool success = base::ReadFileToString(key_path, &key_pkcs8);
   if (!success) {
     LOG(ERROR) << "Failed to read file " << key_path.value();
-    return false;
+    return scoped_ptr<crypto::RSAPrivateKey>();
   }
 
   const uint8* key_pkcs8_begin =
@@ -32,12 +40,13 @@
   std::vector<uint8> key_vector(key_pkcs8_begin,
                                 key_pkcs8_begin + key_pkcs8.length());
 
-  crypto::ScopedSECKEYPrivateKey private_key(
-      crypto::ImportNSSKeyFromPrivateKeyInfo(slot, key_vector,
-                                             true /* permanent */));
+  scoped_ptr<crypto::RSAPrivateKey> private_key(
+      crypto::RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo(slot,
+                                                               key_vector));
   LOG_IF(ERROR, !private_key) << "Could not create key from file "
                               << key_path.value();
-  return private_key;
+  return private_key.Pass();
+#endif
 }
 
 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,