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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_service_unittest.cc

Issue 332313003: Add Finch experiment for selectively bypassing proxies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: callback design (not yet done) Created 6 years, 6 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
« net/proxy/proxy_service.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service_unittest.cc
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index cc245b69a3c3fffa932fc12195f039dce8f7353a..03345e8f8a0a8449cc112f48b30c56b811ad08cc 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -166,7 +166,7 @@ TEST_F(ProxyServiceTest, Direct) {
TestCompletionCallback callback;
CapturingBoundNetLog log;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, log.bound());
+ url, 0, &info, callback.callback(), NULL, log.bound());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(resolver->pending_requests().empty());
@@ -204,7 +204,7 @@ TEST_F(ProxyServiceTest, PAC) {
CapturingBoundNetLog log;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), &request, log.bound());
+ url, 0, &info, callback.callback(), &request, log.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request));
@@ -259,7 +259,7 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) {
ProxyInfo info;
TestCompletionCallback callback;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -287,7 +287,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -336,7 +336,7 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -391,7 +391,7 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -460,7 +460,7 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) {
ProxyInfo info;
TestCompletionCallback callback;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback.callback(), NULL, BoundNetLog());
ASSERT_EQ(ERR_IO_PENDING, rv);
resolver->pending_set_pac_script_request()->CompleteNow(OK);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -495,7 +495,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -522,7 +522,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) {
// regardless of whether the first request failed in it.
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- url, &info, callback2.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -557,7 +557,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -576,7 +576,7 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) {
// PAC script, ProxyService must not implicitly fall-back to DIRECT.
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- url, &info, callback2.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED, rv);
EXPECT_FALSE(info.is_direct());
}
@@ -606,7 +606,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) {
ProxyInfo info;
TestCompletionCallback callback;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -649,7 +649,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -672,7 +672,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) {
// regardless of whether the first request failed in it.
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- url, &info, callback2.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -705,7 +705,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -750,7 +750,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- url, &info, callback3.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -808,7 +808,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// Look up proxies again
TestCompletionCallback callback7;
- rv = service.ResolveProxy(url, &info, callback7.callback(), NULL,
+ rv = service.ResolveProxy(url, 0, &info, callback7.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -848,7 +848,7 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -918,7 +918,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1018,7 +1018,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1051,7 +1051,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) {
ProxyInfo info2;
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- url, &info2, callback3.callback(), NULL, BoundNetLog());
+ url, 0, &info2, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1113,7 +1113,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
ProxyInfo info;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- url, &info, callback1.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1146,7 +1146,7 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) {
ProxyInfo info2;
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- url, &info2, callback3.callback(), NULL, BoundNetLog());
+ url, 0, &info2, callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1205,13 +1205,13 @@ TEST_F(ProxyServiceTest, ProxyBypassList) {
// Request for a .org domain should bypass proxy.
rv = service.ResolveProxy(
- url1, &info[0], callback[0].callback(), NULL, BoundNetLog());
+ url1, 0, &info[0], callback[0].callback(), 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].callback(), NULL, BoundNetLog());
+ url2, 0, &info[1], callback[1].callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI());
}
@@ -1227,7 +1227,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1239,7 +1239,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info.is_direct());
@@ -1251,7 +1251,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1264,7 +1264,7 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) {
GURL test_url("http://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1285,7 +1285,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("http://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
ASSERT_EQ(OK, rv);
// Should be SOURCE_TEST, even if there are no HTTP proxies configured.
@@ -1300,7 +1300,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("https://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
ASSERT_EQ(OK, rv);
// Used the HTTPS proxy. So source should be TEST.
@@ -1314,7 +1314,7 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) {
GURL test_url("http://www.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
ASSERT_EQ(OK, rv);
// ProxyConfig is empty. Source should still be TEST.
@@ -1337,7 +1337,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1349,7 +1349,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1361,7 +1361,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1373,7 +1373,7 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
GURL test_url("unknown://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
- int rv = service.ResolveProxy(test_url, &info, callback.callback(), NULL,
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
@@ -1394,7 +1394,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1413,7 +1413,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(2u, resolver->pending_requests().size());
@@ -1421,7 +1421,7 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(3u, resolver->pending_requests().size());
@@ -1473,7 +1473,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info1;
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), &request1, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1484,14 +1484,14 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
ProxyService::PacRequest* request3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
callback3.callback(), &request3, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1575,7 +1575,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1585,7 +1585,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1635,7 +1635,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
CapturingBoundNetLog log1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), &request1, log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1646,13 +1646,13 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
callback3.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1726,14 +1726,14 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1803,14 +1803,14 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1876,14 +1876,14 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), &request2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1935,7 +1935,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://www.google.com"), &info1, callback1.callback(), NULL,
+ GURL("http://www.google.com"), 0, &info1, callback1.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -1966,7 +1966,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
// Start another request, it should pickup the bypass item.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://www.google.com"), &info2,
+ rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info2,
callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2003,7 +2003,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
+ int rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2033,7 +2033,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) {
ProxyInfo info;
TestCompletionCallback callback;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -2050,7 +2050,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
ProxyInfo info;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -2060,7 +2060,7 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
config2.set_auto_detect(false);
service.ResetConfigService(new MockProxyConfigService(config2));
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info,
callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
@@ -2079,7 +2079,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
+ int rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2110,7 +2110,7 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
// Start another request -- the effective configuration has changed.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://www.google.com"), &info2,
+ rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info2,
callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
@@ -2140,7 +2140,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
callback1.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2182,7 +2182,7 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
callback2.callback(), NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2255,7 +2255,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(),
+ GURL("http://request1"), 0, &info1, callback1.callback(),
NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2316,7 +2316,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2360,7 +2360,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2426,7 +2426,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2470,7 +2470,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2532,7 +2532,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2576,7 +2576,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2636,7 +2636,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info2.is_direct());
@@ -2728,7 +2728,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2772,7 +2772,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -2803,7 +2803,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info3;
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- GURL("http://request3"), &info3, callback3.callback(), NULL,
+ GURL("http://request3"), 0, &info3, callback3.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info3.is_direct());
« net/proxy/proxy_service.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698