| Index: chrome/browser/download/download_manager_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/download/download_manager_unittest.cc (revision 96577)
|
| +++ chrome/browser/download/download_manager_unittest.cc (working copy)
|
| @@ -14,6 +14,7 @@
|
| #include "base/string16.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| +#include "chrome/browser/download/chrome_download_manager_delegate.h"
|
| #include "chrome/browser/download/download_create_info.h"
|
| #include "chrome/browser/download/download_file.h"
|
| #include "chrome/browser/download/download_file_manager.h"
|
| @@ -24,7 +25,6 @@
|
| #include "chrome/browser/download/download_status_updater.h"
|
| #include "chrome/browser/download/download_util.h"
|
| #include "chrome/browser/download/mock_download_manager.h"
|
| -#include "chrome/browser/download/mock_download_manager_delegate.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/testing_browser_process_test.h"
|
| @@ -44,11 +44,12 @@
|
|
|
| DownloadManagerTest()
|
| : profile_(new TestingProfile()),
|
| - download_manager_delegate_(new MockDownloadManagerDelegate()),
|
| + download_manager_delegate_(new ChromeDownloadManagerDelegate()),
|
| download_manager_(new MockDownloadManager(
|
| - download_manager_delegate_.get(), &download_status_updater_)),
|
| + download_manager_delegate_, &download_status_updater_)),
|
| ui_thread_(BrowserThread::UI, &message_loop_),
|
| file_thread_(BrowserThread::FILE, &message_loop_) {
|
| + download_manager_delegate_->set_download_manager(download_manager_);
|
| download_manager_->Init(profile_.get());
|
| }
|
|
|
| @@ -91,7 +92,7 @@
|
| protected:
|
| DownloadStatusUpdater download_status_updater_;
|
| scoped_ptr<TestingProfile> profile_;
|
| - scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_;
|
| + scoped_refptr<ChromeDownloadManagerDelegate> download_manager_delegate_;
|
| scoped_refptr<DownloadManager> download_manager_;
|
| scoped_refptr<DownloadFileManager> file_manager_;
|
| MessageLoopForUI message_loop_;
|
|
|