| Index: chrome/service/net/service_url_request_context.cc
|
| ===================================================================
|
| --- chrome/service/net/service_url_request_context.cc (revision 50775)
|
| +++ chrome/service/net/service_url_request_context.cc (working copy)
|
| @@ -21,7 +21,7 @@
|
| }
|
|
|
| ServiceURLRequestContext::ServiceURLRequestContext() {
|
| - host_resolver_ = net::CreateSystemHostResolver(NULL);
|
| + host_resolver_ = net::CreateSystemHostResolver();
|
| DCHECK(g_service_process);
|
| // TODO(sanjeevr): Change CreateSystemProxyConfigService to accept a
|
| // MessageLoopProxy* instead of MessageLoop*.
|
| @@ -30,13 +30,13 @@
|
| net::ProxyService::CreateSystemProxyConfigService(
|
| g_service_process->io_thread()->message_loop(),
|
| g_service_process->file_thread()->message_loop());
|
| - proxy_service_ = net::ProxyService::Create(proxy_config_service, false, this,
|
| - NULL, NULL, NULL);
|
| + proxy_service_ =
|
| + net::ProxyService::Create(proxy_config_service, false, this, NULL, NULL);
|
| ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
|
| ssl_config_service_ = new net::SSLConfigServiceDefaults;
|
| http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault();
|
| http_transaction_factory_ = new net::HttpCache(
|
| - net::HttpNetworkLayer::CreateFactory(NULL, host_resolver_,
|
| + net::HttpNetworkLayer::CreateFactory(host_resolver_,
|
| proxy_service_,
|
| ssl_config_service_,
|
| http_auth_handler_factory_,
|
|
|