| Index: net/tools/fetch/fetch_client.cc
|
| ===================================================================
|
| --- net/tools/fetch/fetch_client.cc (revision 50775)
|
| +++ net/tools/fetch/fetch_client.cc (working copy)
|
| @@ -133,7 +133,7 @@
|
| MessageLoop loop(MessageLoop::TYPE_IO);
|
|
|
| scoped_refptr<net::HostResolver> host_resolver(
|
| - net::CreateSystemHostResolver(NULL));
|
| + net::CreateSystemHostResolver());
|
|
|
| scoped_refptr<net::ProxyService> proxy_service(
|
| net::ProxyService::CreateNull());
|
| @@ -143,18 +143,14 @@
|
| scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory(
|
| net::HttpAuthHandlerFactory::CreateDefault());
|
| if (use_cache) {
|
| - factory = new net::HttpCache(NULL, host_resolver, proxy_service,
|
| - ssl_config_service,
|
| - http_auth_handler_factory.get(),
|
| - NULL,
|
| - NULL,
|
| - net::HttpCache::DefaultBackend::InMemory(0));
|
| + factory = new net::HttpCache(host_resolver, proxy_service,
|
| + ssl_config_service, http_auth_handler_factory.get(), NULL, NULL,
|
| + net::HttpCache::DefaultBackend::InMemory(0));
|
| } else {
|
| factory = new net::HttpNetworkLayer(
|
| - net::ClientSocketFactory::GetDefaultFactory(), NULL, host_resolver,
|
| + net::ClientSocketFactory::GetDefaultFactory(), host_resolver,
|
| proxy_service, ssl_config_service, http_auth_handler_factory.get(),
|
| - NULL,
|
| - NULL);
|
| + NULL, NULL);
|
| }
|
|
|
| {
|
|
|