Rename USE_NSS to USE_NSS_CERTS.

net/cert/x509_util_nss.cc

 // 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.
 
 #include "net/cert/x509_util.h"
 #include "net/cert/x509_util_nss.h"
 
 #include <cert.h>  // Must be included before certdb.h
 #include <certdb.h>
 #include <cryptohi.h>
@@ skipping 176 matching lines @@
     DLOG(ERROR) << "DerSignData: " << PORT_GetError();
     return false;
   }
 
   // Save the signed result to the cert.
   cert->derCert = result;
 
   return true;
 }
 
-#if defined(USE_NSS) || defined(OS_IOS)
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 // Callback for CERT_DecodeCertPackage(), used in
 // CreateOSCertHandlesFromBytes().
 SECStatus PR_CALLBACK CollectCertsCallback(void* arg,
                                            SECItem** certs,
                                            int num_certs) {
   X509Certificate::OSCertHandles* results =
       reinterpret_cast<X509Certificate::OSCertHandles*>(arg);
 
   for (int i = 0; i < num_certs; ++i) {
     X509Certificate::OSCertHandle handle =
@@ skipping 29 matching lines @@
       const_cast<char*>(data.data()));
 
   SECStatus rv = SEC_ASN1DecodeItem(
       arena, name.get(), SEC_ASN1_GET(CERT_NameTemplate), &item);
   if (rv != SECSuccess)
     return NULL;
 
   return name.release();
 }
 
-#endif  // defined(USE_NSS) || defined(OS_IOS)
+#endif  // defined(USE_NSS_CERTS) || defined(OS_IOS)
 
 }  // namespace
 
 namespace x509_util {
 
 bool CreateSelfSignedCert(crypto::RSAPrivateKey* key,
                           DigestAlgorithm alg,
                           const std::string& subject,
                           uint32 serial_number,
                           base::Time not_valid_before,
@@ skipping 103 matching lines @@
 
   DCHECK(cert->derCert.len);
   // XXX copied from X509Certificate::GetDEREncoded
   der_cert->clear();
   der_cert->append(reinterpret_cast<char*>(cert->derCert.data),
                    cert->derCert.len);
   CERT_DestroyCertificate(cert);
   return true;
 }
 
-#if defined(USE_NSS) || defined(OS_IOS)
+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 void ParsePrincipal(CERTName* name, CertPrincipal* principal) {
 // Starting in NSS 3.15, CERTGetNameFunc takes a const CERTName* argument.
 #if NSS_VMINOR >= 15
   typedef char* (*CERTGetNameFunc)(const CERTName* name);
 #else
   typedef char* (*CERTGetNameFunc)(CERTName* name);
 #endif
 
   // TODO(jcampan): add business_category and serial_number.
   // TODO(wtc): NSS has the CERT_GetOrgName, CERT_GetOrgUnitName, and
@@ skipping 242 matching lines @@
   while (SEC_CertNicknameConflict(temp_nickname.c_str(),
                                   const_cast<SECItem*>(subject),
                                   CERT_GetDefaultCertDB())) {
     base::SStringPrintf(&new_name, "%s #%d", nickname.c_str(), index++);
     temp_nickname = token_name + new_name;
   }
 
   return new_name;
 }
 
-#endif  // defined(USE_NSS) || defined(OS_IOS)
+#endif  // defined(USE_NSS_CERTS) || defined(OS_IOS)
 
 } // namespace x509_util
 
 } // namespace net