Remove traces of USE_NSS_CERTS from crypto/

crypto/nss_key_util.h

 // Copyright 2015 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.
 
 #ifndef CRYPTO_NSS_KEY_UTIL_H_
 #define CRYPTO_NSS_KEY_UTIL_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 18 matching lines @@
 
 // Imports a private key from |input| into |slot|. |input| is interpreted as a
 // DER-encoded PrivateKeyInfo block from PKCS #8. Returns nullptr on error. If
 // |permanent| is true, the resulting key is permanent and is not exportable in
 // plaintext form.
 CRYPTO_EXPORT ScopedSECKEYPrivateKey
 ImportNSSKeyFromPrivateKeyInfo(PK11SlotInfo* slot,
                                const std::vector<uint8_t>& input,
                                bool permanent);
 
-#if defined(USE_NSS_CERTS)
-
 // Decodes |input| as a DER-encoded X.509 SubjectPublicKeyInfo and searches for
 // the private key half in the key database. Returns the private key on success
 // or nullptr on error.
 CRYPTO_EXPORT ScopedSECKEYPrivateKey
 FindNSSKeyFromPublicKeyInfo(const std::vector<uint8_t>& input);
 
 // Decodes |input| as a DER-encoded X.509 SubjectPublicKeyInfo and searches for
 // the private key half in the slot specified by |slot|. Returns the private key
 // on success or nullptr on error.
 CRYPTO_EXPORT ScopedSECKEYPrivateKey
 FindNSSKeyFromPublicKeyInfoInSlot(const std::vector<uint8_t>& input,
                                   PK11SlotInfo* slot);
 
-#endif  // defined(USE_NSS_CERTS)
-
 }  // namespace crypto
 
 #endif  // CRYPTO_NSS_KEY_UTIL_H_