Replace the DownloadFileManager with direct ownership of DownloadFileImpl

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 322 matching lines @@
     Cancel(false);
     return;
   }
   wrote_to_completed_file_ = true;
 
   // Hack to avoid touching download_ after user cancel.
   // TODO(rdsmith/benjhayden): Integrate canceling on DownloadItem
   // with SavePackage flow.
   if (download_->IsInProgress()) {
     download_->SetTotalBytes(size);
+    download_->UpdateProgress(size, 0, "");
     // 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);
+    download_->OnAllDataSaved(DownloadItem::kEmptyFileHash);
   }
 
   if (!download_manager_->GetDelegate()) {
     Finish();
     return;
   }
 
   if (download_manager_->GetDelegate()->ShouldCompleteDownload(
           download_, base::Bind(&SavePackage::Finish, this))) {
     Finish();
@@ skipping 393 matching lines @@
       base::Bind(&SaveFileManager::RemoveSavedFileFromFileMap,
                  file_manager_,
                  save_ids));
 
   if (download_) {
     // Hack to avoid touching download_ after user cancel.
     // TODO(rdsmith/benjhayden): Integrate canceling on DownloadItem
     // with SavePackage flow.
     if (download_->IsInProgress()) {
       if (save_type_ != content::SAVE_PAGE_TYPE_AS_MHTML) {
-        download_->OnAllDataSaved(all_save_items_count_,
-                                  DownloadItem::kEmptyFileHash);
+        download_->UpdateProgress(all_save_items_count_, CurrentSpeed(), "");
+        download_->OnAllDataSaved(DownloadItem::kEmptyFileHash);
       }
       download_->MarkAsComplete();
     }
     FinalizeDownloadEntry();
   }
 }
 
 // Called for updating end state.
 void SavePackage::SaveFinished(int32 save_id, int64 size, bool is_success) {
   // Because we might have canceled this saving job before,
@@ skipping 626 matching lines @@
       // central SavePackage related location that observers can
       // get to if they want to wait for notifications for a
       // particular BrowserContext.  Alternatively, we could make
       // it come from the WebContents, which would be more specific
       // but less useful to (current) customers.
       content::Source<content::DownloadManager>(download_manager_),
       content::Details<content::DownloadItem>(download_));
   download_manager_->SavePageDownloadFinished(download_);
   StopObservation();
 }