Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

net/socket/ssl_client_socket_openssl.cc

Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 4c80290ae7d0e7516cdcc54a136d9b7cc4faaf98..d06f5ac48a67fd0e282b820a0269ed53e78aef18 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -513,7 +513,7 @@ void SSLClientSocketOpenSSL::Disconnect() {
   channel_id_sent_ = false;
   handshake_completed_ = false;
   certificate_verified_ = false;
-  channel_id_request_handle_.Cancel();
+  channel_id_request_.Cancel();
   ssl_failure_state_ = SSL_FAILURE_NONE;
 }
 
@@ -1031,7 +1031,7 @@ int SSLClientSocketOpenSSL::DoChannelIDLookup() {
       host_and_port_.host(), &channel_id_key_,
       base::Bind(&SSLClientSocketOpenSSL::OnHandshakeIOComplete,
                  base::Unretained(this)),
-      &channel_id_request_handle_);
+      &channel_id_request_);
 }
 
 int SSLClientSocketOpenSSL::DoChannelIDLookupComplete(int result) {