net/proxy/single_threaded_proxy_resolver_unittest.cc - Issue 1783008: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing...

Unified Diff: net/proxy/single_threaded_proxy_resolver_unittest.cc

Issue 1783008: Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Sync Created 10 years, 8 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/single_threaded_proxy_resolver_unittest.cc

===================================================================

--- net/proxy/single_threaded_proxy_resolver_unittest.cc (revision 45843)

+++ net/proxy/single_threaded_proxy_resolver_unittest.cc (working copy)

@@ -178,19 +178,19 @@

TestCompletionCallback callback1;

ProxyInfo results1;

rv = resolver.GetProxyForURL(

- GURL("http://request1"), &results1, &callback1, NULL, NULL);

+ GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

TestCompletionCallback callback2;

ProxyInfo results2;

rv = resolver.GetProxyForURL(

- GURL("http://request2"), &results2, &callback2, NULL, NULL);

+ GURL("http://request2"), &results2, &callback2, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

TestCompletionCallback callback3;

ProxyInfo results3;

rv = resolver.GetProxyForURL(

- GURL("http://request3"), &results3, &callback3, NULL, NULL);

+ GURL("http://request3"), &results3, &callback3, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Wait for the requests to finish (they must finish in the order they were

@@ -307,7 +307,7 @@

TestCompletionCallback callback0;

ProxyInfo results0;

rv = resolver.GetProxyForURL(

- GURL("http://request0"), &results0, &callback0, &request0, NULL);

+ GURL("http://request0"), &results0, &callback0, &request0, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Wait until requests 0 reaches the worker thread.

@@ -318,20 +318,20 @@

TestCompletionCallback callback1;

ProxyInfo results1;

rv = resolver.GetProxyForURL(

- GURL("http://request1"), &results1, &callback1, NULL, NULL);

+ GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

ProxyResolver::RequestHandle request2;

TestCompletionCallback callback2;

ProxyInfo results2;

rv = resolver.GetProxyForURL(

- GURL("http://request2"), &results2, &callback2, &request2, NULL);

+ GURL("http://request2"), &results2, &callback2, &request2, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

TestCompletionCallback callback3;

ProxyInfo results3;

rv = resolver.GetProxyForURL(

- GURL("http://request3"), &results3, &callback3, NULL, NULL);

+ GURL("http://request3"), &results3, &callback3, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Cancel request0 (inprogress) and request2 (pending).

@@ -376,19 +376,19 @@

TestCompletionCallback callback0;

ProxyInfo results0;

rv = resolver->GetProxyForURL(

- GURL("http://request0"), &results0, &callback0, NULL, NULL);

+ GURL("http://request0"), &results0, &callback0, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

TestCompletionCallback callback1;

ProxyInfo results1;

rv = resolver->GetProxyForURL(

- GURL("http://request1"), &results1, &callback1, NULL, NULL);

+ GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

TestCompletionCallback callback2;

ProxyInfo results2;

rv = resolver->GetProxyForURL(

- GURL("http://request2"), &results2, &callback2, NULL, NULL);

+ GURL("http://request2"), &results2, &callback2, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Wait until request 0 reaches the worker thread.

@@ -430,7 +430,7 @@

TestCompletionCallback callback0;

ProxyInfo results0;

rv = resolver.GetProxyForURL(

- GURL("http://request0"), &results0, &callback0, &request0, NULL);

+ GURL("http://request0"), &results0, &callback0, &request0, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Wait until requests 0 reaches the worker thread.

@@ -449,7 +449,7 @@

TestCompletionCallback callback1;

ProxyInfo results1;

rv = resolver.GetProxyForURL(

- GURL("http://request1"), &results1, &callback1, NULL, NULL);

+ GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

// Unblock the worker thread so the requests can continue running.

« no previous file with comments | « net/proxy/proxy_service_unittest.cc ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »