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

crypto/BUILD.gn

Index: crypto/BUILD.gn
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
index f84c4d455d6123b90f566c0fd53a5db531480849..c1eabe634c11be577e6c9d5e7af963c2f87e6e32 100644
--- a/crypto/BUILD.gn
+++ b/crypto/BUILD.gn
@@ -50,8 +50,6 @@
     "mock_apple_keychain.h",
     "mock_apple_keychain_ios.cc",
     "mock_apple_keychain_mac.cc",
-    "nss_key_util.cc",
-    "nss_key_util.h",
     "nss_util.cc",
     "nss_util.h",
     "nss_util_internal.h",
@@ -173,12 +171,10 @@
     ]
   }
 
-  # Some files are built when NSS is used at all, either for the internal crypto
-  # library or the platform certificate library.
+  # Remove nss_util when NSS is used for neither the internal crypto library
+  # nor the platform certificate library.
   if (use_openssl && !use_nss_certs) {
     sources -= [
-      "nss_key_util.cc",
-      "nss_key_util.h",
       "nss_util.cc",
       "nss_util.h",
       "nss_util_internal.h",
@@ -230,12 +226,12 @@
     "ghash_unittest.cc",
     "hkdf_unittest.cc",
     "hmac_unittest.cc",
-    "nss_key_util_unittest.cc",
     "nss_util_unittest.cc",
     "openssl_bio_string_unittest.cc",
     "p224_spake_unittest.cc",
     "p224_unittest.cc",
     "random_unittest.cc",
+    "rsa_private_key_nss_unittest.cc",
     "rsa_private_key_unittest.cc",
     "secure_hash_unittest.cc",
     "sha2_unittest.cc",
@@ -244,16 +240,15 @@
     "symmetric_key_unittest.cc",
   ]
 
-  # Some files are built when NSS is used at all, either for the internal crypto
-  # library or the platform certificate library.
+  # Remove nss_util when NSS is used for neither the internal crypto library
+  # nor the platform certificate library.
   if (use_openssl && !use_nss_certs) {
-    sources -= [
-      "nss_key_util_unittest.cc",
-      "nss_util_unittest.cc",
-    ]
-  }
-
-  if (!use_openssl) {
+    sources -= [ "nss_util_unittest.cc" ]
+  }
+
+  if (use_openssl) {
+    sources -= [ "rsa_private_key_nss_unittest.cc" ]
+  } else {
     sources -= [ "openssl_bio_string_unittest.cc" ]
   }