[Merge M51][Downloads] Use the initiating StoragePartition for resumption.

content/browser/download/download_item_impl.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.
 
 // File method ordering: Methods in this file are in the same order as
 // in download_item_impl.h, with the following exception: The public
 // interface Start is placed in chronological order with the other
 // (private) routines that together define a DownloadItem's state
 // transitions as the download progresses.  See "Download progression
 // cascade" later in this file.
@@ skipping 33 matching lines @@
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_url_parameters.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/referrer.h"
 
 namespace content {
 
 namespace {
 
 bool DeleteDownloadedFile(const base::FilePath& path) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
@@ skipping 41 matching lines @@
 const int DownloadItemImpl::kMaxAutoResumeAttempts = 5;
 
 // Constructor for reading from the history service.
 DownloadItemImpl::DownloadItemImpl(DownloadItemImplDelegate* delegate,
                                    const std::string& guid,
                                    uint32_t download_id,
                                    const base::FilePath& current_path,
                                    const base::FilePath& target_path,
                                    const std::vector<GURL>& url_chain,
                                    const GURL& referrer_url,
+                                   const GURL& site_url,
                                    const GURL& tab_url,
                                    const GURL& tab_refererr_url,
                                    const std::string& mime_type,
                                    const std::string& original_mime_type,
                                    const base::Time& start_time,
                                    const base::Time& end_time,
                                    const std::string& etag,
                                    const std::string& last_modified,
                                    int64_t received_bytes,
                                    int64_t total_bytes,
                                    const std::string& hash,
                                    DownloadItem::DownloadState state,
                                    DownloadDangerType danger_type,
                                    DownloadInterruptReason interrupt_reason,
                                    bool opened,
                                    const net::BoundNetLog& bound_net_log)
     : guid_(base::ToUpperASCII(guid)),
       download_id_(download_id),
       target_path_(target_path),
       url_chain_(url_chain),
       referrer_url_(referrer_url),
+      site_url_(site_url),
       tab_url_(tab_url),
       tab_referrer_url_(tab_refererr_url),
       mime_type_(mime_type),
       original_mime_type_(original_mime_type),
       total_bytes_(total_bytes),
       last_reason_(interrupt_reason),
       start_tick_(base::TimeTicks()),
       state_(ExternalToInternalState(state)),
       danger_type_(danger_type),
       start_time_(start_time),
@@ skipping 20 matching lines @@
                                    uint32_t download_id,
                                    const DownloadCreateInfo& info,
                                    const net::BoundNetLog& bound_net_log)
     : guid_(base::ToUpperASCII(base::GenerateGUID())),
       download_id_(download_id),
       target_disposition_((info.save_info->prompt_for_save_location)
                               ? TARGET_DISPOSITION_PROMPT
                               : TARGET_DISPOSITION_OVERWRITE),
       url_chain_(info.url_chain),
       referrer_url_(info.referrer_url),
+      site_url_(info.site_url),
       tab_url_(info.tab_url),
       tab_referrer_url_(info.tab_referrer_url),
       suggested_filename_(base::UTF16ToUTF8(info.save_info->suggested_name)),
       forced_file_path_(info.save_info->file_path),
       transition_type_(info.transition_type),
       has_user_gesture_(info.has_user_gesture),
       content_disposition_(info.content_disposition),
       mime_type_(info.mime_type),
       original_mime_type_(info.original_mime_type),
       remote_address_(info.remote_address),
@@ skipping 338 matching lines @@
 const GURL& DownloadItemImpl::GetOriginalUrl() const {
   // Be careful about taking the front() of possibly-empty vectors!
   // http://crbug.com/190096
   return url_chain_.empty() ? GURL::EmptyGURL() : url_chain_.front();
 }
 
 const GURL& DownloadItemImpl::GetReferrerUrl() const {
   return referrer_url_;
 }
 
+const GURL& DownloadItemImpl::GetSiteUrl() const {
+  return site_url_;
+}
+
 const GURL& DownloadItemImpl::GetTabUrl() const {
   return tab_url_;
 }
 
 const GURL& DownloadItemImpl::GetTabReferrerUrl() const {
   return tab_referrer_url_;
 }
 
 std::string DownloadItemImpl::GetSuggestedFilename() const {
   return suggested_filename_;
@@ skipping 258 matching lines @@
         " reason = %s"
         " paused = %c"
         " resume_mode = %s"
         " auto_resume_count = %d"
         " danger = %d"
         " all_data_saved = %c"
         " last_modified = '%s'"
         " etag = '%s'"
         " has_download_file = %s"
         " url_chain = \n\t\"%s\"\n\t"
-        " current_path = \"%" PRFilePath "\"\n\t"
-        " target_path = \"%" PRFilePath "\""
-        " referrer = \"%s\"",
-        GetTotalBytes(),
-        GetReceivedBytes(),
+        " current_path = \"%" PRFilePath
+        "\"\n\t"
+        " target_path = \"%" PRFilePath
+        "\""
+        " referrer = \"%s\""
+        " site_url = \"%s\"",
+        GetTotalBytes(), GetReceivedBytes(),
         DownloadInterruptReasonToString(last_reason_).c_str(),
-        IsPaused() ? 'T' : 'F',
-        DebugResumeModeString(GetResumeMode()),
-        auto_resume_count_,
-        GetDangerType(),
-        AllDataSaved() ? 'T' : 'F',
-        GetLastModifiedTime().c_str(),
-        GetETag().c_str(),
-        download_file_.get() ? "true" : "false",
-        url_list.c_str(),
-        GetFullPath().value().c_str(),
-        GetTargetFilePath().value().c_str(),
-        GetReferrerUrl().spec().c_str());
+        IsPaused() ? 'T' : 'F', DebugResumeModeString(GetResumeMode()),
+        auto_resume_count_, GetDangerType(), AllDataSaved() ? 'T' : 'F',
+        GetLastModifiedTime().c_str(), GetETag().c_str(),
+        download_file_.get() ? "true" : "false", url_list.c_str(),
+        GetFullPath().value().c_str(), GetTargetFilePath().value().c_str(),
+        GetReferrerUrl().spec().c_str(), GetSiteUrl().spec().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
 
   description += " }";
 
   return description;
 }
 
 DownloadItemImpl::ResumeMode DownloadItemImpl::GetResumeMode() const {
@@ skipping 1052 matching lines @@
   ResumeMode mode = GetResumeMode();
   if (mode == RESUME_MODE_IMMEDIATE_RESTART ||
       mode == RESUME_MODE_USER_RESTART) {
     received_bytes_ = 0;
     last_modified_time_.clear();
     etag_.clear();
     hash_.clear();
     hash_state_.reset();
   }
 
+  StoragePartition* storage_partition =
+      BrowserContext::GetStoragePartitionForSite(GetBrowserContext(),
+                                                 site_url_);
+
   // Avoid using the WebContents even if it's still around. Resumption requests
   // are consistently routed through the no-renderer code paths so that the
   // request will not be dropped if the WebContents (and by extension, the
   // associated renderer) goes away before a response is received.
-  scoped_ptr<DownloadUrlParameters> download_params(new DownloadUrlParameters(
-      GetURL(), -1, -1, -1, GetBrowserContext()->GetResourceContext()));
+  scoped_ptr<DownloadUrlParameters> download_params(
+      new DownloadUrlParameters(GetURL(), -1, -1, -1,
+                                storage_partition->GetURLRequestContext()));
   download_params->set_file_path(GetFullPath());
   download_params->set_offset(GetReceivedBytes());
   download_params->set_last_modified(GetLastModifiedTime());
   download_params->set_etag(GetETag());
   download_params->set_hash_of_partial_file(hash_);
   download_params->set_hash_state(std::move(hash_state_));
 
   // Note that resumed downloads disallow redirects. Hence the referrer URL
   // (which is the contents of the Referer header for the last download request)
   // will only be sent to the URL returned by GetURL().
@@ skipping 176 matching lines @@
     case RESUME_MODE_USER_CONTINUE:
       return "USER_CONTINUE";
     case RESUME_MODE_USER_RESTART:
       return "USER_RESTART";
   }
   NOTREACHED() << "Unknown resume mode " << mode;
   return "unknown";
 }
 
 }  // namespace content