diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 20:12:27 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 20:12:27 +0000 |
| commit | 5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef (patch) | |
| tree | 2f8ce83b395dee893febd751f95ee4b85422c6b2 /net/proxy/single_threaded_proxy_resolver_unittest.cc | |
| parent | 3f4a48393754bd0bb8dcf6bb73241154a695dae3 (diff) | |
| download | chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.zip chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.tar.gz chromium_src-5a1d7ca44e2d11095828ec35d63fc87bd2c3dbef.tar.bz2 | |
Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing NULL in place of a const BoundNetLog&.
BUG=37421
Review URL: http://codereview.chromium.org/1783008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/single_threaded_proxy_resolver_unittest.cc')
| -rw-r--r-- | net/proxy/single_threaded_proxy_resolver_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/proxy/single_threaded_proxy_resolver_unittest.cc b/net/proxy/single_threaded_proxy_resolver_unittest.cc index b6029ee..753fcdd 100644 --- a/net/proxy/single_threaded_proxy_resolver_unittest.cc +++ b/net/proxy/single_threaded_proxy_resolver_unittest.cc @@ -178,19 +178,19 @@ TEST(SingleThreadedProxyResolverTest, Basic) { 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 @@ TEST(SingleThreadedProxyResolverTest, CancelRequest) { 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 @@ TEST(SingleThreadedProxyResolverTest, CancelRequest) { 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 @@ TEST(SingleThreadedProxyResolverTest, CancelRequestByDeleting) { 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 @@ TEST(SingleThreadedProxyResolverTest, CancelSetPacScript) { 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 @@ TEST(SingleThreadedProxyResolverTest, CancelSetPacScript) { 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. |