summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy/proxy_service_unittest.cc')
-rw-r--r--net/proxy/proxy_service_unittest.cc77
1 files changed, 44 insertions, 33 deletions
diff --git a/net/proxy/proxy_service_unittest.cc b/net/proxy/proxy_service_unittest.cc
index d4a6326..d608a44 100644
--- a/net/proxy/proxy_service_unittest.cc
+++ b/net/proxy/proxy_service_unittest.cc
@@ -92,7 +92,8 @@ class MockProxyScriptFetcher : public ProxyScriptFetcher {
TEST(ProxyServiceTest, Direct) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(new MockProxyConfigService, resolver, NULL));
+ new ProxyService(new MockProxyConfigService, resolver, NULL,
+ BoundNetLog()));
GURL url("http://www.google.com/");
@@ -120,7 +121,7 @@ TEST(ProxyServiceTest, PAC) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -167,7 +168,7 @@ TEST(ProxyServiceTest, PAC_NoIdentityOrHash) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://username:password@www.google.com/?ref#hash#hash");
@@ -195,7 +196,7 @@ TEST(ProxyServiceTest, PAC_FailoverWithoutDirect) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -252,7 +253,7 @@ TEST(ProxyServiceTest, PAC_FailoverAfterDirect) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -314,7 +315,7 @@ TEST(ProxyServiceTest, ProxyResolverFails) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
// Start first resolve request.
GURL url("http://www.google.com/");
@@ -367,7 +368,7 @@ TEST(ProxyServiceTest, ProxyFallback) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -453,7 +454,7 @@ TEST(ProxyServiceTest, ProxyFallbackToDirect) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -513,7 +514,7 @@ TEST(ProxyServiceTest, ProxyFallback_NewSettings) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -602,7 +603,7 @@ TEST(ProxyServiceTest, ProxyFallback_BadConfig) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -687,7 +688,8 @@ TEST(ProxyServiceTest, ProxyBypassList) {
config.proxy_rules().bypass_rules.ParseFromString("*.org");
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
int rv;
GURL url1("http://www.webkit.org");
@@ -711,7 +713,8 @@ TEST(ProxyServiceTest, PerProtocolProxyTests) {
config.set_auto_detect(false);
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -722,7 +725,8 @@ TEST(ProxyServiceTest, PerProtocolProxyTests) {
}
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -733,7 +737,8 @@ TEST(ProxyServiceTest, PerProtocolProxyTests) {
}
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -745,7 +750,8 @@ TEST(ProxyServiceTest, PerProtocolProxyTests) {
{
config.proxy_rules().ParseFromString("foopy1:8080");
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("http://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -767,7 +773,8 @@ TEST(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("http://www.msn.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -778,7 +785,8 @@ TEST(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
}
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("ftp://ftp.google.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -789,7 +797,8 @@ TEST(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
}
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("https://webbranch.techcu.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -800,7 +809,8 @@ TEST(ProxyServiceTest, DefaultProxyFallbackToSOCKS) {
}
{
scoped_refptr<ProxyService> service(new ProxyService(
- new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL));
+ new MockProxyConfigService(config), new MockAsyncProxyResolver, NULL,
+ BoundNetLog()));
GURL test_url("unknown://www.microsoft.com");
ProxyInfo info;
TestCompletionCallback callback;
@@ -819,7 +829,7 @@ TEST(ProxyServiceTest, CancelInProgressRequest) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
// Start 3 requests.
@@ -894,7 +904,7 @@ TEST(ProxyServiceTest, InitialPACScriptDownload) {
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -973,7 +983,7 @@ TEST(ProxyServiceTest, ChangeScriptFetcherWhilePACDownloadInProgress) {
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1030,7 +1040,7 @@ TEST(ProxyServiceTest, CancelWhilePACFetching) {
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1118,7 +1128,7 @@ TEST(ProxyServiceTest, FallbackFromAutodetectToCustomPac) {
MockAsyncProxyResolverExpectsBytes* resolver =
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1189,7 +1199,7 @@ TEST(ProxyServiceTest, FallbackFromAutodetectToCustomPac2) {
MockAsyncProxyResolverExpectsBytes* resolver =
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1265,7 +1275,7 @@ TEST(ProxyServiceTest, FallbackFromAutodetectToCustomToManual) {
MockAsyncProxyResolverExpectsBytes* resolver =
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1323,7 +1333,7 @@ TEST(ProxyServiceTest, BypassDoesntApplyToPac) {
MockAsyncProxyResolverExpectsBytes* resolver =
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1391,7 +1401,7 @@ TEST(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingFetch) {
MockAsyncProxyResolverExpectsBytes* resolver =
new MockAsyncProxyResolverExpectsBytes;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
@@ -1427,7 +1437,7 @@ TEST(ProxyServiceTest, DeleteWhileInitProxyResolverHasOutstandingSet) {
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
GURL url("http://www.google.com/");
@@ -1450,7 +1460,7 @@ TEST(ProxyServiceTest, ResetProxyConfigService) {
scoped_refptr<ProxyService> service(new ProxyService(
new MockProxyConfigService(config1),
new MockAsyncProxyResolverExpectsBytes,
- NULL));
+ NULL, BoundNetLog()));
ProxyInfo info;
TestCompletionCallback callback1;
@@ -1482,7 +1492,7 @@ TEST(ProxyServiceTest, UpdateConfigAfterFailedAutodetect) {
MockProxyConfigService* config_service = new MockProxyConfigService(config);
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
// Start 1 requests.
@@ -1528,7 +1538,7 @@ TEST(ProxyServiceTest, UpdateConfigFromPACToDirect) {
MockProxyConfigService* config_service = new MockProxyConfigService(config);
MockAsyncProxyResolver* resolver = new MockAsyncProxyResolver;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, NULL));
+ new ProxyService(config_service, resolver, NULL, BoundNetLog()));
// Start 1 request.
@@ -1583,7 +1593,8 @@ TEST(ProxyServiceTest, NetworkChangeTriggersPacRefetch) {
MockNetworkChangeNotifier network_change_notifier;
scoped_refptr<ProxyService> service(
- new ProxyService(config_service, resolver, &network_change_notifier));
+ new ProxyService(config_service, resolver, &network_change_notifier,
+ BoundNetLog()));
MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
service->SetProxyScriptFetcher(fetcher);
generated by cgit v1.1 at 2025-02-01 05:36:27 +0000