Rename ServerBoundCert => ChannelID to reflect the current name

net/socket/ssl_client_socket.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/socket/ssl_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
-#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/channel_id_service.h"
 #include "net/ssl/ssl_config_service.h"
 
 namespace net {
 
 SSLClientSocket::SSLClientSocket()
     : was_npn_negotiated_(false),
       was_spdy_negotiated_(false),
       protocol_negotiated_(kProtoUnknown),
       channel_id_sent_(false),
       signed_cert_timestamps_received_(false),
@@ skipping 130 matching lines @@
   signed_cert_timestamps_received_ = signed_cert_timestamps_received;
 }
 
 void SSLClientSocket::set_stapled_ocsp_response_received(
     bool stapled_ocsp_response_received) {
   stapled_ocsp_response_received_ = stapled_ocsp_response_received;
 }
 
 // static
 void SSLClientSocket::RecordChannelIDSupport(
-    ServerBoundCertService* server_bound_cert_service,
+    ChannelIDService* channel_id_service,
     bool negotiated_channel_id,
     bool channel_id_enabled,
     bool supports_ecc) {
   // Since this enum is used for a histogram, do not change or re-use values.
   enum {
     DISABLED = 0,
     CLIENT_ONLY = 1,
     CLIENT_AND_SERVER = 2,
     CLIENT_NO_ECC = 3,
     CLIENT_BAD_SYSTEM_TIME = 4,
-    CLIENT_NO_SERVER_BOUND_CERT_SERVICE = 5,
+    CLIENT_NO_CHANNEL_ID_SERVICE = 5,
     DOMAIN_BOUND_CERT_USAGE_MAX

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

DOMAIN_BOUND_CERT_USAGE_MAX => CHANNEL_ID_USAGE_MAX

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

Done.

   } supported = DISABLED;
   if (negotiated_channel_id) {
     supported = CLIENT_AND_SERVER;
   } else if (channel_id_enabled) {
-    if (!server_bound_cert_service)
-      supported = CLIENT_NO_SERVER_BOUND_CERT_SERVICE;
+    if (!channel_id_service)
+      supported = CLIENT_NO_CHANNEL_ID_SERVICE;
     else if (!supports_ecc)
       supported = CLIENT_NO_ECC;
-    else if (!server_bound_cert_service->IsSystemTimeValid())
+    else if (!channel_id_service->IsSystemTimeValid())
       supported = CLIENT_BAD_SYSTEM_TIME;
     else
       supported = CLIENT_ONLY;
   }
   UMA_HISTOGRAM_ENUMERATION("DomainBoundCerts.Support", supported,
                             DOMAIN_BOUND_CERT_USAGE_MAX);
 }
 
 // static
 bool SSLClientSocket::IsChannelIDEnabled(
     const SSLConfig& ssl_config,
-    ServerBoundCertService* server_bound_cert_service) {
+    ChannelIDService* channel_id_service) {
   if (!ssl_config.channel_id_enabled)
     return false;
-  if (!server_bound_cert_service) {
-    DVLOG(1) << "NULL server_bound_cert_service_, not enabling channel ID.";
+  if (!channel_id_service) {
+    DVLOG(1) << "NULL channel_id_service_, not enabling channel ID.";
     return false;
   }
   if (!crypto::ECPrivateKey::IsSupported()) {
     DVLOG(1) << "Elliptic Curve not supported, not enabling channel ID.";
     return false;
   }
-  if (!server_bound_cert_service->IsSystemTimeValid()) {
+  if (!channel_id_service->IsSystemTimeValid()) {
     DVLOG(1) << "System time is not within the supported range for certificate "
                 "generation, not enabling channel ID.";
     return false;
   }
   return true;
 }
 
 }  // namespace net