Don't use RSAPrivateKey in NSS integration code.

net/test/cert_test_util_nss.cc

 // Copyright 2014 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.
 
 #include "net/test/cert_test_util.h"
 
 #include <pk11pub.h>
 #include <secmodt.h>
 
 #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/rsa_private_key.h"
+#include "crypto/scoped_nss_types.h"
 #include "net/cert/cert_type.h"
 
 namespace net {
 
-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
+bool ImportSensitiveKeyFromFile(const base::FilePath& dir,
+                                const std::string& key_filename,
+                                PK11SlotInfo* slot) {
   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 scoped_ptr<crypto::RSAPrivateKey>();
+    return false;
   }
 
   const uint8* key_pkcs8_begin =
       reinterpret_cast<const uint8*>(key_pkcs8.data());
   std::vector<uint8> key_vector(key_pkcs8_begin,
                                 key_pkcs8_begin + key_pkcs8.length());
 
-  scoped_ptr<crypto::RSAPrivateKey> private_key(
-      crypto::RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo(slot,
-                                                               key_vector));
+  crypto::ScopedSECKEYPrivateKey private_key(
+      crypto::ImportNSSKeyFromPrivateKeyInfo(slot, key_vector,
+                                             true /* permanent */));
   LOG_IF(ERROR, !private_key) << "Could not create key from file "
                               << key_path.value();
-  return private_key.Pass();
-#endif
+  return private_key;
 }
 
 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,
                             PK11SlotInfo* slot) {
   std::string nickname = cert->GetDefaultNickname(USER_CERT);
   {
     crypto::AutoNSSWriteLock lock;
     SECStatus rv = PK11_ImportCert(slot,
                                    cert->os_cert_handle(),
                                    CK_INVALID_HANDLE,
@@ skipping 27 matching lines @@
   if (!ImportClientCertToSlot(cert, slot))
     return NULL;
 
   // |cert| continues to point to the original X509Certificate before the
   // import to |slot|. However this should not make a difference as NSS handles
   // state globally.
   return cert;
 }
 
 }  // namespace net