chrome/browser/extensions/extension_messages_apitest.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: chrome/browser/extensions/extension_messages_apitest.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

« no previous file with comments | « chrome/browser/extensions/api/messaging/message_property_provider.cc ('k') | net/quic/crypto/channel_id_chromium.cc » ('j') | net/ssl/channel_id_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_messages_apitest.cc

diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc

index 39c872652b5c8920b013fd8aa9f809654340a90d..6203f298a0568d984b664e3011d5defda6623868 100644

--- a/chrome/browser/extensions/extension_messages_apitest.cc

+++ b/chrome/browser/extensions/extension_messages_apitest.cc

@@ -974,13 +974,13 @@ class ExternallyConnectableMessagingWithTlsChannelIdTest :

scoped_refptr<net::URLRequestContextGetter> request_context_getter(

profile()->GetRequestContext());

scoped_ptr<crypto::ECPrivateKey> channel_id_key;

- net::ChannelIDService::RequestHandle request_handle;

+ net::ChannelIDService::Request request;

content::BrowserThread::PostTask(

content::BrowserThread::IO, FROM_HERE,

base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest::

CreateDomainBoundCertOnIOThread,

base::Unretained(this), base::Unretained(&channel_id_key),

- base::Unretained(&request_handle), request_context_getter));

+ base::Unretained(&request), request_context_getter));

tls_channel_id_created_.Wait();

// Create the expected value.

std::vector<uint8> spki_vector;

@@ -998,7 +998,7 @@ class ExternallyConnectableMessagingWithTlsChannelIdTest :

private:

void CreateDomainBoundCertOnIOThread(

scoped_ptr<crypto::ECPrivateKey>* channel_id_key,

- net::ChannelIDService::RequestHandle* request_handle,

+ net::ChannelIDService::Request* request,

scoped_refptr<net::URLRequestContextGetter> request_context_getter) {

DCHECK_CURRENTLY_ON(content::BrowserThread::IO);

net::ChannelIDService* channel_id_service =

@@ -1009,7 +1009,7 @@ class ExternallyConnectableMessagingWithTlsChannelIdTest :

base::Bind(&ExternallyConnectableMessagingWithTlsChannelIdTest::

GotDomainBoundCert,

base::Unretained(this)),

- request_handle);

+ request);

if (status == net::ERR_IO_PENDING)

return;

GotDomainBoundCert(status);