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

chrome/browser/download/download_manager_unittest.cc

Index: chrome/browser/download/download_manager_unittest.cc
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 00223ad64d83bb9f4c571bbbb618c98b2a0f3e07..c67c5095d54a567afa4fc3b5a5e7d17e85d5b79a 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -55,7 +55,7 @@ class DownloadManagerTest : public testing::Test {
         download_manager_delegate_(new ChromeDownloadManagerDelegate(
             profile_.get())),
         id_factory_(new DownloadIdFactory(kValidIdDomain)),
-        download_manager_(new MockDownloadManager(
+        download_manager_(new DownloadManager(
             download_manager_delegate_,
             id_factory_,
             &download_status_updater_)),
@@ -118,9 +118,7 @@ class DownloadManagerTest : public testing::Test {
 
   // 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:
@@ -128,7 +126,7 @@ class DownloadManagerTest : public testing::Test {
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<ChromeDownloadManagerDelegate> download_manager_delegate_;
   scoped_refptr<DownloadIdFactory> id_factory_;
-  scoped_refptr<DownloadManager> download_manager_;
+  scoped_refptr<DownloadManagerInterface> download_manager_;
   scoped_refptr<DownloadFileManager> file_manager_;
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
@@ -138,7 +136,7 @@ class DownloadManagerTest : public testing::Test {
   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_;
   }
@@ -167,7 +165,7 @@ const size_t DownloadManagerTest::kTestDataLen =
 class DownloadFileWithMockStream : public DownloadFile {
  public:
   DownloadFileWithMockStream(DownloadCreateInfo* info,
-                             DownloadManager* manager,
+                             DownloadManagerInterface* manager,
                              net::testing::MockFileStream* stream);
 
   virtual ~DownloadFileWithMockStream() {}
@@ -181,7 +179,7 @@ class DownloadFileWithMockStream : public DownloadFile {
 
 DownloadFileWithMockStream::DownloadFileWithMockStream(
     DownloadCreateInfo* info,
-    DownloadManager* manager,
+    DownloadManagerInterface* manager,
     net::testing::MockFileStream* stream)
     : DownloadFile(info, DownloadRequestHandle(), manager) {
   DCHECK(file_stream_ == NULL);
@@ -280,7 +278,7 @@ const struct {
 
 class MockDownloadFile : public DownloadFile {
  public:
-  MockDownloadFile(DownloadCreateInfo* info, DownloadManager* manager)
+  MockDownloadFile(DownloadCreateInfo* info, DownloadManagerInterface* manager)
       : DownloadFile(info, DownloadRequestHandle(), manager),
         renamed_count_(0) { }
   virtual ~MockDownloadFile() { Destructed(); }
@@ -304,7 +302,7 @@ class MockDownloadFile : public DownloadFile {
 // file dialog.
 class SelectFileObserver : public DownloadManager::Observer {
  public:
-  explicit SelectFileObserver(DownloadManager* download_manager)
+  explicit SelectFileObserver(DownloadManagerInterface* download_manager)
       : download_manager_(download_manager) {
     DCHECK(download_manager_.get());
     download_manager_->AddObserver(this);
@@ -327,7 +325,7 @@ class SelectFileObserver : public DownloadManager::Observer {
 
  private:
   std::set<int32> file_dialog_ids_;
-  scoped_refptr<DownloadManager> download_manager_;
+  scoped_refptr<DownloadManagerInterface> download_manager_;
 };
 
 // This observer tracks the progress of |DownloadItem|s.