Rename crypto/third_party/nss headers to avoid mixups.

crypto/crypto.gyp

 # Copyright (c) 2011 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,
   },
   'targets': [
     {
@@ skipping 75 matching lines @@
               'encryptor_nss.cc',
               'hmac_nss.cc',
               'nss_util.cc',
               'nss_util.h',
               'openpgp_symmetric_encryption.cc',
               'rsa_private_key_nss.cc',
               'secure_hash_default.cc',
               'signature_creator_nss.cc',
               'signature_verifier_nss.cc',
               'symmetric_key_nss.cc',
-              'third_party/nss/blapi.h',
-              'third_party/nss/blapit.h',
+              'third_party/nss/chromium-blapi.h',
+              'third_party/nss/chromium-blapit.h',
               'third_party/nss/chromium-nss.h',
+              'third_party/nss/chromium-sha256.h',
               'third_party/nss/pk11akey.cc',
-              'third_party/nss/sha256.h',
               'third_party/nss/sha512.cc',
             ],
           }, {
             'sources!': [
               'ec_private_key_openssl.cc',
               'encryptor_openssl.cc',
               'hmac_openssl.cc',
               'openssl_util.cc',
               'openssl_util.h',
               'rsa_private_key_openssl.cc',
@@ skipping 60 matching lines @@
         'signature_verifier.h',
         'signature_verifier_mac.cc',
         'signature_verifier_nss.cc',
         'signature_verifier_openssl.cc',
         'signature_verifier_win.cc',
         'symmetric_key.h',
         'symmetric_key_mac.cc',
         'symmetric_key_nss.cc',
         'symmetric_key_openssl.cc',
         'symmetric_key_win.cc',
-        'third_party/nss/blapi.h',
-        'third_party/nss/blapit.h',
+        'third_party/nss/chromium-blapi.h',
+        'third_party/nss/chromium-blapit.h',
         'third_party/nss/chromium-nss.h',
+        'third_party/nss/chromium-sha256.h',
         'third_party/nss/pk11akey.cc',
-        'third_party/nss/sha256.h',
         'third_party/nss/sha512.cc',
       ],
     },
     {
       'target_name': 'crypto_unittests',
       'type': 'executable',
       'sources': [
         # Infrastructure files.
         'run_all_unittests.cc',
 
@@ skipping 45 matching lines @@
         [ 'use_openssl==1', {
           'sources!': [
             'openpgp_symmetric_encryption_unittest.cc',
             'rsa_private_key_nss_unittest.cc',
           ],
         }],
       ],
     },
   ],
 }