Rename ServerBoundCert => ChannelID to reflect the current name

net/cert/x509_util_openssl_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 "base/memory/scoped_ptr.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
 #include "net/cert/x509_util.h"
 #include "net/cert/x509_util_openssl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 24 matching lines @@
       d2i_PUBKEY(NULL, &pub_key_data, pub_key_len));
   ASSERT_TRUE(pub_key.get());
 
   // NOTE: X509_verify() returns 1 in case of succes, 0 or -1 on error.
   EXPECT_EQ(1, X509_verify(cert.get(), pub_key.get()));
 }
 
 // Verify the attributes of a domain-bound certificate.
 // |domain| is the bound domain name.
 // |der_cert| is the DER-encoded X.509 certificate.
-void VerifyDomainBoundCert(const std::string& domain,
+void VerifyChannelID(const std::string& domain,
                            const std::string& der_cert) {

[wtc, 2014/07/01 19:50:52]

Fix the indentation.

[Ryan Hamilton, 2014/07/21 19:12:08]

Done.

   // Origin Bound Cert OID.
   static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
   crypto::ScopedOpenSSL<ASN1_OBJECT, ASN1_OBJECT_free> oid_obj(
       OBJ_txt2obj(oid_string, 0));
   ASSERT_TRUE(oid_obj.get());
 
   const unsigned char* cert_data =
       reinterpret_cast<const unsigned char*>(der_cert.data());
   int cert_data_len = static_cast<int>(der_cert.size());
   crypto::ScopedOpenSSL<X509, X509_free> cert(
@@ skipping 48 matching lines @@
   base::Time too_late = base::Time::UnixEpoch() +
       base::TimeDelta::FromDays(kDaysFromUnixEpochToYear10000 + 1);
 
   EXPECT_FALSE(x509_util::IsSupportedValidityRange(too_old, too_old));
   EXPECT_FALSE(x509_util::IsSupportedValidityRange(too_old, now));
 
   EXPECT_FALSE(x509_util::IsSupportedValidityRange(now, too_late));
   EXPECT_FALSE(x509_util::IsSupportedValidityRange(too_late, too_late));
 }
 
-TEST(X509UtilOpenSSLTest, CreateDomainBoundCertEC) {
+TEST(X509UtilOpenSSLTest, CreateChannelIDEC) {
   // Create a sample ASCII weborigin.
   std::string domain = "weborigin.com";
   base::Time now = base::Time::Now();
 
   scoped_ptr<crypto::ECPrivateKey> private_key(
       crypto::ECPrivateKey::Create());
   std::string der_cert;
   ASSERT_TRUE(
-      x509_util::CreateDomainBoundCertEC(private_key.get(),
+      x509_util::CreateChannelIDEC(private_key.get(),
                                          x509_util::DIGEST_SHA1,
                                          domain,
                                          1,
                                          now,
                                          now + base::TimeDelta::FromDays(1),
                                          &der_cert));

[wtc, 2014/07/01 19:50:52]

Fix the indentation of the arguments.

[Ryan Hamilton, 2014/07/21 19:12:08]

Done.

 
-  VerifyDomainBoundCert(domain, der_cert);
+  VerifyChannelID(domain, der_cert);
 
   // signature_verifier_win and signature_verifier_mac can't handle EC certs.
   std::vector<uint8> spki;
   ASSERT_TRUE(private_key->ExportPublicKey(&spki));
   VerifyCertificateSignature(der_cert, spki);
 }
 
 }  // namespace net