Remove NetworkDelegate pointer from HttpNetworkSession.

Nothing is currently using it, and currently HttpNetworkSessions
can be shared by URLRequestContexts with different NetworkDelegates,
so best to remove the field.

TBR=zea@chromium.org, mkwst@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/1811283004

Cr-Commit-Position: refs/heads/master@{#382031}

6 files changed, 0 insertions, 12 deletions

diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 4493ce4..b53a3c0 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -81,7 +81,6 @@ HttpNetworkSession::Params::Params()
       proxy_service(NULL),
       ssl_config_service(NULL),
       http_auth_handler_factory(NULL),
-      network_delegate(NULL),
       net_log(NULL),
       host_mapping_rules(NULL),
       socket_performance_watcher_factory(NULL),
@@ -142,7 +141,6 @@ HttpNetworkSession::Params::~Params() {}
 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
 HttpNetworkSession::HttpNetworkSession(const Params& params)
     : net_log_(params.net_log),
-      network_delegate_(params.network_delegate),
       http_server_properties_(params.http_server_properties),
       cert_verifier_(params.cert_verifier),
       http_auth_handler_factory_(params.http_auth_handler_factory),
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 3648a7a..132195c 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -45,7 +45,6 @@ class HttpProxyClientSocketPool;
 class HttpResponseBodyDrainer;
 class HttpServerProperties;
 class NetLog;
-class NetworkDelegate;
 class ProxyDelegate;
 class ProxyService;
 class QuicClock;
@@ -77,7 +76,6 @@ class NET_EXPORT HttpNetworkSession
     ProxyService* proxy_service;
     SSLConfigService* ssl_config_service;
     HttpAuthHandlerFactory* http_auth_handler_factory;
-    NetworkDelegate* network_delegate;
     base::WeakPtr<HttpServerProperties> http_server_properties;
     NetLog* net_log;
     HostMappingRules* host_mapping_rules;
@@ -225,9 +223,6 @@ class NET_EXPORT HttpNetworkSession
   HttpAuthHandlerFactory* http_auth_handler_factory() {
     return http_auth_handler_factory_;
   }
-  NetworkDelegate* network_delegate() {
-    return network_delegate_;
-  }
   base::WeakPtr<HttpServerProperties> http_server_properties() {
     return http_server_properties_;
   }
@@ -271,7 +266,6 @@ class NET_EXPORT HttpNetworkSession
   ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
 
   NetLog* const net_log_;
-  NetworkDelegate* const network_delegate_;
   const base::WeakPtr<HttpServerProperties> http_server_properties_;
   CertVerifier* const cert_verifier_;
   HttpAuthHandlerFactory* const http_auth_handler_factory_;
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 6359081..627eeee 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -461,7 +461,6 @@ SpdyURLRequestContext::SpdyURLRequestContext(NextProto protocol)
   params.proxy_service = proxy_service();
   params.ssl_config_service = ssl_config_service();
   params.http_auth_handler_factory = http_auth_handler_factory();
-  params.network_delegate = network_delegate();
   params.enable_spdy_ping_based_connection_checking = false;
   params.spdy_default_protocol = protocol;
   params.http_server_properties = http_server_properties();
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index b0e737f..bd59db6 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -223,7 +223,6 @@ void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
   params->proxy_service = context->proxy_service();
   params->ssl_config_service = context->ssl_config_service();
   params->http_auth_handler_factory = context->http_auth_handler_factory();
-  params->network_delegate = context->network_delegate();
   params->http_server_properties = context->http_server_properties();
   params->net_log = context->net_log();
   params->channel_id_service = context->channel_id_service();
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 330104b..fbcc19b 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -111,7 +111,6 @@ void TestURLRequestContext::Init() {
     params.proxy_service = proxy_service();
     params.ssl_config_service = ssl_config_service();
     params.http_auth_handler_factory = http_auth_handler_factory();
-    params.network_delegate = network_delegate();
     params.http_server_properties = http_server_properties();
     params.net_log = net_log();
     params.channel_id_service = channel_id_service();
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index fef773d..17ead4c 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -8691,7 +8691,6 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
   params.ssl_config_service = default_context_.ssl_config_service();
   params.http_auth_handler_factory =
       default_context_.http_auth_handler_factory();
-  params.network_delegate = &default_network_delegate_;
   params.http_server_properties = default_context_.http_server_properties();
 
   HttpNetworkSession network_session(params);