[Mojo-Loading] Use independent URLLoaderClient

content/child/resource_dispatcher.cc

 // Copyright (c) 2012 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/child/resource_dispatcher.h"
 
 #include <utility>
 
@@ skipping 398 matching lines @@
                            request_complete_data.encoded_body_length);
 }
 
 bool ResourceDispatcher::RemovePendingRequest(int request_id) {
   PendingRequestMap::iterator it = pending_requests_.find(request_id);
   if (it == pending_requests_.end())
     return false;
 
   PendingRequestInfo* request_info = it->second.get();
 
-  bool release_downloaded_file = request_info->download_to_file;
+  // |url_loader_client| releases the downloaded file. Otherwise, we should
+  // release it here.

[dcheng, 2017/03/01 01:44:24]

I think it would be good if this comment also mentioned why it might be null
here: does that mean we were racing on ipc messages, or we never bound the
client, or something else?

[yhirano, 2017/03/01 01:53:04]

Fixed. Is it clear now?

+  bool release_downloaded_file =
+      request_info->download_to_file && !it->second->url_loader_client;
 
   ReleaseResourcesInMessageQueue(&request_info->deferred_message_queue);
 
   // Cancel loading.
   it->second->url_loader = nullptr;
   // Clear URLLoaderClient to stop receiving further Mojo IPC from the browser
   // process.
   it->second->url_loader_client = nullptr;
 
   // Always delete the pending_request asyncly so that cancelling the request
@@ skipping 236 matching lines @@
     resource_scheduling_filter_->SetRequestIdTaskRunner(request_id,
                                                         loading_task_runner);
   }
 
   if (ipc_type == blink::WebURLRequest::LoadingIPCType::Mojo) {
     scoped_refptr<base::SingleThreadTaskRunner> task_runner =
         loading_task_runner ? loading_task_runner : main_thread_task_runner_;
     std::unique_ptr<URLLoaderClientImpl> client(
         new URLLoaderClientImpl(request_id, this, std::move(task_runner)));
     mojom::URLLoaderAssociatedPtr url_loader;
-    mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info;
-    client->Bind(&client_ptr_info);
+    mojom::URLLoaderClientPtr client_ptr;
+    client->Bind(&client_ptr);
     url_loader_factory->CreateLoaderAndStart(MakeRequest(&url_loader),
                                              routing_id, request_id, *request,
-                                             std::move(client_ptr_info));
+                                             std::move(client_ptr));
     pending_requests_[request_id]->url_loader = std::move(url_loader);
     pending_requests_[request_id]->url_loader_client = std::move(client);
   } else {
     message_sender_->Send(
         new ResourceHostMsg_RequestResource(routing_id, request_id, *request));
   }
 
   return request_id;
 }
 
@@ skipping 131 matching lines @@
     delete message;
   }
 }
 
 void ResourceDispatcher::SetResourceSchedulingFilter(
     scoped_refptr<ResourceSchedulingFilter> resource_scheduling_filter) {
   resource_scheduling_filter_ = resource_scheduling_filter;
 }
 
 }  // namespace content