diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 23:42:01 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 23:42:01 +0000 |
| commit | e7557f174361a743cad821e0828e8df77d9ac199 (patch) | |
| tree | 33af40724a4492a1ac1c3b95701a079c1c724662 /chrome/browser/download/download_manager_unittest.cc | |
| parent | 2ccf45c50fad0f2c3c20d95eef6d0040b565b291 (diff) | |
| download | chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.zip chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.tar.gz chromium_src-e7557f174361a743cad821e0828e8df77d9ac199.tar.bz2 | |
Move DownloadPrefs ownership to chrome layer.
BUG=82782
Review URL: http://codereview.chromium.org/7693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/download/download_manager_unittest.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index 8bcfde1..101db74 100644 --- a/chrome/browser/download/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -44,7 +44,8 @@ class DownloadManagerTest : public TestingBrowserProcessTest { DownloadManagerTest() : profile_(new TestingProfile()), - download_manager_delegate_(new ChromeDownloadManagerDelegate()), + download_manager_delegate_(new ChromeDownloadManagerDelegate( + profile_.get())), download_manager_(new MockDownloadManager( download_manager_delegate_, &download_status_updater_)), ui_thread_(BrowserThread::UI, &message_loop_), @@ -58,6 +59,7 @@ class DownloadManagerTest : public TestingBrowserProcessTest { // profile_ must outlive download_manager_, so we explicitly delete // download_manager_ first. download_manager_ = NULL; + download_manager_delegate_ = NULL; profile_.reset(NULL); message_loop_.RunAllPending(); } @@ -300,7 +302,9 @@ TEST_F(DownloadManagerTest, StartDownload) { BrowserThread io_thread(BrowserThread::IO, &message_loop_); PrefService* prefs = profile_->GetPrefs(); prefs->SetFilePath(prefs::kDownloadDefaultDirectory, FilePath()); - download_manager_->download_prefs()->EnableAutoOpenBasedOnExtension( + DownloadPrefs* download_prefs = + DownloadPrefs::FromDownloadManager(download_manager_); + download_prefs->EnableAutoOpenBasedOnExtension( FilePath(FILE_PATH_LITERAL("example.pdf"))); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kStartDownloadCases); ++i) { |