Index: content/browser/download/download_manager_impl_unittest.cc |
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc |
index 3c24652cc1aed914c9246d30868a32b11ec7516b..6b9ec35696dbc65b45e3604b957a43fa6d812cb7 100644 |
--- a/content/browser/download/download_manager_impl_unittest.cc |
+++ b/content/browser/download/download_manager_impl_unittest.cc |
@@ -68,9 +68,19 @@ class MockDownloadItemImpl : public DownloadItemImpl { |
public: |
// Use history constructor for minimal base object. |
MockDownloadItemImpl(DownloadItemImplDelegate* delegate) |
- : DownloadItemImpl(delegate, content::DownloadId(), |
- content::DownloadPersistentStoreInfo(), |
- net::BoundNetLog()) {} |
+ : DownloadItemImpl( |
+ delegate, |
+ content::DownloadId(), |
+ FilePath(), |
+ GURL(), |
+ GURL(), |
+ base::Time(), |
+ base::Time(), |
+ 0, |
+ 0, |
+ DownloadItem::IN_PROGRESS, |
+ false, |
+ net::BoundNetLog()) {} |
virtual ~MockDownloadItemImpl() {} |
MOCK_METHOD4(OnDownloadTargetDetermined, |
@@ -131,10 +141,6 @@ class MockDownloadItemImpl : public DownloadItemImpl { |
MOCK_CONST_METHOD0(GetGlobalId, content::DownloadId()); |
MOCK_CONST_METHOD0(GetStartTime, base::Time()); |
MOCK_CONST_METHOD0(GetEndTime, base::Time()); |
- MOCK_METHOD0(SetIsPersisted, void()); |
- MOCK_CONST_METHOD0(IsPersisted, bool()); |
- MOCK_METHOD1(SetDbHandle, void(int64)); |
- MOCK_CONST_METHOD0(GetDbHandle, int64()); |
MOCK_METHOD0(GetDownloadManager, content::DownloadManager*()); |
MOCK_CONST_METHOD0(IsPaused, bool()); |
MOCK_CONST_METHOD0(GetOpenWhenComplete, bool()); |
@@ -154,8 +160,6 @@ class MockDownloadItemImpl : public DownloadItemImpl { |
MOCK_CONST_METHOD0(GetLastModifiedTime, const std::string&()); |
MOCK_CONST_METHOD0(GetETag, const std::string&()); |
MOCK_CONST_METHOD0(GetLastReason, DownloadInterruptReason()); |
- MOCK_CONST_METHOD0(GetPersistentStoreInfo, |
- content::DownloadPersistentStoreInfo()); |
MOCK_CONST_METHOD0(GetBrowserContext, content::BrowserContext*()); |
MOCK_CONST_METHOD0(GetWebContents, content::WebContents*()); |
MOCK_CONST_METHOD0(GetFileNameToReportUser, FilePath()); |
@@ -182,13 +186,6 @@ class MockDownloadManagerDelegate : public content::DownloadManagerDelegate { |
DownloadItem*, const base::Closure&)); |
MOCK_METHOD1(ShouldOpenDownload, bool(DownloadItem*)); |
MOCK_METHOD0(GenerateFileHash, bool()); |
- MOCK_METHOD1(AddItemToPersistentStore, void(DownloadItem*)); |
- MOCK_METHOD1(UpdateItemInPersistentStore, void(DownloadItem*)); |
- MOCK_METHOD2(UpdatePathForItemInPersistentStore, |
- void(DownloadItem*, const FilePath&)); |
- MOCK_METHOD1(RemoveItemFromPersistentStore, void(DownloadItem*)); |
- MOCK_METHOD2(RemoveItemsFromPersistentStoreBetween, void( |
- base::Time remove_begin, base::Time remove_end)); |
MOCK_METHOD4(GetSaveDir, void(content::BrowserContext*, |
FilePath*, FilePath*, bool*)); |
MOCK_METHOD5(ChooseSavePath, void( |
@@ -272,7 +269,15 @@ class MockDownloadItemFactory |
virtual DownloadItemImpl* CreatePersistedItem( |
DownloadItemImplDelegate* delegate, |
content::DownloadId download_id, |
- const content::DownloadPersistentStoreInfo& info, |
+ const FilePath& path, |
+ const GURL& url, |
+ const GURL& referrer_url, |
+ const base::Time& start_time, |
+ const base::Time& end_time, |
+ int64 received_bytes, |
+ int64 total_bytes, |
+ DownloadItem::DownloadState state, |
+ bool opened, |
const net::BoundNetLog& bound_net_log) OVERRIDE; |
virtual DownloadItemImpl* CreateActiveItem( |
DownloadItemImplDelegate* delegate, |
@@ -323,7 +328,15 @@ void MockDownloadItemFactory::RemoveItem(int id) { |
DownloadItemImpl* MockDownloadItemFactory::CreatePersistedItem( |
DownloadItemImplDelegate* delegate, |
content::DownloadId download_id, |
- const content::DownloadPersistentStoreInfo& info, |
+ const FilePath& path, |
+ const GURL& url, |
+ const GURL& referrer_url, |
+ const base::Time& start_time, |
+ const base::Time& end_time, |
+ int64 received_bytes, |
+ int64 total_bytes, |
+ DownloadItem::DownloadState state, |
+ bool opened, |
const net::BoundNetLog& bound_net_log) { |
int local_id = download_id.local(); |
DCHECK(items_.find(local_id) == items_.end()); |
@@ -531,35 +544,6 @@ class DownloadManagerTest : public testing::Test { |
download_manager_->DownloadStopped(item); |
} |
- void AddItemToHistory(MockDownloadItemImpl& item, int64 db_handle) { |
- // For DCHECK in AddDownloadItemToHistory. Don't want to use |
- // WillRepeatedly as it may have to return true after this. |
- if (DCHECK_IS_ON()) |
- EXPECT_CALL(item, IsPersisted()) |
- .WillRepeatedly(Return(false)); |
- |
- EXPECT_CALL(item, SetDbHandle(db_handle)); |
- EXPECT_CALL(item, SetIsPersisted()); |
- EXPECT_CALL(item, GetDbHandle()) |
- .WillRepeatedly(Return(db_handle)); |
- |
- // Null out ShowDownloadInBrowser |
- EXPECT_CALL(item, GetWebContents()) |
- .WillOnce(Return(static_cast<WebContents*>(NULL))); |
- EXPECT_CALL(GetMockDownloadManagerDelegate(), |
- GetAlternativeWebContentsToNotifyForDownload()) |
- .WillOnce(Return(static_cast<WebContents*>(NULL))); |
- |
- EXPECT_CALL(item, IsInProgress()) |
- .WillOnce(Return(true)); |
- |
- // Null out MaybeCompleteDownload |
- EXPECT_CALL(item, AllDataSaved()) |
- .WillOnce(Return(false)); |
- |
- download_manager_->OnItemAddedToPersistentStore(item.GetId(), db_handle); |
- } |
- |
protected: |
// Key test variable; we'll keep it available to sub-classes. |
scoped_refptr<DownloadManagerImpl> download_manager_; |