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}

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -867,14 +867,18 @@ void NetInternalsMessageHandler::IOThreadImpl::OnHSTSDelete(
 void NetInternalsMessageHandler::IOThreadImpl::OnGetSessionNetworkStats(
     const base::ListValue* list) {
   DCHECK(!list);
+  net::URLRequestContext* context =
+      main_context_getter_->GetURLRequestContext();
   net::HttpNetworkSession* http_network_session =
-      GetHttpNetworkSession(main_context_getter_->GetURLRequestContext());
+      GetHttpNetworkSession(context);
 
   base::Value* network_info = NULL;
   if (http_network_session) {
+    // TODO(mmenke):  This cast is ugly.  Can we get rid of it, or, better,
+    // remove DRP data from net-internals entirely?
     data_reduction_proxy::DataReductionProxyNetworkDelegate* net_delegate =
         static_cast<data_reduction_proxy::DataReductionProxyNetworkDelegate*>(
-            http_network_session->network_delegate());
+            context->network_delegate());
     if (net_delegate) {
       network_info = net_delegate->SessionNetworkStatsInfoToValue();
     }

content/shell/browser/shell_url_request_context_getter.cc

@@ -171,8 +171,6 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
         url_request_context_->ssl_config_service();
     network_session_params.http_auth_handler_factory =
         url_request_context_->http_auth_handler_factory();
-    network_session_params.network_delegate =
-        network_delegate_.get();
     network_session_params.http_server_properties =
         url_request_context_->http_server_properties();
     network_session_params.net_log =

google_apis/gcm/tools/mcs_probe.cc

@@ -418,7 +418,6 @@ void MCSProbe::BuildNetworkSession() {
   session_params.http_auth_handler_factory = http_auth_handler_factory_.get();
   session_params.http_server_properties =
       http_server_properties_->GetWeakPtr();
-  session_params.network_delegate = NULL;  // TODO(zea): implement?
   session_params.host_mapping_rules = host_mapping_rules_.get();
   session_params.ignore_certificate_errors = true;
   session_params.testing_fixed_http_port = 0;

headless/lib/browser/headless_url_request_context_getter.cc

@@ -155,7 +155,6 @@ HeadlessURLRequestContextGetter::GetURLRequestContext() {
         url_request_context_->ssl_config_service();
     network_session_params.http_auth_handler_factory =
         url_request_context_->http_auth_handler_factory();
-    network_session_params.network_delegate = network_delegate_.get();
     network_session_params.http_server_properties =
         url_request_context_->http_server_properties();
     network_session_params.net_log = url_request_context_->net_log();

ios/crnet/crnet_environment.mm

@@ -438,7 +438,6 @@ void CrNetEnvironment::InitializeOnNetworkThread() {
   params.proxy_service = main_context_->proxy_service();
   params.ssl_config_service = main_context_->ssl_config_service();
   params.http_auth_handler_factory = main_context_->http_auth_handler_factory();
-  params.network_delegate = main_context_->network_delegate();
   params.http_server_properties = main_context_->http_server_properties();
   params.net_log = main_context_->net_log();
   params.enable_spdy31 = spdy_enabled();

ios/web/shell/shell_url_request_context_getter.mm

@@ -124,7 +124,6 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
         url_request_context_->ssl_config_service();
     network_session_params.http_auth_handler_factory =
         url_request_context_->http_auth_handler_factory();
-    network_session_params.network_delegate = network_delegate_.get();
     network_session_params.http_server_properties =
         url_request_context_->http_server_properties();
     network_session_params.host_resolver =

jingle/glue/proxy_resolving_client_socket.cc

@@ -67,7 +67,6 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
   session_params.ssl_config_service = request_context->ssl_config_service();
   session_params.http_auth_handler_factory =
       request_context->http_auth_handler_factory();
-  session_params.network_delegate = request_context->network_delegate();
   session_params.http_server_properties =
       request_context->http_server_properties();
   session_params.net_log = request_context->net_log();

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),

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_;

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();

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();

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();

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);