Rename ServerBoundCert => ChannelID to reflect the current name

net/cert/x509_util_nss.cc

Index: net/cert/x509_util_nss.cc
diff --git a/net/cert/x509_util_nss.cc b/net/cert/x509_util_nss.cc
index beed9a1a984d27fd0dc500ce91f090ba0cb85331..5093e5061022c6be6b7f9060e8221c7628ce6d4b 100644
--- a/net/cert/x509_util_nss.cc
+++ b/net/cert/x509_util_nss.cc
@@ -33,14 +33,14 @@ namespace net {
 
 namespace {
 
-class DomainBoundCertOIDWrapper {
+class ChannelIDOIDWrapper {
  public:
-  static DomainBoundCertOIDWrapper* GetInstance() {
+  static ChannelIDOIDWrapper* GetInstance() {
     // Instantiated as a leaky singleton to allow the singleton to be
     // constructed on a worker thead that is not joined when a process
     // shuts down.
-    return Singleton<DomainBoundCertOIDWrapper,
-                     LeakySingletonTraits<DomainBoundCertOIDWrapper> >::get();
+    return Singleton<ChannelIDOIDWrapper,
+                     LeakySingletonTraits<ChannelIDOIDWrapper> >::get();
   }
 
   SECOidTag domain_bound_cert_oid_tag() const {
@@ -48,16 +48,16 @@ class DomainBoundCertOIDWrapper {
   }
 
  private:
-  friend struct DefaultSingletonTraits<DomainBoundCertOIDWrapper>;
+  friend struct DefaultSingletonTraits<ChannelIDOIDWrapper>;
 
-  DomainBoundCertOIDWrapper();
+  ChannelIDOIDWrapper();
 
   SECOidTag domain_bound_cert_oid_tag_;

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

Note: it is fine to not rename this member because it is referring to an
origin-bound certificate OID (object identifier).

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

Acknowledged.

 
-  DISALLOW_COPY_AND_ASSIGN(DomainBoundCertOIDWrapper);
+  DISALLOW_COPY_AND_ASSIGN(ChannelIDOIDWrapper);
 };
 
-DomainBoundCertOIDWrapper::DomainBoundCertOIDWrapper()
+ChannelIDOIDWrapper::ChannelIDOIDWrapper()
     : domain_bound_cert_oid_tag_(SEC_OID_UNKNOWN) {
   // 1.3.6.1.4.1.11129.2.1.6
   // (iso.org.dod.internet.private.enterprises.google.googleSecurity.
@@ -291,7 +291,7 @@ bool IsSupportedValidityRange(base::Time not_valid_before,
   return true;
 }
 
-bool CreateDomainBoundCertEC(crypto::ECPrivateKey* key,
+bool CreateChannelIDEC(crypto::ECPrivateKey* key,
                              DigestAlgorithm alg,
                              const std::string& domain,
                              uint32 serial_number,
@@ -338,7 +338,7 @@ bool CreateDomainBoundCertEC(crypto::ECPrivateKey* key,
   // Add the extension to the opaque handle
   if (CERT_AddExtension(
       cert_handle,
-      DomainBoundCertOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(),
+      ChannelIDOIDWrapper::GetInstance()->domain_bound_cert_oid_tag(),
       asn1_domain_string,
       PR_TRUE,
       PR_TRUE) != SECSuccess){