Remove WasChannelIDSent and friends from SSLClientSocket.

net/socket/ssl_client_socket_openssl.h

Index: net/socket/ssl_client_socket_openssl.h
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index a166c9721dc80ee866b64b4076efbbaf33100d32..29833b9de1ef500343f5dd58f7ad92db24a2a802 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -290,8 +290,8 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // Written by the |channel_id_service_|.
   std::string channel_id_private_key_;
   std::string channel_id_cert_;
-  // True if channel ID extension was negotiated.
-  bool channel_id_xtn_negotiated_;
+  // True if a channel ID was sent.
+  bool channel_id_sent_;

[davidben, 2015/04/27 18:29:39]

Note: It's not possible to negotiate the Channel ID extension and then decline
to assert a Channel ID. This field only changes in meaning between ServerHello
and the channel ID being asserted. All the places where the field and the old
channel_id_sent bit are used should still be the same;
channel_id_xtn_negotiated_ was only queried on a successful handshake.

   // True if the initial handshake has completed.
   bool handshake_completed_;
   // True if the initial handshake's certificate has been verified.