net/proxy/mojo_proxy_resolver_impl.cc - Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle*

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/proxy/mojo_proxy_resolver_impl.cc

Issue 1439053002: Change ProxyResolver::GetProxyForURL() to take a scoped_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« net/proxy/mock_proxy_resolver.cc ('K') | « net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc ('k') | net/proxy/mojo_proxy_resolver_impl_unittest.cc » ('j') | net/proxy/mojo_proxy_resolver_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/proxy/mojo_proxy_resolver_impl.cc

diff --git a/net/proxy/mojo_proxy_resolver_impl.cc b/net/proxy/mojo_proxy_resolver_impl.cc

index c5ae034040bc9a1c8e030b49c11d8f9a8d9a458c..7d142b8727706c53d2014bb4ef5c86afc9a0e6f3 100644

--- a/net/proxy/mojo_proxy_resolver_impl.cc

+++ b/net/proxy/mojo_proxy_resolver_impl.cc

@@ -37,7 +37,7 @@ class MojoProxyResolverImpl::Job {

interfaces::ProxyResolverRequestClientPtr client_;

ProxyInfo result_;

GURL url_;

- net::ProxyResolver::RequestHandle request_handle_;

+ scoped_ptr<net::ProxyResolver::Request> request_;

bool done_;

DISALLOW_COPY_AND_ASSIGN(Job);

@@ -75,18 +75,14 @@ MojoProxyResolverImpl::Job::Job(

: resolver_(resolver),

client_(client.Pass()),

url_(url),

- request_handle_(nullptr),

done_(false) {}

-MojoProxyResolverImpl::Job::~Job() {

- if (request_handle_ && !done_)

- resolver_->resolver_->CancelRequest(request_handle_);

+MojoProxyResolverImpl::Job::~Job() {}

void MojoProxyResolverImpl::Job::Start() {

resolver_->resolver_->GetProxyForURL(

url_, &result_, base::Bind(&Job::GetProxyDone, base::Unretained(this)),

- &request_handle_,

+ &request_,

make_scoped_ptr(new MojoProxyResolverV8TracingBindings<

interfaces::ProxyResolverRequestClient>(client_.get())));

client_.set_connection_error_handler(base::Bind(