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

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: 2-line change: Add missing ifdef(SPDY_PROXY_AUTH_ORIGIN); previously only compiled on android, but … 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/socket_stream/socket_stream.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..ab73e0ee13d665491abc6f110f6ed24d851366ac 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -13,6 +13,7 @@
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
#include "net/base/net_log_unittest.h"
+#include "net/base/network_delegate.h"
#include "net/base/test_completion_callback.h"
#include "net/proxy/dhcp_proxy_script_fetcher.h"
#include "net/proxy/mock_proxy_resolver.h"
@@ -153,6 +154,21 @@ class MockProxyConfigService: public ProxyConfigService {
ObserverList<Observer, true> observers_;
};
+// A test network delegate that exercises the OnResolveProxy callback.
+class TestResolveProxyNetworkDelegate : public NetworkDelegate {
+ public:
+ TestResolveProxyNetworkDelegate()
+ : NetworkDelegate(), on_resolve_proxy_called(false) {
+ }
+
+ virtual void OnResolveProxy(
+ const GURL& url, int load_flags, ProxyInfo* result) {
+ on_resolve_proxy_called = true;
+ }
+
+ bool on_resolve_proxy_called;
+};
+
} // namespace
TEST_F(ProxyServiceTest, Direct) {
@@ -166,7 +182,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, NULL, log.bound());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(resolver->pending_requests().empty());
@@ -186,6 +202,12 @@ TEST_F(ProxyServiceTest, Direct) {
NetLog::PHASE_NONE));
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SERVICE));
+
+ // Verify that network delegate is invoked.
+ TestResolveProxyNetworkDelegate delegate;
+ rv = service.ResolveProxy(
+ url, 0, &info, callback.callback(), NULL, &delegate, log.bound());
+ EXPECT_TRUE(delegate.on_resolve_proxy_called);
mmenke 2014/07/01 19:45:12 Should have the delegate modify the list, both by
rcs 2014/07/02 00:56:20 Wrote a test, but it seems vaguely odd to me: it's
}
TEST_F(ProxyServiceTest, PAC) {
@@ -204,7 +226,7 @@ TEST_F(ProxyServiceTest, PAC) {
CapturingBoundNetLog log;
int rv = service.ResolveProxy(
- url, &info, callback.callback(), &request, log.bound());
+ url, 0, &info, callback.callback(), &request, NULL, log.bound());
mmenke 2014/07/01 19:45:12 These should all use LOAD_NORMAL.
rcs 2014/07/02 00:56:20 Done.
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request));
@@ -259,7 +281,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -287,7 +309,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -336,7 +358,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -391,7 +413,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -460,7 +482,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, 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 +517,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -522,7 +544,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -557,7 +579,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -576,7 +598,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED, rv);
EXPECT_FALSE(info.is_direct());
}
@@ -606,7 +628,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -649,7 +671,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -672,7 +694,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -705,7 +727,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -750,7 +772,7 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- url, &info, callback3.callback(), NULL, BoundNetLog());
+ url, 0, &info, callback3.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -808,8 +830,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) {
// Look up proxies again
TestCompletionCallback callback7;
- rv = service.ResolveProxy(url, &info, callback7.callback(), NULL,
- BoundNetLog());
+ rv = service.ResolveProxy(url, 0, &info, callback7.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -848,7 +870,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -918,7 +940,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1018,7 +1040,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1051,7 +1073,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1113,7 +1135,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -1146,7 +1168,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -1205,13 +1227,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, 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, NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI());
}
@@ -1227,8 +1249,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1239,8 +1261,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info.is_direct());
EXPECT_EQ("direct://", info.proxy_server().ToURI());
@@ -1251,8 +1273,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
@@ -1264,8 +1286,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1285,8 +1307,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// Should be SOURCE_TEST, even if there are no HTTP proxies configured.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1300,8 +1322,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// Used the HTTPS proxy. So source should be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1314,8 +1336,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
ASSERT_EQ(OK, rv);
// ProxyConfig is empty. Source should still be TEST.
EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source());
@@ -1337,8 +1359,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -1349,8 +1371,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1361,8 +1383,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1373,8 +1395,8 @@ 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,
- BoundNetLog());
+ int rv = service.ResolveProxy(test_url, 0, &info, callback.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_FALSE(info.is_direct());
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI());
@@ -1394,8 +1416,9 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the proxy resolver yet, since the proxy
@@ -1413,16 +1436,17 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(2u, resolver->pending_requests().size());
EXPECT_EQ(GURL("http://request2"), resolver->pending_requests()[1]->url());
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
+ callback3.callback(), NULL, 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());
@@ -1473,8 +1497,9 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info1;
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), &request1, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), &request1, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1484,15 +1509,17 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
ProxyService::PacRequest* request3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), &request3, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
+ callback3.callback(), &request3, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the resolver yet.
@@ -1575,8 +1602,9 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1585,8 +1613,8 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// At this point the ProxyService should be waiting for the
@@ -1635,8 +1663,9 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
TestCompletionCallback callback1;
ProxyService::PacRequest* request1;
CapturingBoundNetLog log1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), &request1, log1.bound());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), &request1, NULL,
+ log1.bound());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered download of PAC script.
@@ -1646,14 +1675,15 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) {
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info3;
TestCompletionCallback callback3;
- rv = service.ResolveProxy(GURL("http://request3"), &info3,
- callback3.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request3"), 0, &info3,
+ callback3.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Nothing has been sent to the resolver yet.
@@ -1726,15 +1756,17 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1803,15 +1835,17 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1876,15 +1910,17 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ProxyInfo info2;
TestCompletionCallback callback2;
ProxyService::PacRequest* request2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), &request2, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), &request2, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1935,8 +1971,8 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://www.google.com"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ GURL("http://www.google.com"), 0, &info1, callback1.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -1966,8 +2002,8 @@ 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,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info2,
+ callback2.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
ASSERT_EQ(1u, resolver->pending_requests().size());
@@ -2003,8 +2039,9 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -2033,7 +2070,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, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_EQ(GURL("http://foopy/proxy.pac"),
@@ -2050,8 +2087,9 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
ProxyInfo info;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI());
@@ -2060,8 +2098,8 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) {
config2.set_auto_detect(false);
service.ResetConfigService(new MockProxyConfigService(config2));
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info,
+ callback2.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI());
}
@@ -2079,8 +2117,9 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://www.google.com"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that nothing has been sent to the proxy resolver yet.
@@ -2110,8 +2149,8 @@ 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,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://www.google.com"), 0, &info2,
+ callback2.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info2.is_direct());
@@ -2140,8 +2179,9 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
ProxyInfo info1;
TestCompletionCallback callback1;
- int rv = service.ResolveProxy(GURL("http://request1"), &info1,
- callback1.callback(), NULL, BoundNetLog());
+ int rv = service.ResolveProxy(GURL("http://request1"), 0, &info1,
+ callback1.callback(), NULL, NULL,
+ BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2182,8 +2222,8 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
// Start a second request.
ProxyInfo info2;
TestCompletionCallback callback2;
- rv = service.ResolveProxy(GURL("http://request2"), &info2,
- callback2.callback(), NULL, BoundNetLog());
+ rv = service.ResolveProxy(GURL("http://request2"), 0, &info2,
+ callback2.callback(), NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// This second request should have triggered the re-download of the PAC
@@ -2255,8 +2295,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(),
- NULL, BoundNetLog());
+ GURL("http://request1"), 0, &info1, callback1.callback(),
+ NULL, NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2316,8 +2356,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2360,8 +2400,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2426,8 +2466,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2470,8 +2510,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2532,8 +2572,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// Check that it was sent to the resolver.
@@ -2576,8 +2616,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2636,8 +2676,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info2.is_direct());
}
@@ -2728,8 +2768,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info1;
TestCompletionCallback callback1;
int rv = service.ResolveProxy(
- GURL("http://request1"), &info1, callback1.callback(), NULL,
- BoundNetLog());
+ GURL("http://request1"), 0, &info1, callback1.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// The first request should have triggered initial download of PAC script.
@@ -2772,8 +2812,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info2;
TestCompletionCallback callback2;
rv = service.ResolveProxy(
- GURL("http://request2"), &info2, callback2.callback(), NULL,
- BoundNetLog());
+ GURL("http://request2"), 0, &info2, callback2.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
// This request should have sent work to the resolver; complete it.
@@ -2803,8 +2843,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) {
ProxyInfo info3;
TestCompletionCallback callback3;
rv = service.ResolveProxy(
- GURL("http://request3"), &info3, callback3.callback(), NULL,
- BoundNetLog());
+ GURL("http://request3"), 0, &info3, callback3.callback(), NULL,
+ NULL, BoundNetLog());
EXPECT_EQ(OK, rv);
EXPECT_TRUE(info3.is_direct());
}
« net/proxy/proxy_service.cc ('K') | « net/proxy/proxy_service.cc ('k') | net/socket_stream/socket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698