Index: net/proxy/proxy_service_unittest.cc |
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc |
index 6d6c747d954df093958bc2256107ebc9f5e5982b..ff99d1ab11a927d26f4eae5f1ba535e22d34f53c 100644 |
--- a/net/proxy/proxy_service_unittest.cc |
+++ b/net/proxy/proxy_service_unittest.cc |
@@ -244,8 +244,9 @@ class TestProxyFallbackNetworkDelegate : public NetworkDelegateImpl { |
TEST_F(ProxyServiceTest, Direct) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(new MockProxyConfigService(ProxyConfig::CreateDirect()), |
- make_scoped_ptr(factory), NULL); |
+ ProxyService service( |
+ make_scoped_ptr(new MockProxyConfigService(ProxyConfig::CreateDirect())), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -281,7 +282,8 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackAddProxy) { |
config.set_auto_detect(false); |
config.proxy_rules().bypass_rules.ParseFromString("*.org"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL url("http://www.google.com/"); |
GURL bypass_url("http://internet.org"); |
@@ -335,7 +337,8 @@ TEST_F(ProxyServiceTest, OnResolveProxyCallbackRemoveProxy) { |
config.set_auto_detect(false); |
config.proxy_rules().bypass_rules.ParseFromString("*.org"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL url("http://www.google.com/"); |
GURL bypass_url("http://internet.org"); |
@@ -378,7 +381,8 @@ TEST_F(ProxyServiceTest, PAC) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -439,7 +443,8 @@ TEST_F(ProxyServiceTest, PAC_NoIdentityOrHash) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://username:password@www.google.com/?ref#hash#hash"); |
@@ -469,7 +474,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverWithoutDirect) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -522,7 +528,8 @@ TEST_F(ProxyServiceTest, PAC_RuntimeError) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://this-causes-js-error/"); |
@@ -579,7 +586,8 @@ TEST_F(ProxyServiceTest, PAC_FailoverAfterDirect) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -654,7 +662,8 @@ TEST_F(ProxyServiceTest, PAC_ConfigSourcePropagates) { |
MockAsyncProxyResolver resolver; |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Resolve something. |
GURL url("http://www.google.com/"); |
@@ -691,7 +700,8 @@ TEST_F(ProxyServiceTest, ProxyResolverFails) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Start first resolve request. |
GURL url("http://www.google.com/"); |
@@ -752,7 +762,8 @@ TEST_F(ProxyServiceTest, ProxyResolverTerminatedDuringRequest) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), nullptr); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), nullptr); |
// Start first resolve request. |
GURL url("http://www.google.com/"); |
@@ -822,7 +833,8 @@ TEST_F(ProxyServiceTest, |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), nullptr); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), nullptr); |
// Start two resolve requests. |
GURL url1("http://www.google.com/"); |
@@ -896,7 +908,8 @@ TEST_F(ProxyServiceTest, ProxyScriptFetcherFailsDownloadingMandatoryPac) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Start first resolve request. |
GURL url("http://www.google.com/"); |
@@ -940,7 +953,8 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsParsingJavaScriptMandatoryPac) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
DhcpProxyScriptFetcher* dhcp_fetcher = new DoNothingDhcpProxyScriptFetcher(); |
@@ -989,7 +1003,8 @@ TEST_F(ProxyServiceTest, ProxyResolverFailsInJavaScriptMandatoryPac) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Start first resolve request. |
GURL url("http://www.google.com/"); |
@@ -1046,7 +1061,8 @@ TEST_F(ProxyServiceTest, ProxyFallback) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -1195,7 +1211,8 @@ TEST_F(ProxyServiceTest, ProxyFallbackToDirect) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -1267,7 +1284,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_NewSettings) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -1369,7 +1387,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfig) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -1466,7 +1485,8 @@ TEST_F(ProxyServiceTest, ProxyFallback_BadConfigMandatory) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -1557,7 +1577,8 @@ TEST_F(ProxyServiceTest, ProxyBypassList) { |
config.set_auto_detect(false); |
config.proxy_rules().bypass_rules.ParseFromString("*.org"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
int rv; |
GURL url1("http://www.webkit.org"); |
@@ -1595,7 +1616,8 @@ TEST_F(ProxyServiceTest, MarkProxiesAsBadTests) { |
EXPECT_EQ(3u, additional_bad_proxies.size()); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
ProxyInfo proxy_info; |
proxy_info.UseProxyList(proxy_list); |
const ProxyRetryInfoMap& retry_info = service.proxy_retry_info(); |
@@ -1615,7 +1637,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
config.proxy_rules().ParseFromString("http=foopy1:8080;https=foopy2:8080"); |
config.set_auto_detect(false); |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("http://www.msn.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1627,7 +1650,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
} |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("ftp://ftp.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1639,7 +1663,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
EXPECT_EQ("direct://", info.proxy_server().ToURI()); |
} |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("https://webbranch.techcu.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1652,7 +1677,8 @@ TEST_F(ProxyServiceTest, PerProtocolProxyTests) { |
} |
{ |
config.proxy_rules().ParseFromString("foopy1:8080"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("http://www.microsoft.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1673,7 +1699,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
ProxyConfig config; |
config.set_source(PROXY_CONFIG_SOURCE_TEST); |
config.proxy_rules().ParseFromString("https=foopy2:8080"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("http://www.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1688,7 +1715,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
ProxyConfig config; |
config.set_source(PROXY_CONFIG_SOURCE_TEST); |
config.proxy_rules().ParseFromString("https=foopy2:8080"); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("https://www.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1702,7 +1730,8 @@ TEST_F(ProxyServiceTest, ProxyConfigSourcePropagates) { |
{ |
ProxyConfig config; |
config.set_source(PROXY_CONFIG_SOURCE_TEST); |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("http://www.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1725,7 +1754,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
config.proxy_rules().type); |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("http://www.msn.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1737,7 +1767,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
EXPECT_EQ("foopy1:8080", info.proxy_server().ToURI()); |
} |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("ftp://ftp.google.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1749,7 +1780,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
} |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("https://webbranch.techcu.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1761,7 +1793,8 @@ TEST_F(ProxyServiceTest, DefaultProxyFallbackToSOCKS) { |
EXPECT_EQ("socks4://foopy2:1080", info.proxy_server().ToURI()); |
} |
{ |
- ProxyService service(new MockProxyConfigService(config), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
+ nullptr, NULL); |
GURL test_url("unknown://www.microsoft.com"); |
ProxyInfo info; |
TestCompletionCallback callback; |
@@ -1783,7 +1816,8 @@ TEST_F(ProxyServiceTest, CancelInProgressRequest) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Start 3 requests. |
@@ -1856,7 +1890,8 @@ TEST_F(ProxyServiceTest, InitialPACScriptDownload) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -1963,7 +1998,8 @@ TEST_F(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2024,7 +2060,8 @@ TEST_F(ProxyServiceTest, CancelWhilePACFetching) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2119,7 +2156,8 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac) { |
MockAsyncProxyResolver resolver; |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2199,7 +2237,8 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) { |
MockAsyncProxyResolver resolver; |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2274,7 +2313,8 @@ TEST_F(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) { |
MockProxyConfigService* config_service = new MockProxyConfigService(config); |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2335,7 +2375,8 @@ TEST_F(ProxyServiceTest, BypassDoesntApplyToPac) { |
MockAsyncProxyResolver resolver; |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2404,7 +2445,8 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) { |
MockProxyConfigService* config_service = new MockProxyConfigService(config); |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2439,7 +2481,8 @@ TEST_F(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -2457,7 +2500,8 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { |
ProxyConfig config1; |
config1.proxy_rules().ParseFromString("foopy1:8080"); |
config1.set_auto_detect(false); |
- ProxyService service(new MockProxyConfigService(config1), nullptr, NULL); |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config1)), |
+ nullptr, NULL); |
ProxyInfo info; |
TestCompletionCallback callback1; |
@@ -2470,7 +2514,8 @@ TEST_F(ProxyServiceTest, ResetProxyConfigService) { |
ProxyConfig config2; |
config2.proxy_rules().ParseFromString("foopy2:8080"); |
config2.set_auto_detect(false); |
- service.ResetConfigService(new MockProxyConfigService(config2)); |
+ service.ResetConfigService( |
+ make_scoped_ptr(new MockProxyConfigService(config2))); |
TestCompletionCallback callback2; |
rv = service.ResolveProxy(GURL("http://request2"), LOAD_NORMAL, &info, |
callback2.callback(), NULL, NULL, BoundNetLog()); |
@@ -2487,7 +2532,8 @@ TEST_F(ProxyServiceTest, UpdateConfigFromPACToDirect) { |
MockAsyncProxyResolver resolver; |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
// Start 1 request. |
@@ -2539,7 +2585,8 @@ TEST_F(ProxyServiceTest, NetworkChangeTriggersPacRefetch) { |
TestNetLog log; |
- ProxyService service(config_service, make_scoped_ptr(factory), &log); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), &log); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2659,7 +2706,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterFailure) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2764,7 +2812,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentChange) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2875,7 +2924,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterContentUnchanged) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -2983,7 +3033,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterSuccess) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -3136,7 +3187,8 @@ TEST_F(ProxyServiceTest, PACScriptRefetchAfterActivity) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(true); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher; |
service.SetProxyScriptFetchers(fetcher, |
@@ -3235,7 +3287,8 @@ TEST_F(ProxyServiceTest, SynchronousWithPAC) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(config_service, make_scoped_ptr(factory), NULL); |
+ ProxyService service(make_scoped_ptr(config_service), |
+ make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |
@@ -3261,7 +3314,7 @@ TEST_F(ProxyServiceTest, SynchronousWithFixedConfiguration) { |
MockAsyncProxyResolverFactory* factory = |
new MockAsyncProxyResolverFactory(false); |
- ProxyService service(new MockProxyConfigService(config), |
+ ProxyService service(make_scoped_ptr(new MockProxyConfigService(config)), |
make_scoped_ptr(factory), NULL); |
GURL url("http://www.google.com/"); |