summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_manager_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 00:35:42 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-27 00:35:42 +0000
commit98e814064fa88ec31318ce94d8f20c9fba0e92ff (patch)
treea00e0dbcf23ea0d8d797e360ea422bea346f9b00 /chrome/browser/download/download_manager_unittest.cc
parentf9fac85d18493f8b83152d11652bbf4a24f02338 (diff)
downloadchromium_src-98e814064fa88ec31318ce94d8f20c9fba0e92ff.zip
chromium_src-98e814064fa88ec31318ce94d8f20c9fba0e92ff.tar.gz
chromium_src-98e814064fa88ec31318ce94d8f20c9fba0e92ff.tar.bz2
Get rid of DownloadIdFactory and instead get the next id from DownloadManagerDelegate. I've also moved DownloadId to the public directory and into the content namespace.
BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9169036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_manager_unittest.cc')
-rw-r--r--chrome/browser/download/download_manager_unittest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 2b303e8..59723fe 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -28,7 +28,6 @@
#include "content/browser/download/download_create_info.h"
#include "content/browser/download/download_file_impl.h"
#include "content/browser/download/download_file_manager.h"
-#include "content/browser/download/download_id_factory.h"
#include "content/browser/download/download_request_handle.h"
#include "content/browser/download/download_status_updater.h"
#include "content/browser/download/interrupt_reasons.h"
@@ -66,6 +65,7 @@
using content::BrowserThread;
using content::DownloadFile;
+using content::DownloadId;
using content::DownloadItem;
using content::DownloadManager;
using ::testing::ReturnRef;
@@ -176,11 +176,8 @@ class DownloadManagerTest : public testing::Test {
: profile_(new TestingProfile()),
download_manager_delegate_(new TestDownloadManagerDelegate(
profile_.get())),
- id_factory_(new DownloadIdFactory(kValidIdDomain)),
download_manager_(DownloadManager::Create(
- download_manager_delegate_,
- id_factory_,
- &download_status_updater_)),
+ download_manager_delegate_, &download_status_updater_)),
ui_thread_(BrowserThread::UI, &message_loop_),
file_thread_(BrowserThread::FILE, &message_loop_),
download_buffer_(new content::DownloadBuffer) {
@@ -255,7 +252,6 @@ class DownloadManagerTest : public testing::Test {
DownloadStatusUpdater download_status_updater_;
scoped_ptr<TestingProfile> profile_;
scoped_refptr<TestDownloadManagerDelegate> download_manager_delegate_;
- scoped_refptr<DownloadIdFactory> id_factory_;
scoped_refptr<DownloadManager> download_manager_;
scoped_refptr<DownloadFileManager> file_manager_;
MessageLoopForUI message_loop_;