NetworkService: Destroy URLLoaders when a NetworkContext is destroyed.

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"
@@ skipping 71 matching lines @@
   }
 
   return builder.Build();
 }
 
 }  // namespace
 
 NetworkContext::NetworkContext(mojom::NetworkContextRequest request,
                                mojom::NetworkContextParamsPtr params)
     : url_request_context_(MakeURLRequestContext()),
-      in_shutdown_(false),
       params_(std::move(params)),
       binding_(this, std::move(request)) {}
 
 NetworkContext::~NetworkContext() {
-  in_shutdown_ = true;
   // 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 iterate over a copy.
-  for (auto* url_loader : url_loaders_)
-    url_loader->Cleanup();
+  // so have to be careful.
+  while (!url_loaders_.empty())
+    (*url_loaders_.begin())->Cleanup();
 }
 
 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) {
-  if (!in_shutdown_) {
-    size_t removed_count = url_loaders_.erase(url_loader);
-    DCHECK(removed_count);
-  }
+  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));
 }
 
 NetworkContext::NetworkContext()
     : url_request_context_(MakeURLRequestContext()),
-      in_shutdown_(false),
       binding_(this) {}
 
 }  // namespace content