Index: net/proxy/proxy_service_unittest.cc |
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc |
index 6b379bacbc2c80410ccb00ddf663008cf2b2b3da..d3f4918e75916a7e6fb778b744783269f155d6ff 100644 |
--- a/net/proxy/proxy_service_unittest.cc |
+++ b/net/proxy/proxy_service_unittest.cc |
@@ -569,7 +569,7 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) { |
ProxyInfo info; |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(url, std::string(), &info, callback.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -600,7 +600,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -631,7 +631,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) { |
ProxyServer expected_proxy_server = info.proxy_server(); |
rv = service.ReconsiderProxyAfterError( |
url, "GET", ERR_PROXY_CONNECTION_FAILED, &info, callback2.callback(), |
- nullptr, &proxy_delegate, BoundNetLog()); |
+ nullptr, &proxy_delegate, NetLogWithSource()); |
// ReconsiderProxyAfterError returns error indicating nothing left. |
EXPECT_THAT(rv, IsError(ERR_FAILED)); |
EXPECT_TRUE(info.is_empty()); |
@@ -654,7 +654,7 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -712,7 +712,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -734,7 +734,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foobar:10", info.proxy_server().ToURI()); |
@@ -745,7 +745,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
TestCompletionCallback callback3; |
rv = service.ReconsiderProxyAfterError( |
url, "GET", ERR_PROXY_CONNECTION_FAILED, &info, callback3.callback(), |
- nullptr, &proxy_delegate, BoundNetLog()); |
+ nullptr, &proxy_delegate, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info.is_direct()); |
@@ -754,7 +754,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, "GET", ERR_PROXY_CONNECTION_FAILED, &info, callback4.callback(), |
- nullptr, &proxy_delegate, BoundNetLog()); |
+ nullptr, &proxy_delegate, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foobar:20", info.proxy_server().ToURI()); |
@@ -764,7 +764,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
TestCompletionCallback callback5; |
rv = service.ReconsiderProxyAfterError( |
url, "GET", ERR_PROXY_CONNECTION_FAILED, &info, callback5.callback(), |
- nullptr, &proxy_delegate, BoundNetLog()); |
+ nullptr, &proxy_delegate, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_FAILED)); |
EXPECT_TRUE(info.is_empty()); |
} |
@@ -788,7 +788,7 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) { |
ProxyInfo info; |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(url, std::string(), &info, callback.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
ASSERT_THAT(rv, IsError(ERR_IO_PENDING)); |
factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -826,7 +826,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -853,7 +853,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) { |
// regardless of whether the first request failed in it. |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url, std::string(), &info, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -888,7 +888,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, factory->pending_requests().size()); |
@@ -918,7 +918,7 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url, std::string(), &info, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, factory->pending_requests().size()); |
@@ -960,11 +960,11 @@ TEST_F(ProxyServiceTest, |
TestCompletionCallback callback1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url2, std::string(), &info, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, factory->pending_requests().size()); |
@@ -1029,7 +1029,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1047,7 +1047,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) { |
// mandatory PAC script, ProxyService must not implicitly fall-back to DIRECT. |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url, std::string(), &info, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED)); |
EXPECT_FALSE(info.is_direct()); |
} |
@@ -1078,7 +1078,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) { |
ProxyInfo info; |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(url, std::string(), &info, callback.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -1124,7 +1124,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1147,7 +1147,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) { |
// regardless of whether the first request failed in it. |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url, std::string(), &info, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1183,7 +1183,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1213,7 +1213,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
// Proxy times should not have been modified by fallback. |
@@ -1232,7 +1232,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(url, std::string(), &info, callback3.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1260,7 +1260,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback4.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback4.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); |
@@ -1270,7 +1270,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
TestCompletionCallback callback5; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback5.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback5.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -1279,7 +1279,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
TestCompletionCallback callback6; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback6.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback6.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_FAILED)); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_TRUE(info.is_empty()); |
@@ -1291,7 +1291,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
// Look up proxies again |
TestCompletionCallback callback7; |
rv = service.ResolveProxy(url, std::string(), &info, callback7.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1333,7 +1333,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1357,7 +1357,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
// Now we get back the second proxy. |
@@ -1367,7 +1367,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { |
TestCompletionCallback callback3; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback3.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback3.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
// Finally, we get back DIRECT. |
@@ -1381,7 +1381,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback4.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback4.callback(), nullptr, nullptr, NetLogWithSource()); |
// There was nothing left to try after DIRECT, so we are out of |
// choices. |
EXPECT_THAT(rv, IsError(ERR_FAILED)); |
@@ -1406,7 +1406,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1433,7 +1433,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy-new/proxy.pac"), |
@@ -1455,7 +1455,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { |
TestCompletionCallback callback3; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback3.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback3.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); |
@@ -1468,7 +1468,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback4.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback4.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy-new2/proxy.pac"), |
@@ -1509,7 +1509,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1531,7 +1531,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
// The first proxy is ignored, and the second one is selected. |
@@ -1542,7 +1542,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { |
ProxyInfo info2; |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(url, std::string(), &info2, callback3.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1564,7 +1564,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info3, |
- callback4.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback4.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1607,7 +1607,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { |
ProxyInfo info; |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(url, std::string(), &info, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -1629,7 +1629,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { |
TestCompletionCallback callback2; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info, |
- callback2.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback2.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
// The first proxy is ignored, and the second one is selected. |
@@ -1640,7 +1640,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { |
ProxyInfo info2; |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(url, std::string(), &info2, callback3.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1663,7 +1663,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { |
TestCompletionCallback callback4; |
rv = service.ReconsiderProxyAfterError( |
url, std::string(), ERR_PROXY_CONNECTION_FAILED, &info3, |
- callback4.callback(), nullptr, nullptr, BoundNetLog()); |
+ callback4.callback(), nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -1700,14 +1700,14 @@ TEST_F(ProxyServiceTest, ProxyBypassList) { |
// Request for a .org domain should bypass proxy. |
rv = service.ResolveProxy(url1, std::string(), &info[0], |
callback[0].callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info[0].is_direct()); |
// Request for a .com domain hits the proxy. |
rv = service.ResolveProxy(url2, std::string(), &info[1], |
callback[1].callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI()); |
} |
@@ -1737,7 +1737,7 @@ TEST_F(ProxyServiceTest, MarkProxiesAsBadTests) { |
proxy_info.UseProxyList(proxy_list); |
const ProxyRetryInfoMap& retry_info = service.proxy_retry_info(); |
service.MarkProxiesAsBadUntil(proxy_info, base::TimeDelta::FromSeconds(1), |
- additional_bad_proxies, BoundNetLog()); |
+ additional_bad_proxies, NetLogWithSource()); |
ASSERT_EQ(4u, retry_info.size()); |
for (const ProxyServer& proxy_server : |
config.proxy_rules().proxies_for_http.GetAll()) { |
@@ -1759,7 +1759,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -1772,7 +1772,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info.is_direct()); |
EXPECT_EQ("direct://", info.proxy_server().ToURI()); |
@@ -1785,7 +1785,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); |
@@ -1799,7 +1799,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -1821,7 +1821,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
ASSERT_THAT(rv, IsOk()); |
// Should be SOURCE_TEST, even if there are no HTTP proxies configured. |
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source()); |
@@ -1837,7 +1837,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
ASSERT_THAT(rv, IsOk()); |
// Used the HTTPS proxy. So source should be TEST. |
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source()); |
@@ -1852,7 +1852,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
ASSERT_THAT(rv, IsOk()); |
// ProxyConfig is empty. Source should still be TEST. |
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source()); |
@@ -1876,7 +1876,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -1889,7 +1889,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -1902,7 +1902,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -1915,7 +1915,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(test_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_FALSE(info.is_direct()); |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
@@ -1943,7 +1943,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { |
TestCompletionCallback callback1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info1, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Successfully initialize the PAC script. |
@@ -1957,7 +1957,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(url2, std::string(), &info2, callback2.callback(), |
- &request2, nullptr, BoundNetLog()); |
+ &request2, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
GetPendingRequestsForURLs(resolver, url1, url2); |
@@ -1965,7 +1965,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { |
ProxyInfo info3; |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(url3, std::string(), &info3, callback3.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
GetPendingRequestsForURLs(resolver, url1, url2, url3); |
@@ -2019,7 +2019,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { |
ProxyService::PacRequest* request1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info1, callback1.callback(), |
- &request1, nullptr, BoundNetLog()); |
+ &request1, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered download of PAC script. |
@@ -2030,14 +2030,14 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(url2, std::string(), &info2, callback2.callback(), |
- &request2, nullptr, BoundNetLog()); |
+ &request2, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ProxyInfo info3; |
TestCompletionCallback callback3; |
ProxyService::PacRequest* request3; |
rv = service.ResolveProxy(url3, std::string(), &info3, callback3.callback(), |
- &request3, nullptr, BoundNetLog()); |
+ &request3, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Nothing has been sent to the factory yet. |
@@ -2122,7 +2122,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { |
TestCompletionCallback callback1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info1, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered download of PAC script. |
@@ -2132,7 +2132,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { |
ProxyInfo info2; |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(url2, std::string(), &info2, callback2.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// At this point the ProxyService should be waiting for the |
@@ -2195,14 +2195,14 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), &request2, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ProxyInfo info3; |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(GURL("http://request3"), std::string(), &info3, |
callback3.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Nothing has been sent to the factory yet. |
@@ -2280,14 +2280,14 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) { |
TestCompletionCallback callback1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info1, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ProxyInfo info2; |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(url2, std::string(), &info2, callback2.callback(), |
- &request2, nullptr, BoundNetLog()); |
+ &request2, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -2360,14 +2360,14 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) { |
TestCompletionCallback callback1; |
int rv = |
service.ResolveProxy(url1, std::string(), &info1, callback1.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ProxyInfo info2; |
TestCompletionCallback callback2; |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(url2, std::string(), &info2, callback2.callback(), |
- &request2, nullptr, BoundNetLog()); |
+ &request2, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -2433,7 +2433,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ProxyInfo info2; |
@@ -2441,7 +2441,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) { |
ProxyService::PacRequest* request2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), &request2, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -2495,7 +2495,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), |
&info1, callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -2527,7 +2527,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), |
&info2, callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
ASSERT_EQ(1u, resolver.pending_requests().size()); |
@@ -2566,7 +2566,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), |
&info1, callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that nothing has been sent to the proxy resolver factory yet. |
@@ -2597,7 +2597,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) { |
ProxyInfo info; |
TestCompletionCallback callback; |
int rv = service.ResolveProxy(url, std::string(), &info, callback.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(GURL("http://foopy/proxy.pac"), |
@@ -2615,7 +2615,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
@@ -2626,7 +2626,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); |
} |
@@ -2649,7 +2649,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), |
&info1, callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Successfully set the autodetect script. |
@@ -2678,7 +2678,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), |
&info2, callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info2.is_direct()); |
@@ -2711,7 +2711,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -2754,7 +2754,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// This second request should have triggered the re-download of the PAC |
@@ -2829,7 +2829,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -2890,7 +2890,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that it was sent to the resolver. |
@@ -2936,7 +2936,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -3003,7 +3003,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that it was sent to the resolver. |
@@ -3049,7 +3049,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -3113,7 +3113,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// Check that it was sent to the resolver. |
@@ -3159,7 +3159,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -3220,7 +3220,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info2.is_direct()); |
} |
@@ -3314,7 +3314,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { |
TestCompletionCallback callback1; |
int rv = service.ResolveProxy(GURL("http://request1"), std::string(), &info1, |
callback1.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// The first request should have triggered initial download of PAC script. |
@@ -3359,7 +3359,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), std::string(), &info2, |
callback2.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// This request should have sent work to the resolver; complete it. |
@@ -3390,7 +3390,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { |
TestCompletionCallback callback3; |
rv = service.ResolveProxy(GURL("http://request3"), std::string(), &info3, |
callback3.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsOk()); |
EXPECT_TRUE(info3.is_direct()); |
} |
@@ -3471,7 +3471,7 @@ class SanitizeUrlHelper { |
TestCompletionCallback callback; |
int rv = |
service_->ResolveProxy(url, std::string(), &info, callback.callback(), |
- nullptr, nullptr, BoundNetLog()); |
+ nullptr, nullptr, NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
// First step is to download the PAC script. |
@@ -3503,7 +3503,7 @@ class SanitizeUrlHelper { |
TestCompletionCallback callback; |
int rv = service_->ResolveProxy(raw_url, std::string(), &info, |
callback.callback(), nullptr, nullptr, |
- BoundNetLog()); |
+ NetLogWithSource()); |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_EQ(1u, resolver.pending_requests().size()); |