Make DownloadHistory observe manager, items

chrome/browser/download/chrome_download_manager_delegate_unittest.cc

Index: chrome/browser/download/chrome_download_manager_delegate_unittest.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index db9de71f5d44e3c555136c26f6fdc4555c56b1cb..23aac174f9b01542c33c15320be7c1e6eeb75c58 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -303,6 +303,10 @@ void ChromeDownloadManagerDelegateTest::SetUp() {
 
   CHECK(profile());
   delegate_ = new TestChromeDownloadManagerDelegate(profile());
+  EXPECT_CALL(*download_manager_.get(), GetAllDownloads(_))
+    .WillRepeatedly(Return());

[asanka, 2012/11/08 22:45:53]

Nit: indent

[benjhayden, 2012/11/12 18:44:16]

Done.

+  EXPECT_CALL(*download_manager_.get(), AddObserver(_))
+      .WillRepeatedly(Return());
   delegate_->SetDownloadManager(download_manager_.get());
   pref_service_ = profile()->GetTestingPrefService();
   web_contents()->SetDelegate(&web_contents_delegate_);
@@ -329,6 +333,12 @@ content::MockDownloadItem*
     ChromeDownloadManagerDelegateTest::CreateActiveDownloadItem(int32 id) {
   content::MockDownloadItem* item =
       new ::testing::NiceMock<content::MockDownloadItem>();
+  EXPECT_CALL(*item, GetState())
+      .WillRepeatedly(Return(DownloadItem::IN_PROGRESS));
+  EXPECT_CALL(*item, AddObserver(_))
+      .WillRepeatedly(Return());
+  EXPECT_CALL(*item, RemoveObserver(_))
+      .WillRepeatedly(Return());

[asanka, 2012/11/08 22:45:53]

These expectations are already set below.

[benjhayden, 2012/11/12 18:44:16]

Done.

   ON_CALL(*item, GetFullPath())
       .WillByDefault(ReturnRefOfCopy(FilePath()));
   ON_CALL(*item, GetHash())