Revert 113007 - DownloadManager intereface refactoring to allow cleaner DownloadItem unit tests.

content/browser/download/save_package.cc

Index: content/browser/download/save_package.cc
===================================================================
--- content/browser/download/save_package.cc	(revision 113083)
+++ content/browser/download/save_package.cc	(working copy)
@@ -268,11 +268,17 @@
     return false;
   }
 
-  // The download manager keeps ownership but adds us as an observer.
-  download_ = download_manager_->CreateSavePackageDownloadItem(
-      saved_main_file_path_, page_url_,
-      browser_context->IsOffTheRecord(), this);
+  // Create the download item, and add ourself as an observer.
+  download_ = new DownloadItemImpl(download_manager_,
+                                   saved_main_file_path_,
+                                   page_url_,
+                                   browser_context->IsOffTheRecord(),
+                                   download_manager_->GetNextId());
+  download_->AddObserver(this);
 
+  // Transfer ownership to the download manager.
+  download_manager_->SavePageDownloadStarted(download_);
+
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
     // Get directory