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

content/browser/download/mock_download_manager.cc

Index: content/browser/download/mock_download_manager.cc
===================================================================
--- content/browser/download/mock_download_manager.cc	(revision 113083)
+++ content/browser/download/mock_download_manager.cc	(working copy)
@@ -65,6 +65,24 @@
                                                 InterruptReason reason) {
 }
 
+void MockDownloadManager::DownloadCancelledInternal(DownloadItem* download) {
+  download->Cancel(true);
+  item_map_.erase(download->GetId());
+  inactive_item_map_[download->GetId()] = download;
+}
+
+void MockDownloadManager::RemoveDownload(int64 download_handle) {
+}
+
+bool MockDownloadManager::IsDownloadReadyForCompletion(DownloadItem* download) {
+  return download->AllDataSaved();
+}
+
+void MockDownloadManager::MaybeCompleteDownload(DownloadItem* download) {
+  if (IsDownloadReadyForCompletion(download))
+    download->OnDownloadRenamedToFinalName(download->GetFullPath());
+}
+
 void MockDownloadManager::OnDownloadRenamedToFinalName(
     int download_id,
     const FilePath& full_path,
@@ -84,6 +102,9 @@
   return 1;
 }
 
+void MockDownloadManager::DownloadCompleted(int32 download_id) {
+}
+
 void MockDownloadManager::DownloadUrl(const GURL& url,
                                       const GURL& referrer,
                                       const std::string& referrer_encoding,
@@ -112,11 +133,14 @@
                                                        int64 db_handle) {
 }
 
+void MockDownloadManager::ShowDownloadInBrowser(DownloadItem* download) {
+}
+
 int MockDownloadManager::InProgressCount() const {
   return 1;
 }
 
-content::BrowserContext* MockDownloadManager::BrowserContext() const {
+content::BrowserContext* MockDownloadManager::BrowserContext() {
   return NULL;
 }
 
@@ -127,19 +151,11 @@
 void MockDownloadManager::CreateDownloadItem(
     DownloadCreateInfo* info,
     const DownloadRequestHandle& request_handle) {
-  NOTREACHED();                         // Not yet implemented.
-  return;
+  item_map_.insert(std::make_pair(
+      info->download_id.local(), new DownloadItemImpl(
+        this, *info, new DownloadRequestHandle(request_handle), false)));
 }
 
-DownloadItem* MockDownloadManager::CreateSavePackageDownloadItem(
-      const FilePath& main_file_path,
-      const GURL& page_url,
-      bool is_otr,
-      DownloadItem::Observer* observer) {
-  NOTREACHED();                         // Not yet implemented.
-  return NULL;
-}
-
 void MockDownloadManager::ClearLastDownloadPath() {
 }
 
@@ -152,9 +168,19 @@
 void MockDownloadManager::RestartDownload(int32 download_id) {
 }
 
+void MockDownloadManager::MarkDownloadOpened(DownloadItem* download) {
+  download->SetOpenWhenComplete(true);
+}
+
 void MockDownloadManager::CheckForHistoryFilesRemoval() {
 }
 
+void MockDownloadManager::CheckForFileRemoval(DownloadItem* download_item) {
+}
+
+void MockDownloadManager::AssertQueueStateConsistent(DownloadItem* download) {
+}
+
 DownloadItem* MockDownloadManager::GetDownloadItem(int id) {
   std::map<int32, DownloadItem*>::iterator it = item_map_.find(id);
   if (it == item_map_.end())
@@ -162,6 +188,9 @@
   return it->second;
 }
 
+void MockDownloadManager::SavePageDownloadStarted(DownloadItem* download) {
+}
+
 void MockDownloadManager::SavePageDownloadFinished(DownloadItem* download) {
 }
 
@@ -177,6 +206,10 @@
     content::DownloadManagerDelegate* delegate) {
 }
 
+DownloadId MockDownloadManager::GetNextId() {
+  return DownloadId(this, 1);
+}
+
 void MockDownloadManager::ContinueDownloadWithPath(
     DownloadItem* download,
     const FilePath& chosen_file) {