Download resumption - Preliminary

content/browser/download/download_manager_impl_unittest.cc

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 e0368bb337862ebe6a0f26cb8d936a0f089b73aa..ff1c7eb9a6a86ae69414a796567f957323606d2e 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -277,7 +277,6 @@ class MockDownloadItemFactory
   virtual DownloadItemImpl* CreateActiveItem(
       DownloadItemImplDelegate* delegate,
       const DownloadCreateInfo& info,
-      scoped_ptr<DownloadRequestHandleInterface> request_handle,
       const net::BoundNetLog& bound_net_log) OVERRIDE;
   virtual DownloadItemImpl* CreateSavePageItem(
       DownloadItemImplDelegate* delegate,
@@ -332,6 +331,8 @@ DownloadItemImpl* MockDownloadItemFactory::CreatePersistedItem(
       new StrictMock<MockDownloadItemImpl>(&item_delegate_);
   EXPECT_CALL(*result, GetId())
       .WillRepeatedly(Return(local_id));
+  EXPECT_CALL(*result, DebugString(true))
+      .WillRepeatedly(Return(std::string()));
   items_[local_id] = result;
 
   return result;
@@ -340,7 +341,6 @@ DownloadItemImpl* MockDownloadItemFactory::CreatePersistedItem(
 DownloadItemImpl* MockDownloadItemFactory::CreateActiveItem(
     DownloadItemImplDelegate* delegate,
     const DownloadCreateInfo& info,
-    scoped_ptr<DownloadRequestHandleInterface> request_handle,
     const net::BoundNetLog& bound_net_log) {
   int local_id = info.download_id.local();
   DCHECK(items_.find(local_id) == items_.end());
@@ -349,6 +349,8 @@ DownloadItemImpl* MockDownloadItemFactory::CreateActiveItem(
       new StrictMock<MockDownloadItemImpl>(&item_delegate_);
   EXPECT_CALL(*result, GetId())
       .WillRepeatedly(Return(local_id));
+  EXPECT_CALL(*result, DebugString(true))
+      .WillRepeatedly(Return(std::string()));
   items_[local_id] = result;
 
   return result;
@@ -633,6 +635,8 @@ TEST_F(DownloadManagerTest, OnDownloadStopped_NonPersisted) {
 
   EXPECT_CALL(item, IsPersisted())
       .WillRepeatedly(Return(false));
+  EXPECT_CALL(item, IsInterrupted())
+    .WillRepeatedly(Return(false));
   EXPECT_CALL(item, GetState())
       .WillRepeatedly(Return(DownloadItem::CANCELLED));
   EXPECT_CALL(item, GetDbHandle())
@@ -656,6 +660,8 @@ TEST_F(DownloadManagerTest, OnDownloadStopped_Persisted) {
 
   EXPECT_CALL(item, IsPersisted())
       .WillRepeatedly(Return(true));
+  EXPECT_CALL(item, IsInterrupted())
+      .WillRepeatedly(Return(false));
   EXPECT_CALL(GetMockDownloadManagerDelegate(),
               UpdateItemInPersistentStore(&item));
   EXPECT_CALL(item, GetState())