DownloadManager intereface refactoring to allow cleaner DownloadItem unit tests.

content/browser/download/mock_download_manager.cc

Index: content/browser/download/mock_download_manager.cc
diff --git a/content/browser/download/mock_download_manager.cc b/content/browser/download/mock_download_manager.cc
index 359eff9cc519adb25706e43f8031475d72aa2c04..d9910df13cd43a3e6d891a0d02321f233bf20a0a 100644
--- a/content/browser/download/mock_download_manager.cc
+++ b/content/browser/download/mock_download_manager.cc
@@ -64,21 +64,8 @@ void MockDownloadManager::OnDownloadInterrupted(int32 download_id, int64 size,
                                                 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))
+  if (download->AllDataSaved())
     download->OnDownloadRenamedToFinalName(download->GetFullPath());
 }
 
@@ -101,9 +88,6 @@ int MockDownloadManager::RemoveAllDownloads() {
   return 1;
 }
 
-void MockDownloadManager::DownloadCompleted(int32 download_id) {
-}
-
 void MockDownloadManager::DownloadUrl(const GURL& url,
                                       const GURL& referrer,
                                       const std::string& referrer_encoding,
@@ -132,14 +116,11 @@ void MockDownloadManager::OnItemAddedToPersistentStore(int32 download_id,
                                                        int64 db_handle) {
 }
 
-void MockDownloadManager::ShowDownloadInBrowser(DownloadItem* download) {
-}
-
 int MockDownloadManager::InProgressCount() const {
   return 1;
 }
 
-content::BrowserContext* MockDownloadManager::BrowserContext() {
+content::BrowserContext* MockDownloadManager::BrowserContext() const {
   return NULL;
 }
 
@@ -150,9 +131,17 @@ FilePath MockDownloadManager::LastDownloadPath() {
 void MockDownloadManager::CreateDownloadItem(
     DownloadCreateInfo* info,
     const DownloadRequestHandle& request_handle) {
-  item_map_.insert(std::make_pair(
-      info->download_id.local(), new DownloadItemImpl(
-        this, *info, new DownloadRequestHandle(request_handle), false)));
+  NOTREACHED();                         // Not yet implemented.
+  return;
+}
+
+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() {
@@ -167,19 +156,9 @@ void MockDownloadManager::FileSelectionCanceled(void* params) {
 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())
@@ -187,9 +166,6 @@ DownloadItem* MockDownloadManager::GetDownloadItem(int id) {
   return it->second;
 }
 
-void MockDownloadManager::SavePageDownloadStarted(DownloadItem* download) {
-}
-
 void MockDownloadManager::SavePageDownloadFinished(DownloadItem* download) {
 }
 
@@ -205,10 +181,6 @@ void MockDownloadManager::SetDownloadManagerDelegate(
     content::DownloadManagerDelegate* delegate) {
 }
 
-DownloadId MockDownloadManager::GetNextId() {
-  return DownloadId(this, 1);
-}
-
 void MockDownloadManager::ContinueDownloadWithPath(
     DownloadItem* download,
     const FilePath& chosen_file) {