LOG(INFO) tidying in net/

net/cert/nss_cert_database_unittest.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 <cert.h>
 #include <certdb.h>
 #include <pk11pub.h>
 
 #include <algorithm>
 
@@ skipping 574 matching lines @@
                                   empty_cert_list_,
                                   &verify_result);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned_Trusted) {
   // When using CERT_PKIXVerifyCert (which we do), server trust only works from
   // 3.13.4 onwards.  See https://bugzilla.mozilla.org/show_bug.cgi?id=647364.
   if (!NSS_VersionCheck("3.13.4")) {
-    LOG(INFO) << "test skipped on NSS < 3.13.4";
+    VLOG(0) << "test skipped on NSS < 3.13.4";
     return;
   }
 
   CertificateList certs;
   ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs));
 
   NSSCertDatabase::ImportCertFailureList failed;
   EXPECT_TRUE(cert_db_->ImportServerCert(certs, NSSCertDatabase::TRUSTED_SSL,
                                          &failed));
 
@@ skipping 53 matching lines @@
                                   NULL,
                                   empty_cert_list_,
                                   &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, ImportCaAndServerCert_DistrustServer) {
   // Explicit distrust only works starting in NSS 3.13.
   if (!NSS_VersionCheck("3.13")) {
-    LOG(INFO) << "test skipped on NSS < 3.13";
+    VLOG(0) << "test skipped on NSS < 3.13";
     return;
   }
 
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "root_ca_cert.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
   // Import CA cert and trust it.
   NSSCertDatabase::ImportCertFailureList failed;
@@ skipping 73 matching lines @@
                                   "127.0.0.1",
                                   flags,
                                   NULL,
                                   empty_cert_list_,
                                   &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0U, verify_result.cert_status);
 
   // Explicit distrust only works starting in NSS 3.13.
   if (!NSS_VersionCheck("3.13")) {
-    LOG(INFO) << "test partially skipped on NSS < 3.13";
+    VLOG(0) << "test partially skipped on NSS < 3.13";
     return;
   }
 
   // Trust the root cert and distrust the intermediate.
   EXPECT_TRUE(cert_db_->SetCertTrust(
       ca_certs[0].get(), CA_CERT, NSSCertDatabase::TRUSTED_SSL));
   EXPECT_TRUE(cert_db_->SetCertTrust(
       intermediate_certs[0].get(), CA_CERT, NSSCertDatabase::DISTRUSTED_SSL));
   EXPECT_EQ(
       unsigned(CERTDB_VALID_CA | CERTDB_TRUSTED_CA | CERTDB_TRUSTED_CLIENT_CA),
@@ skipping 18 matching lines @@
                               NULL,
                               empty_cert_list_,
                               &verify_result2);
   EXPECT_EQ(ERR_CERT_REVOKED, error);
   EXPECT_EQ(CERT_STATUS_REVOKED, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa2) {
   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";
+    VLOG(0) << "Skipping test for NSS 3.14.2 - NSS 3.15";
     return;
   }
 
   NSSCertDatabase::ImportCertFailureList failed;
 
   CertificateList intermediate_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "2048-rsa-intermediate.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, intermediate_certs.size());
 
@@ skipping 39 matching lines @@
                               NULL,
                               empty_cert_list_,
                               &verify_result2);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) {
   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";
+    VLOG(0) << "Skipping test for NSS 3.14.2 - NSS 3.15";
     return;
   }
 
   NSSCertDatabase::ImportCertFailureList failed;
 
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "2048-rsa-root.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
@@ skipping 49 matching lines @@
                               NULL,
                               empty_cert_list_,
                               &verify_result2);
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error);
   EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result2.cert_status);
 }
 
 TEST_F(CertDatabaseNSSTest, TrustIntermediateCa4) {
   // Explicit distrust only works starting in NSS 3.13.
   if (!NSS_VersionCheck("3.13")) {
-    LOG(INFO) << "test skipped on NSS < 3.13";

[Ryan Sleevi, 2013/11/25 01:08:32]

and these

[scottmg, 2013/11/25 17:12:38]

Done.

+    VLOG(0) << "test skipped on NSS < 3.13";
     return;
   }
 
   NSSCertDatabase::ImportCertFailureList failed;
 
   CertificateList ca_certs = CreateCertificateListFromFile(
       GetTestCertsDirectory(), "2048-rsa-root.pem",
       X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(1U, ca_certs.size());
 
@@ skipping 90 matching lines @@
   EXPECT_EQ(NSSCertDatabase::TRUST_DEFAULT,
             cert_db_->GetCertTrust(certs2[0].get(), SERVER_CERT));
 
   new_certs = ListCertsInSlot(slot_->os_module_handle());
   ASSERT_EQ(2U, new_certs.size());
   EXPECT_STRNE(new_certs[0]->os_cert_handle()->nickname,
                new_certs[1]->os_cert_handle()->nickname);
 }
 
 }  // namespace net