Created a DownloadManager interface, for use in unit tests..

chrome/browser/download/download_manager_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 39 matching lines @@
 class DownloadManagerTest : public testing::Test {
  public:
   static const char* kTestData;
   static const size_t kTestDataLen;
 
   DownloadManagerTest()
       : profile_(new TestingProfile()),
         download_manager_delegate_(new ChromeDownloadManagerDelegate(
             profile_.get())),
         id_factory_(new DownloadIdFactory(kValidIdDomain)),
-        download_manager_(new MockDownloadManager(
+        download_manager_(new DownloadManagerImpl(

[Randy Smith (Not in Mondays), 2011/11/08 22:10:51]

Why this change?

[ahendrickson, 2011/11/09 17:09:02]

A) This is a test for DownloadManager.
B) The old version of MockDownloadManager was derived from DownloadManager, and
just added one empty function.  It did not override any functions, so its
functionality was identical to DownloadManager.
C) The new MockDownloadManager is very different from DownloadManager.

The upshot is that this change preserves the functionality of the test!

[Randy Smith (Not in Mondays), 2011/11/09 19:06:34]

Sounds good.

             download_manager_delegate_,
             id_factory_,
             &download_status_updater_)),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_),
         download_buffer_(new content::DownloadBuffer) {
     download_manager_->Init(profile_.get());
     download_manager_delegate_->SetDownloadManager(download_manager_);
   }
 
@@ skipping 42 matching lines @@
     message_loop_.RunAllPending();
   }
 
   void OnDownloadInterrupted(int32 download_id, int64 size,
                              InterruptReason reason) {
     download_manager_->OnDownloadInterrupted(download_id, size, reason);
   }
 
   // Get the download item with ID |id|.
   DownloadItem* GetActiveDownloadItem(int32 id) {
-    if (ContainsKey(download_manager_->active_downloads_, id))
-      return download_manager_->active_downloads_[id];
-    return NULL;
+    return download_manager_->GetActiveDownload(id);
   }
 
  protected:
   DownloadStatusUpdater download_status_updater_;
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<ChromeDownloadManagerDelegate> download_manager_delegate_;
   scoped_refptr<DownloadIdFactory> id_factory_;
   scoped_refptr<DownloadManager> download_manager_;
   scoped_refptr<DownloadFileManager> file_manager_;
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   scoped_refptr<content::DownloadBuffer> download_buffer_;
 
   DownloadFileManager* file_manager() {
     if (!file_manager_) {
       file_manager_ = new DownloadFileManager(NULL);
-      download_manager_->file_manager_ = file_manager_;
+      download_manager_->SetFileManager(file_manager_);
     }
     return file_manager_;
   }
 
   // Make sure download item |id| was set with correct safety state for
   // given |is_dangerous_file| and |is_dangerous_url|.
   bool VerifySafetyState(bool is_dangerous_file,
                          bool is_dangerous_url,
                          int id) {
     DownloadItem::SafetyState safety_state =
@@ skipping 730 matching lines @@
   EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
   EXPECT_TRUE(observer->was_updated());
   EXPECT_FALSE(observer->was_opened());
   EXPECT_TRUE(download->file_externally_removed());
   EXPECT_EQ(DownloadItem::COMPLETE, download->state());
   EXPECT_EQ(download_item_model->GetStatusText(),
             l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED));
 
   EXPECT_FALSE(file_util::PathExists(new_path));
 }