DownloadManagerDelegate::ShouldCompleteDownload(callback)

content/browser/download/save_package.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/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 319 matching lines @@
     Cancel(false);
     return;
   }
   wrote_to_completed_file_ = true;
   download_->SetTotalBytes(size);
   download_->UpdateProgress(size, size, DownloadItem::kEmptyFileHash);
   // Must call OnAllDataSaved here in order for
   // GDataDownloadObserver::ShouldUpload() to return true.
   // ShouldCompleteDownload() may depend on the gdata uploader to finish.
   download_->OnAllDataSaved(size, DownloadItem::kEmptyFileHash);
-  // GDataDownloadObserver is waiting for the upload to complete. When that
-  // happens, it will call download_->MaybeCompleteDownload(), which will call
-  // through our OnDownloadUpdated() allowing us to Finish().
-  // OnDownloadUpdated() may have been called in OnAllDataSaved(), so |this| may
-  // be deleted at this point.
+  if (download_manager_->delegate()->ShouldCompleteDownload(
+        download_, base::Bind(&SavePackage::Finish, this)))
+    Finish();
 }
 
 // On POSIX, the length of |pure_file_name| + |file_name_ext| is further
 // restricted by NAME_MAX. The maximum allowed path looks like:
 // '/path/to/save_dir' + '/' + NAME_MAX.
 uint32 SavePackage::GetMaxPathLengthForDirectory(const FilePath& base_dir) {
 #if defined(OS_POSIX)
   return std::min(kMaxFilePathLength,
                   static_cast<uint32>(base_dir.value().length()) +
                   NAME_MAX + 1);
@@ skipping 996 matching lines @@
 
 void SavePackage::OnDownloadUpdated(DownloadItem* download) {
   DCHECK(download_);
   DCHECK(download_ == download);
   DCHECK(download_manager_);
 
   // Check for removal.
   if (download_->GetState() == DownloadItem::REMOVING) {
     StopObservation();
   }
-
-  // MHTML saves may need to wait for GData to finish uploading.
-  if ((save_type_ == content::SAVE_PAGE_TYPE_AS_MHTML) &&
-      download_->AllDataSaved() &&
-      !download_->IsComplete() &&
-      !mhtml_finishing_ &&
-      download_manager_->delegate()->ShouldCompleteDownload(download_)) {
-    // Post a task to avoid re-entering OnDownloadUpdated. Set a flag to
-    // prevent double-calling Finish() in case another OnDownloadUpdated happens
-    // before Finish() runs.
-    mhtml_finishing_ = true;
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&SavePackage::Finish, this));
-  }
 }
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->SavePageDownloadFinished(download_);
   StopObservation();
 }