Add a histogram for measuring the number of times we fall back to common name matching, when a cert…

net/cert/x509_certificate_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 "net/cert/x509_certificate.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
@@ skipping 172 matching lines @@
   for (size_t i = 0; i < 20; ++i)
     EXPECT_EQ(webkit_fingerprint[i], fingerprint.data[i]);
 
   std::vector<std::string> dns_names;
   webkit_cert->GetDNSNames(&dns_names);
   ASSERT_EQ(2U, dns_names.size());
   EXPECT_EQ("*.webkit.org", dns_names[0]);
   EXPECT_EQ("webkit.org", dns_names[1]);
 
   // Test that the wildcard cert matches properly.
-  EXPECT_TRUE(webkit_cert->VerifyNameMatch("www.webkit.org"));
-  EXPECT_TRUE(webkit_cert->VerifyNameMatch("foo.webkit.org"));
-  EXPECT_TRUE(webkit_cert->VerifyNameMatch("webkit.org"));
-  EXPECT_FALSE(webkit_cert->VerifyNameMatch("www.webkit.com"));
-  EXPECT_FALSE(webkit_cert->VerifyNameMatch("www.foo.webkit.com"));
+  bool unused = false;
+  EXPECT_TRUE(webkit_cert->VerifyNameMatch("www.webkit.org", &unused));
+  EXPECT_TRUE(webkit_cert->VerifyNameMatch("foo.webkit.org", &unused));
+  EXPECT_TRUE(webkit_cert->VerifyNameMatch("webkit.org", &unused));
+  EXPECT_FALSE(webkit_cert->VerifyNameMatch("www.webkit.com", &unused));
+  EXPECT_FALSE(webkit_cert->VerifyNameMatch("www.foo.webkit.com", &unused));
 }
 
 TEST(X509CertificateTest, ThawteCertParsing) {
   scoped_refptr<X509Certificate> thawte_cert(X509Certificate::CreateFromBytes(
       reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der)));
 
   ASSERT_NE(static_cast<X509Certificate*>(NULL), thawte_cert);
 
   const CertPrincipal& subject = thawte_cert->subject();
   EXPECT_EQ("www.thawte.com", subject.common_name);
@@ skipping 924 matching lines @@
           EXPECT_GE(decimal_value, 0);
           EXPECT_LE(decimal_value, 255);
           addr_bytes.push_back(static_cast<char>(decimal_value));
         }
         ip_addressses.push_back(addr_bytes);
         ASSERT_EQ(4U, ip_addressses.back().size()) << i;
       }
     }
   }
 
+  bool unused = false;
   EXPECT_EQ(test_data.expected, X509Certificate::VerifyHostname(
-      test_data.hostname, common_name, dns_names, ip_addressses));
+      test_data.hostname, common_name, dns_names, ip_addressses, &unused));
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificateNameVerifyTest,
                         testing::ValuesIn(kNameVerifyTestData));
 
 const struct PublicKeyInfoTestData {
   const char* cert_file;
   size_t expected_bits;
   X509Certificate::PublicKeyType expected_type;
 } kPublicKeyInfoTestData[] = {
@@ skipping 32 matching lines @@
                                     &actual_type);
 
   EXPECT_EQ(data.expected_bits, actual_bits);
   EXPECT_EQ(data.expected_type, actual_type);
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificatePublicKeyInfoTest,
                         testing::ValuesIn(kPublicKeyInfoTestData));
 
 }  // namespace net