Index: net/proxy/proxy_service_unittest.cc |
=================================================================== |
--- net/proxy/proxy_service_unittest.cc (revision 45843) |
+++ net/proxy/proxy_service_unittest.cc (working copy) |
@@ -92,8 +92,7 @@ |
TEST(ProxyServiceTest, Direct) { |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(new MockProxyConfigService, resolver, NULL, |
- BoundNetLog())); |
+ new ProxyService(new MockProxyConfigService, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
@@ -121,7 +120,7 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
@@ -168,13 +167,13 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://username:password@www.google.com/?ref#hash#hash"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -196,13 +195,13 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -224,7 +223,8 @@ |
// left to fallback to, since our proxy list was NOT terminated by |
// DIRECT. |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
// ReconsiderProxyAfterError returns error indicating nothing left. |
EXPECT_EQ(ERR_FAILED, rv); |
EXPECT_TRUE(info.is_empty()); |
@@ -253,13 +253,13 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -279,27 +279,31 @@ |
// Fallback 1. |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foobar:10", info.proxy_server().ToURI()); |
// Fallback 2. |
TestCompletionCallback callback3; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_TRUE(info.is_direct()); |
// Fallback 3. |
TestCompletionCallback callback4; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foobar:20", info.proxy_server().ToURI()); |
// Fallback 4 -- Nothing to fall back to! |
TestCompletionCallback callback5; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback5, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback5, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(ERR_FAILED, rv); |
EXPECT_TRUE(info.is_empty()); |
} |
@@ -315,13 +319,13 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
// Start first resolve request. |
GURL url("http://www.google.com/"); |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -342,7 +346,7 @@ |
// The second resolve request will try to run through the proxy resolver, |
// regardless of whether the first request failed in it. |
TestCompletionCallback callback2; |
- rv = service->ResolveProxy(url, &info, &callback2, NULL, NULL); |
+ rv = service->ResolveProxy(url, &info, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(1u, resolver->pending_requests().size()); |
@@ -368,14 +372,14 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
// Get the proxy information. |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -397,14 +401,15 @@ |
// Fake an error on the proxy. |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
// The second proxy should be specified. |
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); |
TestCompletionCallback callback3; |
- rv = service->ResolveProxy(url, &info, &callback3, NULL, NULL); |
+ rv = service->ResolveProxy(url, &info, &callback3, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(1u, resolver->pending_requests().size()); |
@@ -422,7 +427,8 @@ |
// We fake another error. It should now try the third one. |
TestCompletionCallback callback4; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); |
@@ -430,14 +436,16 @@ |
// proxy servers we thought were valid; next we try the proxy server |
// that was in our bad proxies map (foopy1:8080). |
TestCompletionCallback callback5; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback5, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback5, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
// Fake another error, the last proxy is gone, the list should now be empty, |
// so there is nothing left to try. |
TestCompletionCallback callback6; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback6, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback6, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(ERR_FAILED, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_TRUE(info.is_empty()); |
@@ -454,14 +462,14 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
// Get the proxy information. |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -483,7 +491,8 @@ |
// Fake an error on the proxy. |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
// Now we get back the second proxy. |
@@ -491,7 +500,8 @@ |
// Fake an error on this proxy as well. |
TestCompletionCallback callback3; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
// Finally, we get back DIRECT. |
@@ -499,7 +509,8 @@ |
// Now we tell the proxy service that even DIRECT failed. |
TestCompletionCallback callback4; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, |
+ BoundNetLog()); |
// There was nothing left to try after DIRECT, so we are out of |
// choices. |
EXPECT_EQ(ERR_FAILED, rv); |
@@ -514,14 +525,14 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
// Get the proxy information. |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -546,7 +557,8 @@ |
config_service->config.set_pac_url(GURL("http://foopy-new/proxy.pac")); |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy-new/proxy.pac"), |
@@ -566,7 +578,8 @@ |
// We fake another error. It should now ignore the first one. |
TestCompletionCallback callback3; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback3, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); |
@@ -576,7 +589,8 @@ |
// We fake another error. It should go back to the first proxy. |
TestCompletionCallback callback4; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback4, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy-new2/proxy.pac"), |
@@ -603,14 +617,14 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
// Get the proxy information. |
ProxyInfo info; |
TestCompletionCallback callback1; |
- int rv = service->ResolveProxy(url, &info, &callback1, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -630,7 +644,8 @@ |
// Fake a proxy error. |
TestCompletionCallback callback2; |
- rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info, &callback2, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
// The first proxy is ignored, and the second one is selected. |
@@ -640,7 +655,7 @@ |
// Fake a PAC failure. |
ProxyInfo info2; |
TestCompletionCallback callback3; |
- rv = service->ResolveProxy(url, &info2, &callback3, NULL, NULL); |
+ rv = service->ResolveProxy(url, &info2, &callback3, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(1u, resolver->pending_requests().size()); |
@@ -660,7 +675,8 @@ |
// "just work" the next time we call it. |
ProxyInfo info3; |
TestCompletionCallback callback4; |
- rv = service->ReconsiderProxyAfterError(url, &info3, &callback4, NULL, NULL); |
+ rv = service->ReconsiderProxyAfterError(url, &info3, &callback4, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(1u, resolver->pending_requests().size()); |
@@ -689,19 +705,19 @@ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
int rv; |
GURL url1("http://www.webkit.org"); |
GURL url2("http://www.webkit.com"); |
// Request for a .org domain should bypass proxy. |
- rv = service->ResolveProxy(url1, &info[0], &callback[0], NULL, NULL); |
+ rv = service->ResolveProxy(url1, &info[0], &callback[0], NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_TRUE(info[0].is_direct()); |
// Request for a .com domain hits the proxy. |
- rv = service->ResolveProxy(url2, &info[1], &callback[1], NULL, NULL); |
+ rv = service->ResolveProxy(url2, &info[1], &callback[1], NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI()); |
} |
@@ -714,11 +730,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("http://www.msn.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -726,11 +743,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("ftp://ftp.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_TRUE(info.is_direct()); |
EXPECT_EQ("direct://", info.proxy_server().ToURI()); |
@@ -738,11 +756,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("https://webbranch.techcu.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); |
@@ -751,11 +770,12 @@ |
config.proxy_rules().ParseFromString("foopy1:8080"); |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("http://www.microsoft.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -774,11 +794,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("http://www.msn.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -786,11 +807,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("ftp://ftp.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -798,11 +820,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("https://webbranch.techcu.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -810,11 +833,12 @@ |
{ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL, |
- BoundNetLog())); |
+ NULL)); |
GURL test_url("unknown://www.microsoft.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(test_url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(test_url, &info, &callback, NULL, |
+ BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -829,14 +853,14 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
// Start 3 requests. |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Nothing has been sent to the proxy resolver yet, since the proxy |
@@ -855,7 +879,7 @@ |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, &request2, NULL); |
+ GURL("http://request2"), &info2, &callback2, &request2, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(2u, resolver->pending_requests().size()); |
EXPECT_EQ(GURL("http://request2"), resolver->pending_requests()[1]->url()); |
@@ -863,7 +887,7 @@ |
ProxyInfo info3; |
TestCompletionCallback callback3; |
rv = service->ResolveProxy( |
- GURL("http://request3"), &info3, &callback3, NULL, NULL); |
+ GURL("http://request3"), &info3, &callback3, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(3u, resolver->pending_requests().size()); |
EXPECT_EQ(GURL("http://request3"), resolver->pending_requests()[2]->url()); |
@@ -904,7 +928,7 @@ |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -914,7 +938,7 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// The first request should have triggered download of PAC script. |
@@ -924,13 +948,13 @@ |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, NULL, NULL); |
+ GURL("http://request2"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ProxyInfo info3; |
TestCompletionCallback callback3; |
rv = service->ResolveProxy( |
- GURL("http://request3"), &info3, &callback3, NULL, NULL); |
+ GURL("http://request3"), &info3, &callback3, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Nothing has been sent to the resolver yet. |
@@ -983,7 +1007,7 @@ |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -993,7 +1017,7 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// The first request should have triggered download of PAC script. |
@@ -1003,7 +1027,7 @@ |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, NULL, NULL); |
+ GURL("http://request2"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// At this point the ProxyService should be waiting for the |
@@ -1040,7 +1064,7 @@ |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1062,13 +1086,13 @@ |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, &request2, NULL); |
+ GURL("http://request2"), &info2, &callback2, &request2, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ProxyInfo info3; |
TestCompletionCallback callback3; |
rv = service->ResolveProxy( |
- GURL("http://request3"), &info3, &callback3, NULL, NULL); |
+ GURL("http://request3"), &info3, &callback3, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Nothing has been sent to the resolver yet. |
@@ -1128,7 +1152,7 @@ |
MockAsyncProxyResolverExpectsBytes* resolver = |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1138,14 +1162,14 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ProxyInfo info2; |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, &request2, NULL); |
+ GURL("http://request2"), &info2, &callback2, &request2, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1199,7 +1223,7 @@ |
MockAsyncProxyResolverExpectsBytes* resolver = |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1209,14 +1233,14 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ProxyInfo info2; |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, &request2, NULL); |
+ GURL("http://request2"), &info2, &callback2, &request2, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1275,7 +1299,7 @@ |
MockAsyncProxyResolverExpectsBytes* resolver = |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1285,14 +1309,14 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ProxyInfo info2; |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, &request2, NULL); |
+ GURL("http://request2"), &info2, &callback2, &request2, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1333,7 +1357,7 @@ |
MockAsyncProxyResolverExpectsBytes* resolver = |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1343,7 +1367,7 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info1, &callback1, NULL, NULL); |
+ GURL("http://www.google.com"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1374,7 +1398,7 @@ |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info2, &callback2, NULL, NULL); |
+ GURL("http://www.google.com"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
ASSERT_EQ(1u, resolver->pending_requests().size()); |
@@ -1401,7 +1425,7 @@ |
MockAsyncProxyResolverExpectsBytes* resolver = |
new MockAsyncProxyResolverExpectsBytes; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1411,7 +1435,7 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info1, &callback1, NULL, NULL); |
+ GURL("http://www.google.com"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1437,13 +1461,13 @@ |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
GURL url("http://www.google.com/"); |
ProxyInfo info; |
TestCompletionCallback callback; |
- int rv = service->ResolveProxy(url, &info, &callback, NULL, NULL); |
+ int rv = service->ResolveProxy(url, &info, &callback, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1460,12 +1484,12 @@ |
scoped_refptr<ProxyService> service(new ProxyService( |
new MockProxyConfigService(config1), |
new MockAsyncProxyResolverExpectsBytes, |
- NULL, BoundNetLog())); |
+ NULL, NULL)); |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -1475,7 +1499,7 @@ |
service->ResetConfigService(new MockProxyConfigService(config2)); |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info, &callback2, NULL, NULL); |
+ GURL("http://request2"), &info, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); |
} |
@@ -1492,14 +1516,14 @@ |
MockProxyConfigService* config_service = new MockProxyConfigService(config); |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
// Start 1 requests. |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info1, &callback1, NULL, NULL); |
+ GURL("http://www.google.com"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1515,7 +1539,7 @@ |
// Force the ProxyService to pull down a new proxy configuration. |
// (Even though the configuration isn't old/bad). |
- service->UpdateConfig(NULL); |
+ service->UpdateConfig(BoundNetLog()); |
// Start another request -- the effective configuration has not |
// changed, so we shouldn't re-run the autodetect step. |
@@ -1523,7 +1547,7 @@ |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info2, &callback2, NULL, NULL); |
+ GURL("http://www.google.com"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_TRUE(info2.is_direct()); |
@@ -1538,14 +1562,14 @@ |
MockProxyConfigService* config_service = new MockProxyConfigService(config); |
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver; |
scoped_refptr<ProxyService> service( |
- new ProxyService(config_service, resolver, NULL, BoundNetLog())); |
+ new ProxyService(config_service, resolver, NULL, NULL)); |
// Start 1 request. |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info1, &callback1, NULL, NULL); |
+ GURL("http://www.google.com"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// Check that nothing has been sent to the proxy resolver yet. |
@@ -1571,13 +1595,13 @@ |
// requests should complete synchronously now as direct-connect. |
config.set_auto_detect(false); |
config_service->config = config; |
- service->UpdateConfig(NULL); |
+ service->UpdateConfig(BoundNetLog()); |
// Start another request -- the effective configuration has changed. |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://www.google.com"), &info2, &callback2, NULL, NULL); |
+ GURL("http://www.google.com"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_TRUE(info2.is_direct()); |
@@ -1594,7 +1618,7 @@ |
scoped_refptr<ProxyService> service( |
new ProxyService(config_service, resolver, &network_change_notifier, |
- BoundNetLog())); |
+ NULL)); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service->SetProxyScriptFetcher(fetcher); |
@@ -1604,7 +1628,7 @@ |
ProxyInfo info1; |
TestCompletionCallback callback1; |
int rv = service->ResolveProxy( |
- GURL("http://request1"), &info1, &callback1, NULL, NULL); |
+ GURL("http://request1"), &info1, &callback1, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// The first request should have triggered initial download of PAC script. |
@@ -1645,7 +1669,7 @@ |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service->ResolveProxy( |
- GURL("http://request2"), &info2, &callback2, NULL, NULL); |
+ GURL("http://request2"), &info2, &callback2, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
// This second request should have triggered the re-download of the PAC |