NetworkService: Destroy URLLoaders when a NetworkContext is destroyed.

content/network/url_loader_impl.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/url_loader_impl.h"
 
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/common/net_adapters.h"
@@ skipping 152 matching lines @@
     : context_(context),
       options_(options),
       connected_(true),
       binding_(this, std::move(url_loader_request)),
       url_loader_client_(std::move(url_loader_client)),
       writable_handle_watcher_(FROM_HERE,
                                mojo::SimpleWatcher::ArmingPolicy::MANUAL),
       peer_closed_handle_watcher_(FROM_HERE,
                                   mojo::SimpleWatcher::ArmingPolicy::MANUAL),
       weak_ptr_factory_(this) {
+  context_->RegisterURLLoader(this);
   binding_.set_connection_error_handler(
       base::Bind(&URLLoaderImpl::OnConnectionError, base::Unretained(this)));
 
   url_request_ = context_->url_request_context()->CreateRequest(
       GURL(request.url), net::DEFAULT_PRIORITY, this, traffic_annotation);
   url_request_->set_method(request.method);
 
   url_request_->set_first_party_for_cookies(request.first_party_for_cookies);
 
   const Referrer referrer(request.referrer, request.referrer_policy);
@@ skipping 11 matching lines @@
     url_request_->set_upload(
         CreateUploadDataStream(request.request_body.get(), task_runner.get()));
   }
 
   int load_flags = BuildLoadFlagsForRequest(request, false);
   url_request_->SetLoadFlags(load_flags);
 
   url_request_->Start();
 }
 
-URLLoaderImpl::~URLLoaderImpl() {}
+URLLoaderImpl::~URLLoaderImpl() {
+  context_->DeregisterURLLoader(this);
+}
 
 void URLLoaderImpl::Cleanup() {
   // The associated network context is going away and we have to destroy
-  // net::URLRequest hold by this loader.
+  // net::URLRequest held by this loader.
   delete this;
 }
 
 void URLLoaderImpl::FollowRedirect() {
   if (!url_request_) {
     NotifyCompleted(net::ERR_UNEXPECTED);
     return;
   }
 
   url_request_->FollowDeferredRedirect();
@@ skipping 128 matching lines @@
   if (!url_request->status().is_success()) {
     writable_handle_watcher_.Cancel();
     pending_write_ = nullptr;  // This closes the data pipe.
     DeleteIfNeeded();
     return;
   }
 
   DidRead(static_cast<uint32_t>(bytes_read), false);
 }
 
+base::WeakPtr<URLLoaderImpl> URLLoaderImpl::GetWeakPtrForTests() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 void URLLoaderImpl::NotifyCompleted(int error_code) {
   ResourceRequestCompletionStatus request_complete_data;
   request_complete_data.error_code = error_code;
   request_complete_data.exists_in_cache =
       url_request_->response_info().was_cached;
   request_complete_data.completion_time = base::TimeTicks::Now();
   request_complete_data.encoded_data_length =
       url_request_->GetTotalReceivedBytes();
   request_complete_data.encoded_body_length = url_request_->GetRawBodyBytes();
 
@@ skipping 19 matching lines @@
   ReadMore();
 }
 
 void URLLoaderImpl::DeleteIfNeeded() {
   bool has_data_pipe = pending_write_.get() || response_body_stream_.is_valid();
   if (!connected_ && !has_data_pipe)
     delete this;
 }
 
 }  // namespace content