Make DownloadHistory observe manager, items

chrome/browser/download/chrome_download_manager_delegate_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 285 matching lines @@
   EXPECT_CALL(*download_manager_, GetAllDownloads(_)).WillRepeatedly(Return());
   EXPECT_CALL(*download_manager_, AddObserver(_)).WillRepeatedly(Return());
   EXPECT_CALL(*download_manager_, RemoveObserver(_)).WillRepeatedly(Return());
 }
 
 void ChromeDownloadManagerDelegateTest::SetUp() {
   ChromeRenderViewHostTestHarness::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_);
 
   ASSERT_TRUE(test_download_dir_.CreateUniqueTempDir());
   SetDefaultDownloadPath(test_download_dir_.path());
 }
 
 void ChromeDownloadManagerDelegateTest::TearDown() {
   message_loop_.RunAllPending();
   delegate_->Shutdown();
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
 void ChromeDownloadManagerDelegateTest::VerifyAndClearExpectations() {
   ::testing::Mock::VerifyAndClearExpectations(delegate_);
   ::testing::Mock::VerifyAndClearExpectations(download_manager_);
   EXPECT_CALL(*download_manager_, RemoveObserver(_)).WillRepeatedly(Return());
   EXPECT_CALL(*download_manager_, GetAllDownloads(_))
       .WillRepeatedly(Return());
 }
 
 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())
       .WillByDefault(ReturnRefOfCopy(std::string()));
   ON_CALL(*item, GetReferrerUrl())
       .WillByDefault(ReturnRefOfCopy(GURL()));
   ON_CALL(*item, GetTransitionType())
       .WillByDefault(Return(content::PAGE_TRANSITION_LINK));
   ON_CALL(*item, HasUserGesture())
       .WillByDefault(Return(false));
@@ skipping 604 matching lines @@
 
   RunTestCases(kWebIntentsTestCases, arraysize(kWebIntentsTestCases));
 }
 #endif
 
 // TODO(asanka): Add more tests.
 // * Default download path is not writable.
 // * Download path doesn't exist.
 // * IsDangerousFile().
 // * Filename generation.