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

components/ownership/owner_key_util_impl.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 "components/ownership/owner_key_util_impl.h"
 
 #include <limits>
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
-
-#if defined(USE_NSS_CERTS)
-#include <keythi.h>
-#include "crypto/nss_key_util.h"
 #include "crypto/rsa_private_key.h"
-#endif
 
 namespace ownership {
 
 OwnerKeyUtilImpl::OwnerKeyUtilImpl(const base::FilePath& public_key_file)
     : public_key_file_(public_key_file) {
 }
 
 OwnerKeyUtilImpl::~OwnerKeyUtilImpl() {
 }
 
@@ skipping 25 matching lines @@
       base::ReadFile(public_key_file_,
                      reinterpret_cast<char*>(vector_as_array(output)),
                      safe_file_size);
   return data_read == safe_file_size;
 }
 
 #if defined(USE_NSS_CERTS)
 crypto::RSAPrivateKey* OwnerKeyUtilImpl::FindPrivateKeyInSlot(
     const std::vector<uint8>& key,
     PK11SlotInfo* slot) {
-  crypto::ScopedSECKEYPrivateKey private_key(
-      crypto::FindNSSKeyFromPublicKeyInfoInSlot(key, slot));
-  if (!private_key || SECKEY_GetPrivateKeyType(private_key.get()) != rsaKey)
-    return nullptr;
-#if defined(USE_OPENSSL)
-  // TODO(davidben): This assumes that crypto::RSAPrivateKey also uses NSS.
-  // https://crbug.com/478777
-  NOTIMPLEMENTED();
-  return nullptr;
-#else
-  return crypto::RSAPrivateKey::CreateFromKey(private_key.get());
-#endif
+  return crypto::RSAPrivateKey::FindFromPublicKeyInfoInSlot(key, slot);
 }
 #endif  // defined(USE_NSS_CERTS)
 
 bool OwnerKeyUtilImpl::IsPublicKeyPresent() {
   return base::PathExists(public_key_file_);
 }
 
 }  // namespace ownership