Remove unnecessary iOS ifdefs in NSS files.

net/cert/test_root_certs_nss.cc

 // 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.
 
 #include "net/cert/test_root_certs.h"
 
 #include <cert.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "crypto/nss_util.h"
 #include "net/cert/x509_certificate.h"
 
-#if defined(OS_IOS)
-#include "net/cert/x509_util_ios.h"
-#endif
-
 namespace net {
 
 
 TestRootCerts::TrustEntry::TrustEntry(CERTCertificate* certificate,
                                       const CERTCertTrust& trust)
     : certificate_(CERT_DupCertificate(certificate)),
       trust_(trust) {
 }
 
 TestRootCerts::TrustEntry::~TrustEntry() {
   CERT_DestroyCertificate(certificate_);
 }
 
 bool TestRootCerts::Add(X509Certificate* certificate) {
-#if defined(OS_IOS)
-  x509_util_ios::NSSCertificate nss_certificate(certificate->os_cert_handle());
-  CERTCertificate* cert_handle = nss_certificate.cert_handle();
-#else
   CERTCertificate* cert_handle = certificate->os_cert_handle();
-#endif
   // Preserve the original trust bits so that they can be restored when
   // the certificate is removed.
   CERTCertTrust original_trust;
   SECStatus rv = CERT_GetCertTrust(cert_handle, &original_trust);
   if (rv != SECSuccess) {
     // CERT_GetCertTrust will fail if the certificate does not have any
     // particular trust settings associated with it, and attempts to use
     // |original_trust| later to restore the original trust settings will not
     // cause the trust settings to be revoked. If the certificate has no
     // particular trust settings associated with it, mark the certificate as
@@ skipping 36 matching lines @@
     // occur after Clear() has been called.
     DCHECK_EQ(SECSuccess, rv) << "Cannot restore certificate trust.";
   }
   trust_cache_.clear();
 }
 
 bool TestRootCerts::IsEmpty() const {
   return trust_cache_.empty();
 }
 
-#if defined(USE_NSS_CERTS)
 bool TestRootCerts::Contains(CERTCertificate* cert) const {
   for (const auto& item : trust_cache_)
     if (X509Certificate::IsSameOSCert(cert, item->certificate()))
       return true;
 
   return false;
 }
-#endif
 
 TestRootCerts::~TestRootCerts() {
   Clear();
 }
 
 void TestRootCerts::Init() {
   crypto::EnsureNSSInit();
 }
 
 }  // namespace net