net/socket/ssl_client_socket_nss.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_nss.cc

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

Patch Set: Remove new test case and combine it with existing one 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_nss.cc

diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc

index 0fd0a06ad965801eecd1a71411821d7c2f93a4ab..baf874467b75b785ed8dbba8762485fe1041f3b8 100644

--- a/net/socket/ssl_client_socket_nss.cc

+++ b/net/socket/ssl_client_socket_nss.cc

@@ -699,7 +699,7 @@ class SSLClientSocketNSS::Core : public base::RefCountedThreadSafe<Core> {

// The service for retrieving Channel ID keys. May be NULL.

ChannelIDService* channel_id_service_;

- ChannelIDService::RequestHandle channel_id_request_handle_;

+ ChannelIDService::Request channel_id_request_;

// The information about NSS task runner.

int unhandled_buffer_size_;

@@ -954,7 +954,7 @@ void SSLClientSocketNSS::Core::Detach() {

network_handshake_state_.Reset();

- channel_id_request_handle_.Cancel();

+ channel_id_request_.Cancel();

}

int SSLClientSocketNSS::Core::Read(IOBuffer* buf, int buf_len,

@@ -2213,7 +2213,7 @@ int SSLClientSocketNSS::Core::DoGetChannelID(const std::string& host) {

int rv = channel_id_service_->GetOrCreateChannelID(

host, &channel_id_key_,

base::Bind(&Core::OnGetChannelIDComplete, base::Unretained(this)),

- &channel_id_request_handle_);

+ &channel_id_request_);

if (rv != ERR_IO_PENDING && !OnNSSTaskRunner()) {

nss_task_runner_->PostTask(

« no previous file with comments | « net/quic/crypto/channel_id_chromium.cc ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »