diff options
Diffstat (limited to 'net/proxy/proxy_service_unittest.cc')
| -rw-r--r-- | net/proxy/proxy_service_unittest.cc | 641 |
1 files changed, 352 insertions, 289 deletions
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc index a9cb9ed..c595f45 100644 --- a/net/proxy/proxy_service_unittest.cc +++ b/net/proxy/proxy_service_unittest.cc @@ -5,6 +5,7 @@ #include "net/proxy/proxy_service.h" #include <cstdarg> +#include <string> #include <vector> #include "base/format_macros.h" @@ -171,9 +172,11 @@ class TestResolveProxyDelegate : public ProxyDelegate { proxy_service_(nullptr) {} void OnResolveProxy(const GURL& url, + const std::string& method, int load_flags, const ProxyService& proxy_service, ProxyInfo* result) override { + method_ = method; on_resolve_proxy_called_ = true; proxy_service_ = &proxy_service; DCHECK(!add_proxy_ || !remove_proxy_); @@ -188,6 +191,8 @@ class TestResolveProxyDelegate : public ProxyDelegate { return on_resolve_proxy_called_; } + const std::string& method() const { return method_; } + void set_add_proxy(bool add_proxy) { add_proxy_ = add_proxy; } @@ -221,6 +226,7 @@ class TestResolveProxyDelegate : public ProxyDelegate { bool on_resolve_proxy_called_; bool add_proxy_; bool remove_proxy_; + std::string method_; const ProxyService* proxy_service_; }; @@ -232,6 +238,7 @@ class TestProxyFallbackProxyDelegate : public ProxyDelegate { // ProxyDelegate implementation: void OnResolveProxy(const GURL& url, + const std::string& method, int load_flags, const ProxyService& proxy_service, ProxyInfo* result) override {} @@ -347,15 +354,16 @@ TEST_F(ProxyServiceTest, Direct) { new MockAsyncProxyResolverFactory(false); ProxyService service( make_scoped_ptr(new MockProxyConfigService(ProxyConfig::CreateDirect())), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback; BoundTestNetLog log; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, log.bound()); + int rv = + service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, log.bound()); EXPECT_EQ(OK, rv); EXPECT_TRUE(factory->pending_requests().empty()); @@ -384,7 +392,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) { config.proxy_rules().bypass_rules.ParseFromString("*.org"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL url("http://www.google.com/"); GURL bypass_url("http://internet.org"); @@ -394,16 +402,18 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) { BoundTestNetLog log; // First, warm up the ProxyService. - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, log.bound()); + int rv = + service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, log.bound()); EXPECT_EQ(OK, rv); // Verify that network delegate is invoked. TestResolveProxyDelegate delegate; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), NULL, - &delegate, log.bound()); + rv = service.ResolveProxy(url, "GET", LOAD_NORMAL, &info, callback.callback(), + nullptr, &delegate, log.bound()); EXPECT_TRUE(delegate.on_resolve_proxy_called()); EXPECT_EQ(&service, delegate.proxy_service()); + EXPECT_EQ(delegate.method(), "GET"); // Verify that the ProxyDelegate's behavior is stateless across // invocations of ResolveProxy. Start by having the callback add a proxy @@ -411,21 +421,22 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) { delegate.set_add_proxy(true); // Callback should interpose: - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), NULL, - &delegate, log.bound()); + rv = service.ResolveProxy(url, "GET", LOAD_NORMAL, &info, callback.callback(), + nullptr, &delegate, log.bound()); EXPECT_FALSE(info.is_direct()); EXPECT_EQ(info.proxy_server().host_port_pair().host(), "delegate_proxy.com"); delegate.set_add_proxy(false); // Check non-bypassed URL: - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), NULL, - &delegate, log.bound()); + rv = service.ResolveProxy(url, "GET", LOAD_NORMAL, &info, callback.callback(), + nullptr, &delegate, log.bound()); EXPECT_FALSE(info.is_direct()); EXPECT_EQ(info.proxy_server().host_port_pair().host(), "foopy1"); // Check bypassed URL: - rv = service.ResolveProxy(bypass_url, LOAD_NORMAL, &info, callback.callback(), - NULL, &delegate, log.bound()); + rv = service.ResolveProxy(bypass_url, "GET", LOAD_NORMAL, &info, + callback.callback(), nullptr, &delegate, + log.bound()); EXPECT_TRUE(info.is_direct()); } @@ -439,7 +450,7 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) { config.proxy_rules().bypass_rules.ParseFromString("*.org"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL url("http://www.google.com/"); GURL bypass_url("http://internet.org"); @@ -449,28 +460,30 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) { BoundTestNetLog log; // First, warm up the ProxyService. - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, log.bound()); + int rv = + service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, log.bound()); EXPECT_EQ(OK, rv); TestResolveProxyDelegate delegate; delegate.set_remove_proxy(true); // Callback should interpose: - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), NULL, - &delegate, log.bound()); + rv = service.ResolveProxy(url, "GET", LOAD_NORMAL, &info, callback.callback(), + nullptr, &delegate, log.bound()); EXPECT_TRUE(info.is_direct()); delegate.set_remove_proxy(false); // Check non-bypassed URL: - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), NULL, - &delegate, log.bound()); + rv = service.ResolveProxy(url, "GET", LOAD_NORMAL, &info, callback.callback(), + nullptr, &delegate, log.bound()); EXPECT_FALSE(info.is_direct()); EXPECT_EQ(info.proxy_server().host_port_pair().host(), "foopy1"); // Check bypassed URL: - rv = service.ResolveProxy(bypass_url, LOAD_NORMAL, &info, callback.callback(), - NULL, &delegate, log.bound()); + rv = service.ResolveProxy(bypass_url, "GET", LOAD_NORMAL, &info, + callback.callback(), nullptr, &delegate, + log.bound()); EXPECT_TRUE(info.is_direct()); } @@ -483,7 +496,7 @@ TEST_F(ProxyServiceTest, PAC) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); @@ -492,8 +505,9 @@ TEST_F(ProxyServiceTest, PAC) { ProxyService::PacRequest* request; BoundTestNetLog log; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - &request, NULL, log.bound()); + int rv = + service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), &request, nullptr, log.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(LOAD_STATE_RESOLVING_PROXY_FOR_URL, service.GetLoadState(request)); @@ -545,14 +559,15 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://username:password@www.google.com/?ref#hash#hash"); ProxyInfo info; TestCompletionCallback callback; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -576,14 +591,15 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -613,8 +629,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) { TestCompletionCallback callback2; ProxyServer expected_proxy_server = info.proxy_server(); rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, &proxy_delegate, BoundNetLog()); + url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, &proxy_delegate, BoundNetLog()); // ReconsiderProxyAfterError returns error indicating nothing left. EXPECT_EQ(ERR_FAILED, rv); EXPECT_TRUE(info.is_empty()); @@ -630,14 +646,15 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://this-causes-js-error/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -688,14 +705,15 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -716,8 +734,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { // Fallback 1. TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foobar:10", info.proxy_server().ToURI()); @@ -727,8 +745,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { ProxyServer expected_proxy_server3 = info.proxy_server(); TestCompletionCallback callback3; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback3.callback(), NULL, &proxy_delegate, BoundNetLog()); + url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback3.callback(), nullptr, &proxy_delegate, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info.is_direct()); @@ -736,8 +754,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { ProxyServer expected_proxy_server4 = info.proxy_server(); TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback4.callback(), NULL, &proxy_delegate, BoundNetLog()); + url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback4.callback(), nullptr, &proxy_delegate, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foobar:20", info.proxy_server().ToURI()); @@ -746,8 +764,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { ProxyServer expected_proxy_server5 = info.proxy_server(); TestCompletionCallback callback5; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback5.callback(), NULL, &proxy_delegate, BoundNetLog()); + url, "GET", LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback5.callback(), nullptr, &proxy_delegate, BoundNetLog()); EXPECT_EQ(ERR_FAILED, rv); EXPECT_TRUE(info.is_empty()); } @@ -764,14 +782,15 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Resolve something. GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); ASSERT_EQ(ERR_IO_PENDING, rv); factory->pending_requests()[0]->CompleteNowWithForwarder(OK, &resolver); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -802,14 +821,15 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Start first resolve request. GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -835,8 +855,9 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) { // The second resolve request will try to run through the proxy resolver, // regardless of whether the first request failed in it. TestCompletionCallback callback2; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback2.callback(), NULL, - NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -870,9 +891,9 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) { GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(url, net::LOAD_NORMAL, &info, callback1.callback(), - nullptr, nullptr, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), net::LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, factory->pending_requests().size()); @@ -901,8 +922,9 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) { EXPECT_TRUE(factory->pending_requests().empty()); TestCompletionCallback callback2; - rv = service.ResolveProxy(url, net::LOAD_NORMAL, &info, callback2.callback(), - nullptr, nullptr, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), net::LOAD_NORMAL, &info, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, factory->pending_requests().size()); @@ -942,13 +964,14 @@ TEST_F(ProxyServiceTest, GURL url2("https://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(url1, net::LOAD_NORMAL, &info, callback1.callback(), - nullptr, nullptr, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), net::LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); TestCompletionCallback callback2; - rv = service.ResolveProxy(url2, net::LOAD_NORMAL, &info, callback2.callback(), - nullptr, nullptr, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), net::LOAD_NORMAL, &info, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, factory->pending_requests().size()); @@ -1006,14 +1029,15 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Start first resolve request. GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1030,8 +1054,9 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) { // As the proxy resolver factory failed the request and is configured for a // mandatory PAC script, ProxyService must not implicitly fall-back to DIRECT. TestCompletionCallback callback2; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback2.callback(), NULL, - NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_MANDATORY_PROXY_CONFIGURATION_FAILED, rv); EXPECT_FALSE(info.is_direct()); } @@ -1051,7 +1076,7 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -1061,8 +1086,9 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) { GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that nothing has been sent to the proxy resolver factory yet. @@ -1101,14 +1127,15 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Start first resolve request. GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1130,8 +1157,9 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) { // The second resolve request will try to run through the proxy resolver, // regardless of whether the first request failed in it. TestCompletionCallback callback2; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback2.callback(), NULL, - NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1159,15 +1187,16 @@ TEST_F(ProxyServiceTest, ProxyFallback) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); // Get the proxy information. ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1196,8 +1225,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) { // Fake an error on the proxy. TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); // Proxy times should not have been modified by fallback. @@ -1215,8 +1244,9 @@ TEST_F(ProxyServiceTest, ProxyFallback) { test_delegate.proxy_fallback_net_error()); TestCompletionCallback callback3; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback3.callback(), NULL, - NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1243,8 +1273,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) { // We fake another error. It should now try the third one. TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback4.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback4.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); @@ -1253,8 +1283,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) { // that was in our bad proxies map (foopy1:8080). TestCompletionCallback callback5; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback5.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback5.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); @@ -1262,8 +1292,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) { // so there is nothing left to try. TestCompletionCallback callback6; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback6.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback6.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_FAILED, rv); EXPECT_FALSE(info.is_direct()); EXPECT_TRUE(info.is_empty()); @@ -1274,8 +1304,9 @@ TEST_F(ProxyServiceTest, ProxyFallback) { // Look up proxies again TestCompletionCallback callback7; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback7.callback(), NULL, - NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback7.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1309,15 +1340,16 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); // Get the proxy information. ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1340,8 +1372,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { // Fake an error on the proxy. TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); // Now we get back the second proxy. @@ -1350,8 +1382,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { // Fake an error on this proxy as well. TestCompletionCallback callback3; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback3.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback3.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); // Finally, we get back DIRECT. @@ -1364,8 +1396,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { // Now we tell the proxy service that even DIRECT failed. TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback4.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback4.callback(), nullptr, nullptr, BoundNetLog()); // There was nothing left to try after DIRECT, so we are out of // choices. EXPECT_EQ(ERR_FAILED, rv); @@ -1382,15 +1414,16 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); // Get the proxy information. ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1416,8 +1449,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy-new/proxy.pac"), @@ -1438,8 +1471,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { // We fake another error. It should now ignore the first one. TestCompletionCallback callback3; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback3.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback3.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy2:9090", info.proxy_server().ToURI()); @@ -1451,8 +1484,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { // We fake another error. It should go back to the first proxy. TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback4.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback4.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy-new2/proxy.pac"), @@ -1485,15 +1518,16 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); // Get the proxy information. ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1514,8 +1548,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { // Fake a proxy error. TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); // The first proxy is ignored, and the second one is selected. @@ -1525,8 +1559,9 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { // Fake a PAC failure. ProxyInfo info2; TestCompletionCallback callback3; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info2, callback3.callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info2, + callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1547,8 +1582,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { ProxyInfo info3; TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3, - callback4.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3, + callback4.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1583,15 +1618,16 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); // Get the proxy information. ProxyInfo info; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -1612,8 +1648,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { // Fake a proxy error. TestCompletionCallback callback2; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info, + callback2.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); // The first proxy is ignored, and the second one is selected. @@ -1623,8 +1659,9 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { // Fake a PAC failure. ProxyInfo info2; TestCompletionCallback callback3; - rv = service.ResolveProxy(url, LOAD_NORMAL, &info2, callback3.callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info2, + callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1646,8 +1683,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { ProxyInfo info3; TestCompletionCallback callback4; rv = service.ReconsiderProxyAfterError( - url, LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3, - callback4.callback(), NULL, NULL, BoundNetLog()); + url, std::string(), LOAD_NORMAL, ERR_PROXY_CONNECTION_FAILED, &info3, + callback4.callback(), nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -1675,21 +1712,23 @@ TEST_F(ProxyServiceTest, ProxyBypassList) { config.proxy_rules().bypass_rules.ParseFromString("*.org"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); int rv; GURL url1("http://www.webkit.org"); GURL url2("http://www.webkit.com"); // Request for a .org domain should bypass proxy. - rv = service.ResolveProxy(url1, LOAD_NORMAL, &info[0], callback[0].callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info[0], + callback[0].callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info[0].is_direct()); // Request for a .com domain hits the proxy. - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info[1], callback[1].callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info[1], + callback[1].callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy1:8080", info[1].proxy_server().ToURI()); } @@ -1714,7 +1753,7 @@ TEST_F(ProxyServiceTest, MarkProxiesAsBadTests) { EXPECT_EQ(3u, additional_bad_proxies.size()); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); ProxyInfo proxy_info; proxy_info.UseProxyList(proxy_list); const ProxyRetryInfoMap& retry_info = service.proxy_retry_info(); @@ -1735,39 +1774,39 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { config.set_auto_detect(false); { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("http://www.msn.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); } { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("ftp://ftp.google.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info.is_direct()); EXPECT_EQ("direct://", info.proxy_server().ToURI()); } { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("https://webbranch.techcu.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); @@ -1775,13 +1814,13 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { { config.proxy_rules().ParseFromString("foopy1:8080"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("http://www.microsoft.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); @@ -1797,13 +1836,13 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { config.set_source(PROXY_CONFIG_SOURCE_TEST); config.proxy_rules().ParseFromString("https=foopy2:8080"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("http://www.google.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + 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()); @@ -1813,13 +1852,13 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { config.set_source(PROXY_CONFIG_SOURCE_TEST); config.proxy_rules().ParseFromString("https=foopy2:8080"); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("https://www.google.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); ASSERT_EQ(OK, rv); // Used the HTTPS proxy. So source should be TEST. EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source()); @@ -1828,13 +1867,13 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { ProxyConfig config; config.set_source(PROXY_CONFIG_SOURCE_TEST); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("http://www.google.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); ASSERT_EQ(OK, rv); // ProxyConfig is empty. Source should still be TEST. EXPECT_EQ(PROXY_CONFIG_SOURCE_TEST, info.config_source()); @@ -1852,52 +1891,52 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("http://www.msn.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); } { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("ftp://ftp.google.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); } { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("https://webbranch.techcu.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); } { ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - nullptr, NULL); + nullptr, nullptr); GURL test_url("unknown://www.microsoft.com"); ProxyInfo info; TestCompletionCallback callback; - int rv = - service.ResolveProxy(test_url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(test_url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); @@ -1917,14 +1956,15 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Start 3 requests. ProxyInfo info1; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url1, LOAD_NORMAL, &info1, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Successfully initialize the PAC script. @@ -1937,16 +1977,18 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info2, callback2.callback(), - &request2, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2, + callback2.callback(), &request2, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); GetPendingRequestsForURLs(resolver, url1, url2); ProxyInfo info3; TestCompletionCallback callback3; - rv = service.ResolveProxy(url3, LOAD_NORMAL, &info3, callback3.callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url3, std::string(), LOAD_NORMAL, &info3, + callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); GetPendingRequestsForURLs(resolver, url1, url2, url3); @@ -1987,7 +2029,7 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -1998,8 +2040,9 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { ProxyInfo info1; TestCompletionCallback callback1; ProxyService::PacRequest* request1; - int rv = service.ResolveProxy(url1, LOAD_NORMAL, &info1, callback1.callback(), - &request1, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1, + callback1.callback(), &request1, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered download of PAC script. @@ -2009,15 +2052,17 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info2, callback2.callback(), - &request2, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2, + callback2.callback(), &request2, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ProxyInfo info3; TestCompletionCallback callback3; ProxyService::PacRequest* request3; - rv = service.ResolveProxy(url3, LOAD_NORMAL, &info3, callback3.callback(), - &request3, NULL, BoundNetLog()); + rv = service.ResolveProxy(url3, std::string(), LOAD_NORMAL, &info3, + callback3.callback(), &request3, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Nothing has been sent to the factory yet. @@ -2090,7 +2135,7 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2100,8 +2145,9 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url1, LOAD_NORMAL, &info1, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered download of PAC script. @@ -2110,8 +2156,9 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info2, callback2.callback(), - NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2, + callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // At this point the ProxyService should be waiting for the @@ -2149,7 +2196,7 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2160,9 +2207,9 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { TestCompletionCallback callback1; ProxyService::PacRequest* request1; BoundTestNetLog log1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), &request1, NULL, log1.bound()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + &request1, nullptr, log1.bound()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered download of PAC script. @@ -2172,15 +2219,16 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), &request2, NULL, + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), &request2, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ProxyInfo info3; TestCompletionCallback callback3; - rv = service.ResolveProxy(GURL("http://request3"), LOAD_NORMAL, &info3, - callback3.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request3"), std::string(), LOAD_NORMAL, + &info3, callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Nothing has been sent to the factory yet. @@ -2247,7 +2295,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2257,15 +2305,17 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url1, LOAD_NORMAL, &info1, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info2, callback2.callback(), - &request2, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2, + callback2.callback(), &request2, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that nothing has been sent to the proxy resolver factory yet. @@ -2326,7 +2376,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2336,15 +2386,17 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = service.ResolveProxy(url1, LOAD_NORMAL, &info1, callback1.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url1, std::string(), LOAD_NORMAL, &info1, + callback1.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(url2, LOAD_NORMAL, &info2, callback2.callback(), - &request2, NULL, BoundNetLog()); + rv = service.ResolveProxy(url2, std::string(), LOAD_NORMAL, &info2, + callback2.callback(), &request2, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that nothing has been sent to the proxy resolver factory yet. @@ -2398,7 +2450,7 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2408,16 +2460,16 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ProxyInfo info2; TestCompletionCallback callback2; ProxyService::PacRequest* request2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), &request2, NULL, + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), &request2, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); @@ -2460,7 +2512,7 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2470,9 +2522,9 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://www.google.com"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that nothing has been sent to the proxy resolver factory yet. @@ -2502,8 +2554,9 @@ 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"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), + LOAD_NORMAL, &info2, callback2.callback(), nullptr, + nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); ASSERT_EQ(1u, resolver.pending_requests().size()); @@ -2530,7 +2583,7 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2540,9 +2593,9 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://www.google.com"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that nothing has been sent to the proxy resolver factory yet. @@ -2566,14 +2619,15 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); ProxyInfo info; TestCompletionCallback callback; - int rv = service.ResolveProxy(url, LOAD_NORMAL, &info, callback.callback(), - NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(url, std::string(), LOAD_NORMAL, &info, + callback.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); EXPECT_EQ(GURL("http://foopy/proxy.pac"), @@ -2585,13 +2639,13 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { config1.proxy_rules().ParseFromString("foopy1:8080"); config1.set_auto_detect(false); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config1)), - nullptr, NULL); + nullptr, nullptr); ProxyInfo info; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); @@ -2601,8 +2655,9 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { service.ResetConfigService( make_scoped_ptr(new MockProxyConfigService(config2))); TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_EQ("foopy2:8080", info.proxy_server().ToURI()); } @@ -2617,15 +2672,15 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) { MockAsyncProxyResolverFactory* factory = new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); // Start 1 request. ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://www.google.com"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Successfully set the autodetect script. @@ -2652,8 +2707,9 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) { // Start another request -- the effective configuration has changed. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://www.google.com"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://www.google.com"), std::string(), + LOAD_NORMAL, &info2, callback2.callback(), nullptr, + nullptr, BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info2.is_direct()); @@ -2684,9 +2740,9 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -2727,8 +2783,9 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // This second request should have triggered the re-download of the PAC @@ -2791,7 +2848,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2801,9 +2858,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -2862,8 +2919,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that it was sent to the resolver. @@ -2897,7 +2955,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -2907,9 +2965,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -2974,8 +3032,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that it was sent to the resolver. @@ -3009,7 +3068,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -3019,9 +3078,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -3083,8 +3142,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // Check that it was sent to the resolver. @@ -3118,7 +3178,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -3128,9 +3188,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -3189,8 +3249,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info2.is_direct()); } @@ -3272,7 +3333,7 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { new MockAsyncProxyResolverFactory(true); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; service.SetProxyScriptFetchers( @@ -3282,9 +3343,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { ProxyInfo info1; TestCompletionCallback callback1; - int rv = - service.ResolveProxy(GURL("http://request1"), LOAD_NORMAL, &info1, - callback1.callback(), NULL, NULL, BoundNetLog()); + int rv = service.ResolveProxy(GURL("http://request1"), std::string(), + LOAD_NORMAL, &info1, callback1.callback(), + nullptr, nullptr, BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // The first request should have triggered initial download of PAC script. @@ -3327,8 +3388,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { // Start a second request. ProxyInfo info2; TestCompletionCallback callback2; - rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info2, - callback2.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request2"), std::string(), LOAD_NORMAL, + &info2, callback2.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(ERR_IO_PENDING, rv); // This request should have sent work to the resolver; complete it. @@ -3357,8 +3419,9 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { // since the PAC script poller experienced a failure. ProxyInfo info3; TestCompletionCallback callback3; - rv = service.ResolveProxy(GURL("http://request3"), LOAD_NORMAL, &info3, - callback3.callback(), NULL, NULL, BoundNetLog()); + rv = service.ResolveProxy(GURL("http://request3"), std::string(), LOAD_NORMAL, + &info3, callback3.callback(), nullptr, nullptr, + BoundNetLog()); EXPECT_EQ(OK, rv); EXPECT_TRUE(info3.is_direct()); } @@ -3372,7 +3435,7 @@ TEST_F(ProxyServiceTest, SynchronousWithPAC) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(config_service), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); @@ -3381,7 +3444,7 @@ TEST_F(ProxyServiceTest, SynchronousWithPAC) { BoundTestNetLog log; bool synchronous_success = service.TryResolveProxySynchronously( - url, LOAD_NORMAL, &info, NULL, log.bound()); + url, std::string(), LOAD_NORMAL, &info, nullptr, log.bound()); EXPECT_FALSE(synchronous_success); // |info| should not have been modified. @@ -3399,7 +3462,7 @@ TEST_F(ProxyServiceTest, SynchronousWithFixedConfiguration) { new MockAsyncProxyResolverFactory(false); ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), - make_scoped_ptr(factory), NULL); + make_scoped_ptr(factory), nullptr); GURL url("http://www.google.com/"); @@ -3407,7 +3470,7 @@ TEST_F(ProxyServiceTest, SynchronousWithFixedConfiguration) { BoundTestNetLog log; bool synchronous_success = service.TryResolveProxySynchronously( - url, LOAD_NORMAL, &info, NULL, log.bound()); + url, std::string(), LOAD_NORMAL, &info, nullptr, log.bound()); EXPECT_TRUE(synchronous_success); EXPECT_FALSE(info.is_direct()); EXPECT_EQ("foopy1", info.proxy_server().host_port_pair().host()); |