net/socket/ssl_client_socket_openssl.cc - Issue 1149083013: Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 1149083013: Combine ChannelIDService::RequestHandle and ChannelIDServiceRequest classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ChannelIDService::Request::Cancel() now deletes ptr to Request from ChannelIDServiceJob Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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) {

« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/ssl/channel_id_service.h » ('j') | net/ssl/channel_id_service.cc » ('J')