Adding WebContent-free Download

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 486 matching lines @@
   return is_temporary_;
 }
 
 bool DownloadItemImpl::CanResume() const {
   if ((GetState() == IN_PROGRESS) && IsPaused())
     return true;
 
   if (state_ != INTERRUPTED_INTERNAL)
     return false;
 
-  // Downloads that don't have a WebContents should still be resumable, but this
-  // isn't currently the case. See ResumeInterruptedDownload().
-  if (!GetWebContents())
-    return false;
-
   ResumeMode resume_mode = GetResumeMode();
-  return IsDownloadResumptionEnabled() &&
-      (resume_mode == RESUME_MODE_USER_RESTART ||
-       resume_mode == RESUME_MODE_USER_CONTINUE);
+  return IsDownloadResumptionEnabled() && GetURL().SchemeIsHTTPOrHTTPS() &&

[asanka, 2015/11/25 15:53:57]

Nit: You can move the SchemeIs.. check into it's own line above the
GetResumeMode() call and return early. That way you can document why we are
limiting ourselves to http/s. We may revisit this decision since we still have
the option to completely restart the request for non http/s downloads, but
that'll be done separately once we have http/s working.

[svaldez, 2015/11/25 17:53:28]

Done.

+         (resume_mode == RESUME_MODE_USER_RESTART ||
+          resume_mode == RESUME_MODE_USER_CONTINUE);
 }
 
 bool DownloadItemImpl::IsDone() const {
   switch (state_) {
     case IN_PROGRESS_INTERNAL:
     case COMPLETING_INTERNAL:
       return false;
 
     case COMPLETE_INTERNAL:
     case CANCELLED_INTERNAL:
@@ skipping 1160 matching lines @@
   // this request.
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kEnableDownloadResumption))
     return;
 
   // If we're not interrupted, ignore the request; our caller is drunk.
   if (state_ != INTERRUPTED_INTERNAL)
     return;
 
-  // If we can't get a web contents, we can't resume the download.
-  // TODO(rdsmith): Find some alternative web contents to use--this
-  // means we can't restart a download if it's a download imported
-  // from the history.
-  if (!GetWebContents())
-    return;
-
   // Reset the appropriate state if restarting.
   ResumeMode mode = GetResumeMode();
   if (mode == RESUME_MODE_IMMEDIATE_RESTART ||
       mode == RESUME_MODE_USER_RESTART) {
     received_bytes_ = 0;
     hash_state_ = "";
     last_modified_time_ = "";
     etag_ = "";
   }
 
-  scoped_ptr<DownloadUrlParameters> download_params(
-      DownloadUrlParameters::FromWebContents(GetWebContents(),
-                                             GetOriginalUrl()));
+  scoped_ptr<DownloadUrlParameters> download_params;
+  if (GetWebContents()) {
+    download_params = DownloadUrlParameters::FromWebContents(GetWebContents(),
+                                                             GetOriginalUrl());

[asanka, 2015/11/25 15:53:57]

Oh boy. I just noticed that we are calling GetOriginalUrl() :-(. The validators
we are setting below (ETag and Last-Modified) only apply to the final URL (i.e.
GetURL()).

This should be addressed in a separate CL, so don't worry about it for this one.
I'll push one out that's dependent on the test refactor so that the test is
easier to write.

[svaldez, 2015/11/25 17:53:28]

Acknowledged.

+  } else if (GetBrowserContext()) {
+    download_params = make_scoped_ptr(
+        new DownloadUrlParameters(GetOriginalUrl(), -1, -1, -1,
+                                  GetBrowserContext()->GetResourceContext()));
+  } else {
+    return;
+  }
 
   download_params->set_file_path(GetFullPath());
   download_params->set_offset(GetReceivedBytes());
   download_params->set_hash_state(GetHashState());
   download_params->set_last_modified(GetLastModifiedTime());
   download_params->set_etag(GetETag());
   download_params->set_callback(
       base::Bind(&DownloadItemImpl::OnResumeRequestStarted,
                  weak_ptr_factory_.GetWeakPtr()));
 
@@ skipping 79 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