Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: net/proxy/multi_threaded_proxy_resolver_unittest.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
Index: net/proxy/multi_threaded_proxy_resolver_unittest.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 154763adc68aeeab3e6bd636c46bae74b9a42f4d..4a98059dae303ab51f1e5acad82db07db76f6aaa 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -45,7 +45,7 @@ class MockProxyResolver : public ProxyResolver {
int GetProxyForURL(const GURL& query_url,
ProxyInfo* results,
const CompletionCallback& callback,
- RequestHandle* request,
+ scoped_ptr<Request>* request,
const BoundNetLog& net_log) override {
if (resolve_latency_ != base::TimeDelta())
base::PlatformThread::Sleep(resolve_latency_);
@@ -64,13 +64,6 @@ class MockProxyResolver : public ProxyResolver {
return request_count_++;
}
- void CancelRequest(RequestHandle request) override { NOTREACHED(); }
-
- LoadState GetLoadState(RequestHandle request) const override {
- NOTREACHED();
- return LOAD_STATE_IDLE;
- }
-
int request_count() const { return request_count_; }
void SetResolveLatency(base::TimeDelta latency) {
@@ -119,7 +112,7 @@ class BlockableProxyResolver : public MockProxyResolver {
int GetProxyForURL(const GURL& query_url,
ProxyInfo* results,
const CompletionCallback& callback,
- RequestHandle* request,
+ scoped_ptr<Request>* request,
const BoundNetLog& net_log) override {
if (should_block_) {
blocked_.Signal();
@@ -313,7 +306,7 @@ TEST_F(MultiThreadedProxyResolverTest,
factory().resolvers()[0]->Block();
// Start request 0.
- ProxyResolver::RequestHandle request0;
+ scoped_ptr<ProxyResolver::Request> request0;
TestCompletionCallback callback0;
ProxyInfo results0;
BoundTestNetLog log0;
@@ -330,7 +323,7 @@ TEST_F(MultiThreadedProxyResolverTest,
callback1.callback(), NULL, log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
- ProxyResolver::RequestHandle request2;
+ scoped_ptr<ProxyResolver::Request> request2;
TestCompletionCallback callback2;
ProxyInfo results2;
BoundTestNetLog log2;
@@ -398,7 +391,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
factory().resolvers()[0]->Block();
// Start request 0.
- ProxyResolver::RequestHandle request0;
+ scoped_ptr<ProxyResolver::Request> request0;
TestCompletionCallback callback0;
ProxyInfo results0;
rv =
@@ -417,7 +410,7 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
- ProxyResolver::RequestHandle request2;
+ scoped_ptr<ProxyResolver::Request> request2;
TestCompletionCallback callback2;
ProxyInfo results2;
rv =
@@ -432,8 +425,8 @@ TEST_F(MultiThreadedProxyResolverTest, SingleThread_CancelRequest) {
EXPECT_EQ(ERR_IO_PENDING, rv);
// Cancel request0 (inprogress) and request2 (pending).
- resolver().CancelRequest(request0);
- resolver().CancelRequest(request2);
+ request0.reset();
+ request2.reset();
// Unblock the worker thread so the requests can continue running.
factory().resolvers()[0]->Unblock();
@@ -527,7 +520,7 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
int rv;
TestCompletionCallback callback[kNumRequests];
ProxyInfo results[kNumRequests];
- ProxyResolver::RequestHandle request[kNumRequests];
+ scoped_ptr<ProxyResolver::Request> request[kNumRequests];
// Start request 0 -- this should run on thread 0 as there is nothing else
// going on right now.
@@ -602,8 +595,8 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
callback[7].callback(), &request[7],
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
- resolver().CancelRequest(request[5]);
- resolver().CancelRequest(request[6]);
+ request[5].reset();
+ request[6].reset();
EXPECT_EQ(2, callback[7].WaitForResult());
@@ -639,7 +632,7 @@ TEST_F(MultiThreadedProxyResolverTest, OneThreadBlocked) {
const int kNumRequests = 4;
TestCompletionCallback callback[kNumRequests];
ProxyInfo results[kNumRequests];
- ProxyResolver::RequestHandle request[kNumRequests];
+ scoped_ptr<ProxyResolver::Request> request[kNumRequests];
// Start a request that will block the first thread.

Powered by Google App Engine
This is Rietveld 408576698