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

crypto/crypto.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'crypto.gypi',
@@ skipping 125 matching lines @@
               'openssl_util.cc',
               'openssl_util.h',
               'rsa_private_key_openssl.cc',
               'secure_hash_openssl.cc',
               'signature_creator_openssl.cc',
               'signature_verifier_openssl.cc',
               'symmetric_key_openssl.cc',
             ],
         },],
         [ 'use_openssl==1 and use_nss_certs==0', {
-            # Some files are built when NSS is used at all, either for the
-            # internal crypto library or the platform certificate library.
+            # NSS is used for neither the internal crypto library nor the
+            # platform certificate library.
             'sources!': [
-              'nss_key_util.cc',
-              'nss_key_util.h',
               'nss_util.cc',
               'nss_util.h',
               'nss_util_internal.h',
             ],
         },],
       ],
       'sources': [
         '<@(crypto_sources)',
       ],
     },
     {
       'target_name': 'crypto_unittests',
       'type': 'executable',
       'sources': [
         'aead_openssl_unittest.cc',
         'curve25519_unittest.cc',
         'ec_private_key_unittest.cc',
         'ec_signature_creator_unittest.cc',
         'encryptor_unittest.cc',
         'ghash_unittest.cc',
         'hkdf_unittest.cc',
         'hmac_unittest.cc',
-        'nss_key_util_unittest.cc',
         'nss_util_unittest.cc',
         'openssl_bio_string_unittest.cc',
         'p224_unittest.cc',
         'p224_spake_unittest.cc',
         'random_unittest.cc',
         'rsa_private_key_unittest.cc',
+        'rsa_private_key_nss_unittest.cc',
         'secure_hash_unittest.cc',
         'sha2_unittest.cc',
         'signature_creator_unittest.cc',
         'signature_verifier_unittest.cc',
         'symmetric_key_unittest.cc',
       ],
       'dependencies': [
         'crypto',
         'crypto_test_support',
         '../base/base.gyp:base',
@@ skipping 10 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         [ 'use_openssl == 1 and use_nss_certs == 0', {
-          # Some files are built when NSS is used at all, either for the
-          # internal crypto library or the platform certificate library.
+          # nss_util is built if NSS is used for either the internal crypto
+          # library or the platform certificate library.
           'sources!': [
-            'nss_key_util_unittest.cc',
             'nss_util_unittest.cc',
           ],
         }],
         [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
           'dependencies': [
             '../third_party/nss/nss.gyp:nspr',
           ],
         }],
         [ 'OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         }],
         [ 'use_openssl==1', {
           'dependencies': [
             '../third_party/boringssl/boringssl.gyp:boringssl',
           ],
+          'sources!': [
+            'rsa_private_key_nss_unittest.cc',
+          ],
         }, {
           'sources!': [
             'openssl_bio_string_unittest.cc',
           ],
         }],
       ],
     },
   ],
   'conditions': [
     ['OS == "win" and target_arch=="ia32"', {
@@ skipping 80 matching lines @@
             '../build/isolate.gypi',
                       ],
           'sources': [
             'crypto_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }