Remove traces of USE_NSS_CERTS from crypto/

crypto/nss_key_util.cc

 // 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.
 
 #include "crypto/nss_key_util.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
+#include <secmod.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/logging.h"
 #include "crypto/nss_util.h"
-
-#if defined(USE_NSS_CERTS)
-#include <secmod.h>
 #include "crypto/nss_util_internal.h"
-#endif
 
 namespace crypto {
 
 namespace {
 
-#if defined(USE_NSS_CERTS)
-
 struct PublicKeyInfoDeleter {
   inline void operator()(CERTSubjectPublicKeyInfo* spki) {
     SECKEY_DestroySubjectPublicKeyInfo(spki);
   }
 };
 
 typedef std::unique_ptr<CERTSubjectPublicKeyInfo, PublicKeyInfoDeleter>
     ScopedPublicKeyInfo;
 
 // Decodes |input| as a SubjectPublicKeyInfo and returns a SECItem containing
@@ skipping 14 matching lines @@
     return nullptr;
 
   // See pk11_MakeIDFromPublicKey from NSS. For now, only RSA keys are
   // supported.
   if (SECKEY_GetPublicKeyType(result.get()) != rsaKey)
     return nullptr;
 
   return ScopedSECItem(PK11_MakeIDFromPubKey(&result->u.rsa.modulus));
 }
 
-#endif  // defined(USE_NSS_CERTS)
-
 }  // namespace
 
 bool GenerateRSAKeyPairNSS(PK11SlotInfo* slot,
                            uint16_t num_bits,
                            bool permanent,
                            ScopedSECKEYPublicKey* public_key,
                            ScopedSECKEYPrivateKey* private_key) {
   DCHECK(slot);
 
   PK11RSAGenParams param;
@@ skipping 37 matching lines @@
       KU_KEY_ENCIPHERMENT | KU_DATA_ENCIPHERMENT | KU_DIGITAL_SIGNATURE;
   SECKEYPrivateKey* key_raw = nullptr;
   rv = PK11_ImportDERPrivateKeyInfoAndReturnKey(
       slot, &der_private_key_info, nullptr, nullptr, permanent,
       permanent /* sensitive */, key_usage, &key_raw, nullptr);
   if (rv != SECSuccess)
     return nullptr;
   return ScopedSECKEYPrivateKey(key_raw);
 }
 
-#if defined(USE_NSS_CERTS)
-
 ScopedSECKEYPrivateKey FindNSSKeyFromPublicKeyInfo(
     const std::vector<uint8_t>& input) {
   EnsureNSSInit();
 
   ScopedSECItem cka_id(MakeIDFromSPKI(input));
   if (!cka_id)
     return nullptr;
 
   // Search all slots in all modules for the key with the given ID.
   AutoSECMODListReadLock auto_lock;
@@ skipping 20 matching lines @@
   DCHECK(slot);
 
   ScopedSECItem cka_id(MakeIDFromSPKI(input));
   if (!cka_id)
     return nullptr;
 
   return ScopedSECKEYPrivateKey(
       PK11_FindKeyByKeyID(slot, cka_id.get(), nullptr));
 }
 
-#endif  // defined(USE_NSS_CERTS)
-
 }  // namespace crypto