Use previous target path when resuming a download after crash

chrome/browser/download/download_target_determiner.cc

 // Copyright 2013 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 "chrome/browser/download/download_target_determiner.h"
 
 #include "base/location.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
@@ skipping 173 matching lines @@
     ScheduleCallbackAndDeleteSelf();
 }
 
 DownloadTargetDeterminer::Result
     DownloadTargetDeterminer::DoGenerateTargetPath() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(local_path_.empty());
   DCHECK(!should_prompt_);
   DCHECK(!should_notify_extensions_);
   DCHECK_EQ(DownloadPathReservationTracker::OVERWRITE, conflict_action_);
-  bool is_forced_path = !download_->GetForcedFilePath().empty();
+  // If the download already has a forced path or a target path, use it.
+  bool has_target_path = !download_->GetForcedFilePath().empty()
+      || !download_->GetTargetFilePath().empty();
 
   next_state_ = STATE_NOTIFY_EXTENSIONS;
 
-  if (!virtual_path_.empty() && HasPromptedForPath() && !is_forced_path) {
+  if (!virtual_path_.empty() && HasPromptedForPath() && !has_target_path) {
     // The download is being resumed and the user has already been prompted for
     // a path. Assume that it's okay to overwrite the file if there's a conflict
     // and reuse the selection.
     should_prompt_ = ShouldPromptForDownload(virtual_path_);
-  } else if (!is_forced_path) {
+  } else if (!has_target_path) {
     // If we don't have a forced path, we should construct a path for the
     // download. Forced paths are only specified for programmatic downloads
     // (WebStore, Drag&Drop). Treat the path as a virtual path. We will
     // eventually determine whether this is a local path and if not, figure out
     // a local path.
 
     std::string suggested_filename = download_->GetSuggestedFilename();
     if (suggested_filename.empty() &&
         download_->GetMimeType() == "application/x-x509-user-cert") {
       suggested_filename = "user.crt";
@@ skipping 19 matching lines @@
       target_directory = download_prefs_->DownloadPath();
     }
     virtual_path_ = target_directory.Append(generated_filename);
 #if defined(OS_ANDROID)
     conflict_action_ = DownloadPathReservationTracker::PROMPT;
 #else
     conflict_action_ = DownloadPathReservationTracker::UNIQUIFY;
 #endif
     should_notify_extensions_ = true;
   } else {
-    virtual_path_ = download_->GetForcedFilePath();
+    virtual_path_ = download_->GetForcedFilePath().empty() ?

[David Trainor- moved to gerrit, 2017/01/06 23:26:41]

Since we're using this logic a lot, would it be cleaner to expose this as a
method on DownloadItem?

[qinmin, 2017/01/09 22:17:27]

Done.

+        download_->GetTargetFilePath() : download_->GetForcedFilePath();
     // If this is a resumed download which was previously interrupted due to an
     // issue with the forced path, the user is still not prompted. If the path
     // supplied to a programmatic download is invalid, then the caller needs to
     // intervene.
   }
   DCHECK(virtual_path_.IsAbsolute());
   DVLOG(20) << "Generated virtual path: " << virtual_path_.AsUTF8Unsafe();
 
   return CONTINUE;
 }
@@ skipping 689 matching lines @@
     const base::FilePath& suggested_path) {
   return base::FilePath(suggested_path.value() + kCrdownloadSuffix);
 }
 
 #if defined(OS_WIN)
 // static
 bool DownloadTargetDeterminer::IsAdobeReaderUpToDate() {
   return g_is_adobe_reader_up_to_date_;
 }
 #endif