[Resumption 9/11] Handle filename determination for resumed downloads.

chrome/browser/download/chrome_download_manager_delegate.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.
 
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 91 matching lines @@
     return drive_download_handler->GetTargetPath(download);
 #endif
   // The caller wants to open the download or show it in a file browser. The
   // download could be in one of three states:
   // - Complete: The path we want is GetTargetFilePath().
   // - Not complete, but there's an intermediate file: GetFullPath() will be
   //     non-empty and is the location of the intermediate file. Since no target
   //     file exits yet, use GetFullPath(). This should only happen during
   //     ShowDownloadInShell().
   // - Not Complete, and there's no intermediate file: GetFullPath() will be
-  //     empty. This shouldn't happen since CanShowInFolder() returns false and
-  //     this function shouldn't have been called.
+  //     empty.
   if (download->IsComplete()) {
     DCHECK(!download->GetTargetFilePath().empty());
     return download->GetTargetFilePath();
   }
 
-  DCHECK(!download->GetFullPath().empty());
   return download->GetFullPath();
 }
 
 // Callback invoked by DownloadProtectionService::CheckClientDownload.
 // |is_content_check_supported| is true if the SB service supports scanning the
 // download for malicious content.
 // |callback| is invoked with a danger type determined as follows:
 //
 // Danger type is (in order of preference):
 //   * DANGEROUS_URL, if the URL is a known malware site.
@@ skipping 56 matching lines @@
     return DownloadId(this, next_download_id_++);
 
   return BrowserContext::GetDownloadManager(profile_->GetOriginalProfile())->
       GetDelegate()->GetNextId();
 }
 
 bool ChromeDownloadManagerDelegate::DetermineDownloadTarget(
     DownloadItem* download,
     const content::DownloadTargetCallback& callback) {
   DownloadTargetDeterminer::Start(download,
+                                  GetPlatformDownloadPath(profile_, download),
                                   download_prefs_.get(),
                                   last_download_path_,
                                   this,
                                   callback);
   return true;
 }
 
 bool ChromeDownloadManagerDelegate::ShouldOpenFileBasedOnExtension(
     const base::FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 159 matching lines @@
       can_save_as_complete,
       download_prefs_.get(),
       callback);
 #endif
 }
 
 void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
   DCHECK(download->IsComplete());
   if (!download->CanOpenDownload())
     return;
-  platform_util::OpenItem(GetPlatformDownloadPath(profile_, download));
+  base::FilePath platform_path(GetPlatformDownloadPath(profile_, download));
+  DCHECK(!platform_path.empty());
+  platform_util::OpenItem(platform_path);
 }
 
 void ChromeDownloadManagerDelegate::ShowDownloadInShell(
     DownloadItem* download) {
   if (!download->CanShowInFolder())
     return;
-  platform_util::ShowItemInFolder(GetPlatformDownloadPath(profile_, download));
+  base::FilePath platform_path(GetPlatformDownloadPath(profile_, download));
+  DCHECK(!platform_path.empty());
+  platform_util::ShowItemInFolder(platform_path);
 }
 
 void ChromeDownloadManagerDelegate::CheckForFileExistence(
     DownloadItem* download,
     const content::CheckForFileExistenceCallback& callback) {
 #if defined(OS_CHROMEOS)
   drive::DownloadHandler* drive_download_handler =
       drive::DownloadHandler::GetForProfile(profile_);
   if (drive_download_handler &&
       drive_download_handler->IsDriveDownload(download)) {
@@ skipping 177 matching lines @@
   registrar_.Remove(this,
                     chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                     source);
 
   scoped_refptr<extensions::CrxInstaller> installer =
       content::Source<extensions::CrxInstaller>(source).ptr();
   content::DownloadOpenDelayedCallback callback = crx_installers_[installer];
   crx_installers_.erase(installer.get());
   callback.Run(installer->did_handle_successfully());
 }