Rename ServerBoundCert => ChannelID to reflect the current name

net/socket/ssl_client_socket.h

 // 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/socket/ssl_socket.h"
 #include "net/socket/stream_socket.h"
 
 namespace net {
 
 class CertVerifier;
 class CTVerifier;
-class ServerBoundCertService;
+class ChannelIDService;
 class SSLCertRequestInfo;
 struct SSLConfig;
 class SSLInfo;
 class TransportSecurityState;
 class X509Certificate;
 
 // This struct groups together several fields which are used by various
 // classes related to SSLClientSocket.
 struct SSLClientSocketContext {
   SSLClientSocketContext()
       : cert_verifier(NULL),
-        server_bound_cert_service(NULL),
+        channel_id_service(NULL),
         transport_security_state(NULL),
         cert_transparency_verifier(NULL) {}
 
   SSLClientSocketContext(CertVerifier* cert_verifier_arg,
-                         ServerBoundCertService* server_bound_cert_service_arg,
+                         ChannelIDService* channel_id_service_arg,
                          TransportSecurityState* transport_security_state_arg,
                          CTVerifier* cert_transparency_verifier_arg,
                          const std::string& ssl_session_cache_shard_arg)
       : cert_verifier(cert_verifier_arg),
-        server_bound_cert_service(server_bound_cert_service_arg),
+        channel_id_service(channel_id_service_arg),
         transport_security_state(transport_security_state_arg),
         cert_transparency_verifier(cert_transparency_verifier_arg),
         ssl_session_cache_shard(ssl_session_cache_shard_arg) {}
 
   CertVerifier* cert_verifier;
-  ServerBoundCertService* server_bound_cert_service;
+  ChannelIDService* channel_id_service;
   TransportSecurityState* transport_security_state;
   CTVerifier* cert_transparency_verifier;
   // ssl_session_cache_shard is an opaque string that identifies a shard of the
   // SSL session cache. SSL sockets with the same ssl_session_cache_shard may
   // resume each other's SSL sessions but we'll never sessions between shards.
   const std::string ssl_session_cache_shard;
 };
 
 // A client socket that uses SSL as the transport layer.
 //
@@ skipping 54 matching lines @@
   static void ClearSessionCache();
 
   virtual bool set_was_npn_negotiated(bool negotiated);
 
   virtual bool was_spdy_negotiated() const;
 
   virtual bool set_was_spdy_negotiated(bool negotiated);
 
   virtual void set_protocol_negotiated(NextProto protocol_negotiated);
 
-  // Returns the ServerBoundCertService used by this socket, or NULL if
+  // Returns the ChannelIDService used by this socket, or NULL if
   // server bound certificates are not supported.

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

server bound certificates => channel IDs

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

Done.

-  virtual ServerBoundCertService* GetServerBoundCertService() const = 0;
+  virtual ChannelIDService* GetChannelIDService() const = 0;
 
   // Returns true if a channel ID was sent on this connection.
   // This may be useful for protocols, like SPDY, which allow the same
   // connection to be shared between multiple domains, each of which need
   // a channel ID.
   //
   // Public for ssl_client_socket_openssl_unittest.cc.
   virtual bool WasChannelIDSent() const;
 
  protected:
   virtual void set_channel_id_sent(bool channel_id_sent);
 
   virtual void set_signed_cert_timestamps_received(
       bool signed_cert_timestamps_received);
 
   virtual void set_stapled_ocsp_response_received(
       bool stapled_ocsp_response_received);
 
   // Records histograms for channel id support during full handshakes - resumed
   // handshakes are ignored.
   static void RecordChannelIDSupport(
-      ServerBoundCertService* server_bound_cert_service,
+      ChannelIDService* channel_id_service,
       bool negotiated_channel_id,
       bool channel_id_enabled,
       bool supports_ecc);
 
   // Returns whether TLS channel ID is enabled.
   static bool IsChannelIDEnabled(
       const SSLConfig& ssl_config,
-      ServerBoundCertService* server_bound_cert_service);
+      ChannelIDService* channel_id_service);
 
   // For unit testing only.
   // Returns the unverified certificate chain as presented by server.
   // Note that chain may be different than the verified chain returned by
   // StreamSocket::GetSSLInfo().
   virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
       const = 0;
 
  private:
   // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_.
@@ skipping 16 matching lines @@
   bool channel_id_sent_;
   // True if SCTs were received via a TLS extension.
   bool signed_cert_timestamps_received_;
   // True if a stapled OCSP response was received.
   bool stapled_ocsp_response_received_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_