Rename ServerBoundCert => ChannelID to reflect the current name

net/socket_stream/socket_stream.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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 613 matching lines @@
 
   // TODO(toyoshim): Check server advertisement of SPDY through the HTTP
   // Alternate-Protocol header, then switch to SPDY if SPDY is available.
   // Usually we already have a session to the SPDY server because JavaScript
   // running WebSocket itself would be served by SPDY. But, in some situation
   // (E.g. Used by Chrome Extensions or used for cross origin connection), this
   // connection might be the first one. At that time, we should check
   // Alternate-Protocol header here for ws:// or TLS NPN extension for wss:// .
 
   return context_->proxy_service()->ResolveProxy(
       proxy_url_, net::LOAD_NORMAL, &proxy_info_, io_callback_, &pac_request_,

[wtc, 2014/07/30 04:56:52]

Note to self: omit "net::".

       NULL, net_log_);
 }
 
 int SocketStream::DoResolveProxyComplete(int result) {
   pac_request_ = NULL;
   if (result != OK) {
     DVLOG(1) << "Failed to resolve proxy: " << result;
     if (delegate_)
       delegate_->OnError(this, result);
     proxy_info_.UseDirect();
@@ skipping 360 matching lines @@
     next_state_ = STATE_CLOSE;
   }
   return result;
 }
 
 int SocketStream::DoSecureProxyConnect() {
   DCHECK(factory_);
   SSLClientSocketContext ssl_context;
   ssl_context.cert_verifier = context_->cert_verifier();
   ssl_context.transport_security_state = context_->transport_security_state();
-  ssl_context.server_bound_cert_service = context_->server_bound_cert_service();
+  ssl_context.channel_id_service = context_->channel_id_service();
   scoped_ptr<StreamSocket> socket(factory_->CreateSSLClientSocket(
       connection_.Pass(),
       proxy_info_.proxy_server().host_port_pair(),
       proxy_ssl_config_,
       ssl_context));
   connection_.reset(new ClientSocketHandle);
   connection_->SetSocket(socket.Pass());
   next_state_ = STATE_SECURE_PROXY_CONNECT_COMPLETE;
   metrics_->OnCountConnectionType(SocketStreamMetrics::SECURE_PROXY_CONNECTION);
   return connection_->socket()->Connect(io_callback_);
@@ skipping 35 matching lines @@
     next_state_ = STATE_CLOSE;
   }
   return result;
 }
 
 int SocketStream::DoSSLConnect() {
   DCHECK(factory_);
   SSLClientSocketContext ssl_context;
   ssl_context.cert_verifier = context_->cert_verifier();
   ssl_context.transport_security_state = context_->transport_security_state();
-  ssl_context.server_bound_cert_service = context_->server_bound_cert_service();
+  ssl_context.channel_id_service = context_->channel_id_service();
   scoped_ptr<StreamSocket> socket(
       factory_->CreateSSLClientSocket(connection_.Pass(),
                                       HostPortPair::FromURL(url_),
                                       server_ssl_config_,
                                       ssl_context));
   connection_.reset(new ClientSocketHandle);
   connection_->SetSocket(socket.Pass());
   next_state_ = STATE_SSL_CONNECT_COMPLETE;
   metrics_->OnCountConnectionType(SocketStreamMetrics::SSL_CONNECTION);
   return connection_->socket()->Connect(io_callback_);
@@ skipping 266 matching lines @@
 
   delegate_->OnSSLCertificateError(this, ssl_info, fatal);
   return ERR_IO_PENDING;
 }
 
 CookieStore* SocketStream::cookie_store() const {
   return cookie_store_;
 }
 
 }  // namespace net