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

content/browser/download/download_file_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.
 
 #include "content/browser/download/download_file_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 116 matching lines @@
     stream_reader_->RegisterCallback(base::Closure());
 
     new_path.clear();
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(callback, reason, new_path));
 }
 
-void DownloadFileImpl::Detach(base::Closure callback) {
+void DownloadFileImpl::Detach(const DetachCompletionCallback& callback) {
   // Doing the annotation here leaves a small window during
   // which the file has the final name but hasn't been marked with the
   // Mark Of The Web.  However, it allows anti-virus scanners on Windows
   // to actually see the data (http://crbug.com/127999), and the Window
   // is pretty small (round trip to the UI thread).
-  AnnotateWithSourceInformation();
-
+  content::DownloadInterruptReason interrupt_reason =
+      file_.AnnotateWithSourceInformation();
   file_.Detach();
 
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(callback, interrupt_reason));
 }
 
 void DownloadFileImpl::Cancel() {
   file_.Cancel();
 }
 
-void DownloadFileImpl::AnnotateWithSourceInformation() {
-  bound_net_log_.BeginEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED);
-  file_.AnnotateWithSourceInformation();
-  bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_FILE_ANNOTATED);
-}
-
 FilePath DownloadFileImpl::FullPath() const {
   return file_.full_path();
 }
 
 bool DownloadFileImpl::InProgress() const {
   return file_.in_progress();
 }
 
 int64 DownloadFileImpl::BytesSoFar() const {
   return file_.bytes_so_far();
@@ skipping 118 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&content::DownloadDestinationObserver::DestinationUpdate,
                  observer_, BytesSoFar(), CurrentSpeed(), GetHashState()));
 }
 
 // static
 int content::DownloadFile::GetNumberOfDownloadFiles() {
   return number_active_objects_;
 }