Revert of NetworkService: Destroy NetworkContexts on NetworkService teardown.

content/network/network_context.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/network/network_context.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "content/network/cache_url_loader.h"
-#include "content/network/network_service.h"
 #include "content/network/network_service_url_loader_factory_impl.h"
 #include "content/network/url_loader_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"
 #include "net/http/http_network_session.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 57 matching lines @@
     builder.set_proxy_config_service(std::move(fixed_config_service));
   } else {
     builder.set_proxy_service(net::ProxyService::CreateDirect());
   }
 
   return builder.Build();
 }
 
 }  // namespace
 
-NetworkContext::NetworkContext(NetworkService* network_service,
-                               mojom::NetworkContextRequest request,
+NetworkContext::NetworkContext(mojom::NetworkContextRequest request,
                                mojom::NetworkContextParamsPtr params)
-    : network_service_(network_service),
-      url_request_context_(MakeURLRequestContext()),
+    : url_request_context_(MakeURLRequestContext()),
       params_(std::move(params)),
-      binding_(this, std::move(request)) {
-  network_service_->RegisterNetworkContext(this);
-  binding_.set_connection_error_handler(
-      base::Bind(&NetworkContext::OnConnectionError, base::Unretained(this)));
-}
+      binding_(this, std::move(request)) {}
 
 NetworkContext::~NetworkContext() {
   // Call each URLLoaderImpl and ask it to release its net::URLRequest, as the
   // corresponding net::URLRequestContext is going away with this
   // NetworkContext. The loaders can be deregistering themselves in Cleanup(),
   // so have to be careful.
   while (!url_loaders_.empty())
     (*url_loaders_.begin())->Cleanup();
-
-  // May be nullptr in tests.
-  if (network_service_)
-    network_service_->DeregisterNetworkContext(this);
 }
 
 std::unique_ptr<NetworkContext> NetworkContext::CreateForTesting() {
   return base::WrapUnique(new NetworkContext);
 }
 
 void NetworkContext::RegisterURLLoader(URLLoaderImpl* url_loader) {
   DCHECK(url_loaders_.count(url_loader) == 0);
   url_loaders_.insert(url_loader);
 }
 
 void NetworkContext::DeregisterURLLoader(URLLoaderImpl* url_loader) {
   size_t removed_count = url_loaders_.erase(url_loader);
   DCHECK(removed_count);
 }
 
 void NetworkContext::CreateURLLoaderFactory(
     mojom::URLLoaderFactoryRequest request,
     uint32_t process_id) {
   loader_factory_bindings_.AddBinding(
       base::MakeUnique<NetworkServiceURLLoaderFactoryImpl>(this, process_id),
       std::move(request));
 }
 
 void NetworkContext::HandleViewCacheRequest(const GURL& url,
                                             mojom::URLLoaderClientPtr client) {
   StartCacheURLLoader(url, url_request_context_.get(), std::move(client));
 }
 
-void NetworkContext::Cleanup() {
-  // The NetworkService is going away, so have to destroy the
-  // net::URLRequestContext held by this NetworkContext.
-  delete this;
-}
-
 NetworkContext::NetworkContext()
-    : network_service_(nullptr),
-      url_request_context_(MakeURLRequestContext()),
+    : url_request_context_(MakeURLRequestContext()),
       binding_(this) {}
 
-void NetworkContext::OnConnectionError() {
-  // Don't delete |this| in response to connection errors when it was created by
-  // CreateForTesting.
-  if (network_service_)
-    delete this;
-}
-
 }  // namespace content