Removing NSS files and USE_OPENSSL flag

net/cert/test_root_certs_unittest.cc

 // Copyright 2013 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 "base/files/file_path.h"
 #include "build/build_config.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/test_root_certs.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_NSS_VERIFIER)
+#if defined(USE_NSS_CERTS)
 #include <nss.h>
 #endif
 
 namespace net {
 
 namespace {
 
 // The local test root certificate.
 const char kRootCertificateFile[] = "root_ca_cert.pem";
 // A certificate issued by the local test root for 127.0.0.1.
@@ skipping 33 matching lines @@
   test_roots->Clear();
   EXPECT_TRUE(test_roots->IsEmpty());
 }
 
 // Test that TestRootCerts actually adds the appropriate trust status flags
 // when requested, and that the trusted status is cleared once the root is
 // removed the TestRootCerts. This test acts as a canary/sanity check for
 // the results of the rest of net_unittests, ensuring that the trust status
 // is properly being set and cleared.
 TEST(TestRootCertsTest, OverrideTrust) {
-#if defined(USE_NSS_VERIFIER)

[davidben, 2016/04/18 19:36:45]

I think this is still needed, unless we're finally past this range of versions.

[svaldez, 2016/04/18 20:21:39]

Done.

-  if (NSS_VersionCheck("3.14.2") && !NSS_VersionCheck("3.15")) {
-    // See http://bugzil.la/863947 for details
-    LOG(INFO) << "Skipping test for NSS 3.14.2 - NSS 3.15";
-    return;
-  }
-#endif
-
   TestRootCerts* test_roots = TestRootCerts::GetInstance();
   ASSERT_NE(static_cast<TestRootCerts*>(NULL), test_roots);
   EXPECT_TRUE(test_roots->IsEmpty());
 
   scoped_refptr<X509Certificate> test_cert =
       ImportCertFromFile(GetTestCertsDirectory(), kGoodCertificateFile);
   ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert.get());
 
   // Test that the good certificate fails verification, because the root
   // certificate should not yet be trusted.
@@ skipping 69 matching lines @@
   EXPECT_FALSE(test_roots->Contains(root_cert_1->os_cert_handle()));
   EXPECT_FALSE(test_roots->Contains(root_cert_2->os_cert_handle()));
 }
 #endif
 
 // TODO(rsleevi): Add tests for revocation checking via CRLs, ensuring that
 // TestRootCerts properly injects itself into the validation process. See
 // http://crbug.com/63958
 
 }  // namespace net