Handle the case where IAttachmentExecute::Save() deletes a downloaded file.

content/browser/download/download_browsertest.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.
 
 // This file contains download browser tests that are known to be runnable
 // in a pure content context.  Over time tests should be migrated here.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 79 matching lines @@
   // Wraps DownloadFileImpl::Rename and intercepts the return callback,
   // storing it in the factory that produced this object for later
   // retrieval.
   virtual void Rename(const FilePath& full_path,
                       bool overwrite_existing_file,
                       const RenameCompletionCallback& callback) OVERRIDE;
 
   // Wraps DownloadFileImpl::Detach and intercepts the return callback,
   // storing it in the factory that produced this object for later
   // retrieval.
-  virtual void Detach(base::Closure callback) OVERRIDE;
+  virtual void Detach(const DetachCompletionCallback& callback) OVERRIDE;
 
  private:
   static void RenameCallbackWrapper(
       DownloadFileWithDelayFactory* factory,
       const RenameCompletionCallback& original_callback,
       DownloadInterruptReason reason,
       const FilePath& path);
 
   static void DetachCallbackWrapper(
       DownloadFileWithDelayFactory* factory,
-      const base::Closure& original_callback);
+      const DetachCompletionCallback& original_callback,
+      DownloadInterruptReason interrupt_reason);
 
   // This variable may only be read on the FILE thread, and may only be
   // indirected through (e.g. methods on DownloadFileWithDelayFactory called)
   // on the UI thread.  This is because after construction,
   // DownloadFileWithDelay lives on the file thread, but
   // DownloadFileWithDelayFactory is purely a UI thread object.
   base::WeakPtr<DownloadFileWithDelayFactory> owner_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileWithDelay);
 };
@@ skipping 57 matching lines @@
 void DownloadFileWithDelay::Rename(const FilePath& full_path,
                       bool overwrite_existing_file,
                       const RenameCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DownloadFileImpl::Rename(
       full_path, overwrite_existing_file,
       base::Bind(DownloadFileWithDelay::RenameCallbackWrapper,
                  owner_, callback));
 }
 
-void DownloadFileWithDelay::Detach(base::Closure callback) {
+void DownloadFileWithDelay::Detach(const DetachCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DownloadFileImpl::Detach(
       base::Bind(DownloadFileWithDelay::DetachCallbackWrapper,
                  owner_, callback));
 }
 
 // static
 void DownloadFileWithDelay::RenameCallbackWrapper(
     DownloadFileWithDelayFactory* factory,
     const RenameCompletionCallback& original_callback,
     DownloadInterruptReason reason,
     const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   factory->AddRenameCallback(base::Bind(original_callback, reason, path));
 }
 
 // static
 void DownloadFileWithDelay::DetachCallbackWrapper(
     DownloadFileWithDelayFactory* factory,
-    const base::Closure& original_callback) {
+    const DetachCompletionCallback& original_callback,
+    DownloadInterruptReason interrupt_reason) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  factory->AddDetachCallback(original_callback);
+  factory->AddDetachCallback(base::Bind(original_callback, interrupt_reason));
 }
 
 DownloadFileWithDelayFactory::DownloadFileWithDelayFactory()
     : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       waiting_(false) {}
 DownloadFileWithDelayFactory::~DownloadFileWithDelayFactory() {}
 
 DownloadFile* DownloadFileWithDelayFactory::CreateFile(
     scoped_ptr<DownloadSaveInfo> save_info,
     const FilePath& default_download_directory,
@@ skipping 541 matching lines @@
   // Shutdown the download manager.  Mostly this is confirming a lack of
   // crashes.
   DownloadManagerForShell(shell())->Shutdown();
 
   // Run the detach callback; shouldn't cause any problems.
   callbacks[0].Run();
   callbacks.clear();
 }
 
 }  // namespace content