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

Unified Diff: net/proxy/proxy_resolver_v8_tracing_unittest.cc

Issue 1745133002: Revert of 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 4 years, 10 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/proxy/proxy_resolver_v8_tracing_unittest.cc

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

index b8a9dafcd36134eee5e605087ba813e6de036173..888dd18af57d30ddf26219bf0aa4b8166c4a607e 100644

--- a/net/proxy/proxy_resolver_v8_tracing_unittest.cc

+++ b/net/proxy/proxy_resolver_v8_tracing_unittest.cc

@@ -159,10 +159,9 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -186,9 +185,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://throw-an-error/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, callback.WaitForResult());

@@ -214,9 +212,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -251,9 +248,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -298,9 +294,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -351,9 +346,8 @@

TestCompletionCallback callback2;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foopy/req1"), &proxy_info,

- callback1.callback(), &req,

+ callback1.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback1.WaitForResult());

@@ -364,9 +358,8 @@

// The first request took 2 restarts, hence on g_iteration=3.

EXPECT_EQ("166.155.144.11:3", proxy_info.proxy_server().ToURI());

- scoped_ptr<ProxyResolver::Request> req2;

resolver->GetProxyForURL(GURL("http://foopy/req2"), &proxy_info,

- callback2.callback(), &req2,

+ callback2.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback2.WaitForResult());

@@ -398,9 +391,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -438,9 +430,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -470,9 +461,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -511,9 +501,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -552,9 +541,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -599,7 +587,7 @@

const size_t kNumRequests = 5;

ProxyInfo proxy_info[kNumRequests];

- scoped_ptr<ProxyResolver::Request> request[kNumRequests];

+ ProxyResolver::RequestHandle request[kNumRequests];

for (size_t i = 0; i < kNumRequests; ++i) {

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info[i],

@@ -608,7 +596,7 @@

}

for (size_t i = 0; i < kNumRequests; ++i) {

- request[i].reset();

+ resolver->CancelRequest(request[i]);

}

@@ -626,8 +614,8 @@

ProxyInfo proxy_info1;

ProxyInfo proxy_info2;

- scoped_ptr<ProxyResolver::Request> request1;

- scoped_ptr<ProxyResolver::Request> request2;

+ ProxyResolver::RequestHandle request1;

+ ProxyResolver::RequestHandle request2;

TestCompletionCallback callback;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info1,

@@ -637,7 +625,7 @@

callback.callback(), &request2,

mock_bindings.CreateBindings());

- request1.reset();

+ resolver->CancelRequest(request1);

EXPECT_EQ(OK, callback.WaitForResult());

}

@@ -655,8 +643,8 @@

ProxyInfo proxy_info1;

ProxyInfo proxy_info2;

- scoped_ptr<ProxyResolver::Request> request1;

- scoped_ptr<ProxyResolver::Request> request2;

+ ProxyResolver::RequestHandle request1;

+ ProxyResolver::RequestHandle request2;

TestCompletionCallback callback;

resolver->GetProxyForURL(GURL("http://throw-an-error/"), &proxy_info1,

@@ -665,10 +653,10 @@

// Wait until the first request has finished running on the worker thread.

// Cancel the first request, while it is running its completion task on

- // the origin thread. Reset deletes Request opject which cancels the request.

- mock_bindings.RunOnError(

- base::Bind(&scoped_ptr<ProxyResolver::Request>::reset,

- base::Unretained(&request1), nullptr));

+ // the origin thread.

+ mock_bindings.RunOnError(base::Bind(&ProxyResolverV8Tracing::CancelRequest,

+ base::Unretained(resolver.get()),

+ request1));

// Start another request, to make sure it is able to complete.

resolver->GetProxyForURL(GURL("http://i-have-no-idea-what-im-doing/"),

@@ -758,8 +746,8 @@

ProxyInfo proxy_info1;

ProxyInfo proxy_info2;

- scoped_ptr<ProxyResolver::Request> request1;

- scoped_ptr<ProxyResolver::Request> request2;

+ ProxyResolver::RequestHandle request1;

+ ProxyResolver::RequestHandle request2;

resolver->GetProxyForURL(GURL("http://foo/req1"), &proxy_info1,

base::Bind(&CrashCallback), &request1,

@@ -773,8 +761,8 @@

host_resolver.WaitUntilRequestIsReceived();

- request1.reset();

- request2.reset();

+ resolver->CancelRequest(request1);

+ resolver->CancelRequest(request2);

EXPECT_EQ(2, host_resolver.num_cancelled_requests());

@@ -783,8 +771,9 @@

// should have been cancelled.

}

-void CancelRequestAndPause(scoped_ptr<ProxyResolver::Request>* request) {

- request->reset();

+void CancelRequestAndPause(ProxyResolverV8Tracing* resolver,

+ ProxyResolver::RequestHandle request) {

+ resolver->CancelRequest(request);

// Sleep for a little bit. This makes it more likely for the worker

// thread to have returned from its call, and serves as a regression

@@ -803,13 +792,14 @@

CreateResolver(mock_bindings.CreateBindings(), "dns.js");

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> request;

+ ProxyResolver::RequestHandle request;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

base::Bind(&CrashCallback), &request,

mock_bindings.CreateBindings());

- host_resolver.SetAction(base::Bind(CancelRequestAndPause, &request));

+ host_resolver.SetAction(

+ base::Bind(CancelRequestAndPause, resolver.get(), request));

host_resolver.WaitUntilRequestIsReceived();

}

@@ -824,7 +814,7 @@

CreateResolver(mock_bindings.CreateBindings(), "dns.js");

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> request;

+ ProxyResolver::RequestHandle request;

resolver->GetProxyForURL(GURL("http://foo/"), &proxy_info,

base::Bind(&CrashCallback), &request,

@@ -834,7 +824,7 @@

// work whatever the delay is here, but it is most useful if the delay

// is large enough to allow a task to be posted back.

base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10));

- request.reset();

+ resolver->CancelRequest(request);

EXPECT_EQ(0u, host_resolver.num_resolve());

}

@@ -908,9 +898,8 @@

TestCompletionCallback callback;

ProxyInfo proxy_info;

- scoped_ptr<ProxyResolver::Request> req;

resolver->GetProxyForURL(GURL("http://foopy/req1"), &proxy_info,

- callback.callback(), &req,

+ callback.callback(), NULL,

mock_bindings.CreateBindings());

EXPECT_EQ(OK, callback.WaitForResult());

@@ -982,14 +971,13 @@

const size_t kNumResults = kNumResolvers * kNumIterations;

TestCompletionCallback callback[kNumResults];

ProxyInfo proxy_info[kNumResults];

- scoped_ptr<ProxyResolver::Request> request[kNumResults];

for (size_t i = 0; i < kNumResults; ++i) {

size_t resolver_i = i % kNumResolvers;

resolver[resolver_i]->GetProxyForURL(

- GURL("http://foo/"), &proxy_info[i], callback[i].callback(),

- &request[i], resolver_i == 3 ? mock_bindings3.CreateBindings()

- : mock_bindings0.CreateBindings());

+ GURL("http://foo/"), &proxy_info[i], callback[i].callback(), NULL,

+ resolver_i == 3 ? mock_bindings3.CreateBindings()

+ : mock_bindings0.CreateBindings());

}

// ------------------------

« no previous file with comments | « net/proxy/proxy_resolver_v8_tracing.cc ('k') | net/proxy/proxy_resolver_v8_tracing_wrapper.cc » ('j') | no next file with comments »