Rename ServerBoundCert => ChannelID to reflect the current name

net/cert/x509_util_nss_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_util.h"
 #include "net/cert/x509_util_nss.h"
 
 #include <cert.h>
 #include <secoid.h>
 
@@ skipping 58 matching lines @@
 
   ASSERT_TRUE(ok);
   verifier.VerifyUpdate(sd.data.data,
                         sd.data.len);
 
   ok = verifier.VerifyFinal();
   EXPECT_TRUE(ok);
 }
 #endif  // !defined(OS_WIN) && !defined(OS_MACOSX)
 
-void VerifyDomainBoundCert(const std::string& domain,
-                           const std::string& der_cert) {
+void VerifyChannelID(const std::string& domain,
+                     const std::string& der_cert) {
   // Origin Bound Cert OID.
   static const char oid_string[] = "1.3.6.1.4.1.11129.2.1.6";
 
   // Create object neccessary for extension lookup call.
   SECItem extension_object = {
     siAsciiString,
     (unsigned char*)domain.data(),
     static_cast<unsigned int>(domain.size())
   };
 
@@ skipping 45 matching lines @@
 
   // Do Cleanup.
   SECITEM_FreeItem(&actual, PR_FALSE);
   PORT_FreeArena(arena, PR_FALSE);
 }
 
 }  // namespace
 
 // This test creates a domain-bound cert and an EC private key and
 // then verifies the content of the certificate.
-TEST(X509UtilNSSTest, CreateKeyAndDomainBoundCertEC) {
+TEST(X509UtilNSSTest, CreateKeyAndChannelIDEC) {
   // Create a sample ASCII weborigin.
   std::string domain = "weborigin.com";
   base::Time now = base::Time::Now();
 
   scoped_ptr<crypto::ECPrivateKey> private_key;
   std::string der_cert;
-  ASSERT_TRUE(x509_util::CreateKeyAndDomainBoundCertEC(
+  ASSERT_TRUE(x509_util::CreateKeyAndChannelIDEC(
       domain, 1,
       now,
       now + base::TimeDelta::FromDays(1),
       &private_key,
       &der_cert));
 
-  VerifyDomainBoundCert(domain, der_cert);
+  VerifyChannelID(domain, der_cert);
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX)
   // 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);
 #endif
 }
 
 }  // namespace net