Make passing of DownloadRequestHandle separate from DownloadCreateInfo.

content/browser/download/download_resource_handler.cc

 // Copyright (c) 2011 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/browser/download/download_resource_handler.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stringprintf.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_buffer.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_request_handle.h"
+#include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/interrupt_reasons.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 62 matching lines @@
       download_id_.local(), request_info->has_user_gesture(),
       request_info->transition_type());
   info->url_chain = request_->url_chain();
   info->referrer_url = GURL(request_->referrer());
   info->start_time = base::Time::Now();
   info->received_bytes = 0;
   info->total_bytes = content_length_;
   info->state = DownloadItem::IN_PROGRESS;
   info->download_id = download_id_.local();
   info->has_user_gesture = request_info->has_user_gesture();
-  info->request_handle = DownloadRequestHandle(rdh_,
-                                               global_id_.child_id,
-                                               render_view_id_,
-                                               global_id_.request_id);
   info->content_disposition = content_disposition_;
   info->mime_type = response->response_head.mime_type;
   download_stats::RecordDownloadMimeType(info->mime_type);
+
+  DownloadRequestHandle request_handle(rdh_, global_id_.child_id,
+                                       render_view_id_, global_id_.request_id);
+
   // TODO(ahendrickson) -- Get the last modified time and etag, so we can
   // resume downloading.
 
   CallStartedCB(net::OK);
 
   std::string content_type_header;
   if (!response->response_head.headers ||
       !response->response_head.headers->GetMimeType(&content_type_header))
     content_type_header = "";
   info->original_mime_type = content_type_header;
 
   info->prompt_user_for_save_location =
       save_as_ && save_info_.file_path.empty();
   info->referrer_charset = request_->context()->referrer_charset();
   info->save_info = save_info_;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(
-          download_file_manager_, &DownloadFileManager::StartDownload, info));
+          download_file_manager_, &DownloadFileManager::StartDownload,
+          info, request_handle));
 
   // We can't start saving the data before we create the file on disk.
   // The request will be un-paused in DownloadFileManager::CreateDownloadFile.
   rdh_->PauseRequest(global_id_.child_id, global_id_.request_id, true);
 
   return true;
 }
 
 void DownloadResourceHandler::CallStartedCB(net::Error error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 154 matching lines @@
                             " render_view_id_ = " "%d"
                             " save_info_.file_path = \"%" PRFilePath "\""
                             " }",
                             request_->url().spec().c_str(),
                             download_id_.local(),
                             global_id_.child_id,
                             global_id_.request_id,
                             render_view_id_,
                             save_info_.file_path.value().c_str());
 }