Index: net/http/http_network_layer.cc |
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc |
index a883db261d14aee90a375f8692b58d13426bb61c..a773ac46b0a65c268fff4d03bb81cda0249ae4eb 100644 |
--- a/net/http/http_network_layer.cc |
+++ b/net/http/http_network_layer.cc |
@@ -22,6 +22,7 @@ namespace net { |
// static |
HttpTransactionFactory* HttpNetworkLayer::CreateFactory( |
HostResolver* host_resolver, |
+ DnsRRResolver* dnsrr_resolver, |
ProxyService* proxy_service, |
SSLConfigService* ssl_config_service, |
HttpAuthHandlerFactory* http_auth_handler_factory, |
@@ -30,8 +31,8 @@ HttpTransactionFactory* HttpNetworkLayer::CreateFactory( |
DCHECK(proxy_service); |
return new HttpNetworkLayer(ClientSocketFactory::GetDefaultFactory(), |
- host_resolver, proxy_service, ssl_config_service, |
- http_auth_handler_factory, |
+ host_resolver, dnsrr_resolver, proxy_service, |
+ ssl_config_service, http_auth_handler_factory, |
network_delegate, |
net_log); |
} |
@@ -48,6 +49,7 @@ HttpTransactionFactory* HttpNetworkLayer::CreateFactory( |
HttpNetworkLayer::HttpNetworkLayer( |
ClientSocketFactory* socket_factory, |
HostResolver* host_resolver, |
+ DnsRRResolver* dnsrr_resolver, |
ProxyService* proxy_service, |
SSLConfigService* ssl_config_service, |
HttpAuthHandlerFactory* http_auth_handler_factory, |
@@ -55,6 +57,7 @@ HttpNetworkLayer::HttpNetworkLayer( |
NetLog* net_log) |
: socket_factory_(socket_factory), |
host_resolver_(host_resolver), |
+ dnsrr_resolver_(dnsrr_resolver), |
proxy_service_(proxy_service), |
ssl_config_service_(ssl_config_service), |
session_(NULL), |
@@ -70,6 +73,7 @@ HttpNetworkLayer::HttpNetworkLayer( |
HttpNetworkLayer::HttpNetworkLayer( |
ClientSocketFactory* socket_factory, |
HostResolver* host_resolver, |
+ DnsRRResolver* dnsrr_resolver, |
ProxyService* proxy_service, |
SSLConfigService* ssl_config_service, |
SpdySessionPool* spdy_session_pool, |
@@ -78,6 +82,7 @@ HttpNetworkLayer::HttpNetworkLayer( |
NetLog* net_log) |
: socket_factory_(socket_factory), |
host_resolver_(host_resolver), |
+ dnsrr_resolver_(dnsrr_resolver), |
proxy_service_(proxy_service), |
ssl_config_service_(ssl_config_service), |
session_(NULL), |
@@ -92,6 +97,7 @@ HttpNetworkLayer::HttpNetworkLayer( |
HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session) |
: socket_factory_(ClientSocketFactory::GetDefaultFactory()), |
+ dnsrr_resolver_(NULL), |
ssl_config_service_(NULL), |
session_(session), |
spdy_session_pool_(NULL), |
@@ -131,6 +137,7 @@ HttpNetworkSession* HttpNetworkLayer::GetSession() { |
spdy_session_pool_.reset(new SpdySessionPool(ssl_config_service_)); |
session_ = new HttpNetworkSession( |
host_resolver_, |
+ dnsrr_resolver_, |
proxy_service_, |
socket_factory_, |
ssl_config_service_, |
@@ -140,6 +147,7 @@ HttpNetworkSession* HttpNetworkLayer::GetSession() { |
net_log_); |
// These were just temps for lazy-initializing HttpNetworkSession. |
host_resolver_ = NULL; |
+ dnsrr_resolver_ = NULL; |
proxy_service_ = NULL; |
socket_factory_ = NULL; |
http_auth_handler_factory_ = NULL; |