| Index: net/proxy/proxy_service_unittest.cc
|
| ===================================================================
|
| --- net/proxy/proxy_service_unittest.cc (revision 141266)
|
| +++ net/proxy/proxy_service_unittest.cc (working copy)
|
| @@ -162,7 +162,7 @@
|
|
|
| ProxyInfo info;
|
| TestCompletionCallback callback;
|
| - CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log;
|
| int rv = service.ResolveProxy(
|
| url, &info, callback.callback(), NULL, log.bound());
|
| EXPECT_EQ(OK, rv);
|
| @@ -196,7 +196,7 @@
|
|
|
| ProxyInfo info;
|
| TestCompletionCallback callback;
|
| - CapturingBoundNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log;
|
|
|
| int rv = service.ResolveProxy(
|
| url, &info, callback.callback(), NULL, log.bound());
|
| @@ -1409,7 +1409,7 @@
|
| ProxyInfo info1;
|
| TestCompletionCallback callback1;
|
| ProxyService::PacRequest* request1;
|
| - CapturingBoundNetLog log1(CapturingNetLog::kUnbounded);
|
| + CapturingBoundNetLog log1;
|
| int rv = service.ResolveProxy(GURL("http://request1"), &info1,
|
| callback1.callback(), &request1, log1.bound());
|
| EXPECT_EQ(ERR_IO_PENDING, rv);
|
| @@ -1893,7 +1893,7 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + CapturingNetLog log;
|
|
|
| ProxyService service(config_service, resolver, &log);
|
|
|
| @@ -2013,10 +2013,8 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + ProxyService service(config_service, resolver, NULL);
|
|
|
| - ProxyService service(config_service, resolver, &log);
|
| -
|
| MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
|
| service.SetProxyScriptFetchers(fetcher,
|
| new DoNothingDhcpProxyScriptFetcher());
|
| @@ -2120,10 +2118,8 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + ProxyService service(config_service, resolver, NULL);
|
|
|
| - ProxyService service(config_service, resolver, &log);
|
| -
|
| MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
|
| service.SetProxyScriptFetchers(fetcher,
|
| new DoNothingDhcpProxyScriptFetcher());
|
| @@ -2232,10 +2228,8 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + ProxyService service(config_service, resolver, NULL);
|
|
|
| - ProxyService service(config_service, resolver, &log);
|
| -
|
| MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
|
| service.SetProxyScriptFetchers(fetcher,
|
| new DoNothingDhcpProxyScriptFetcher());
|
| @@ -2340,10 +2334,8 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + ProxyService service(config_service, resolver, NULL);
|
|
|
| - ProxyService service(config_service, resolver, &log);
|
| -
|
| MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
|
| service.SetProxyScriptFetchers(fetcher,
|
| new DoNothingDhcpProxyScriptFetcher());
|
| @@ -2494,10 +2486,8 @@
|
| MockAsyncProxyResolverExpectsBytes* resolver =
|
| new MockAsyncProxyResolverExpectsBytes;
|
|
|
| - CapturingNetLog log(CapturingNetLog::kUnbounded);
|
| + ProxyService service(config_service, resolver, NULL);
|
|
|
| - ProxyService service(config_service, resolver, &log);
|
| -
|
| MockProxyScriptFetcher* fetcher = new MockProxyScriptFetcher;
|
| service.SetProxyScriptFetchers(fetcher,
|
| new DoNothingDhcpProxyScriptFetcher());
|
|
|