Remove DownloadManager::GetDownloadItem in favor of GetDownload()

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 275 matching lines @@
   scoped_refptr<content::MockDownloadManager> download_manager_;
   scoped_refptr<TestChromeDownloadManagerDelegate> delegate_;
   MockWebContentsDelegate web_contents_delegate_;
 };
 
 ChromeDownloadManagerDelegateTest::ChromeDownloadManagerDelegateTest()
     : ChromeRenderViewHostTestHarness(),
       ui_thread_(content::BrowserThread::UI, &message_loop_),
       file_thread_(content::BrowserThread::FILE, &message_loop_),
       download_manager_(new content::MockDownloadManager) {
+  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());
   delegate_->SetDownloadManager(download_manager_.get());
   pref_service_ = profile()->GetTestingPrefService();
   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());
 }
 
 content::MockDownloadItem*
     ChromeDownloadManagerDelegateTest::CreateActiveDownloadItem(int32 id) {
   content::MockDownloadItem* item =
       new ::testing::NiceMock<content::MockDownloadItem>();
   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));
   ON_CALL(*item, IsDangerous())
       .WillByDefault(Return(false));
   ON_CALL(*item, IsTemporary())
       .WillByDefault(Return(false));
   ON_CALL(*item, GetWebContents())
       .WillByDefault(Return(contents()));
   EXPECT_CALL(*item, GetId())
       .WillRepeatedly(Return(id));
-  EXPECT_CALL(*download_manager_, GetActiveDownloadItem(id))
+  EXPECT_CALL(*item, AddObserver(_)).WillRepeatedly(Return());
+  EXPECT_CALL(*item, RemoveObserver(_)).WillRepeatedly(Return());
+  EXPECT_CALL(*download_manager_, GetDownload(id))
       .WillRepeatedly(Return(item));
   return item;
 }
 
 void ChromeDownloadManagerDelegateTest::EnableAutoOpenBasedOnExtension(
     const FilePath& path) {
   EXPECT_TRUE(
       delegate_->download_prefs()->EnableAutoOpenBasedOnExtension(path));
 }
 
@@ skipping 575 matching lines @@
   };
 
   RunTestCases(kWebIntentsTestCases, arraysize(kWebIntentsTestCases));
 }
 
 // TODO(asanka): Add more tests.
 // * Default download path is not writable.
 // * Download path doesn't exist.
 // * IsDangerousFile().
 // * Filename generation.