[Downloads] Add real observers to MockDownloadItem.

chrome/browser/plugins/plugin_installer_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 "chrome/browser/plugins/plugin_installer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/plugins/plugin_installer_observer.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace {
 
 class PluginInstallerTest : public ChromeRenderViewHostTestHarness {
  public:
   PluginInstallerTest();
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   PluginInstaller* installer() { return installer_.get(); }
-  content::DownloadItem::Observer* last_download_item_observer() {
-    return last_download_item_observer_;
-  }
 
   scoped_ptr<content::MockDownloadItem> CreateMockDownloadItem();
 
  private:
   scoped_ptr<PluginInstaller> installer_;
-  content::DownloadItem::Observer* last_download_item_observer_;
 };
 
-PluginInstallerTest::PluginInstallerTest()
-    : last_download_item_observer_(NULL) {}
+PluginInstallerTest::PluginInstallerTest() {
+}
 
 void PluginInstallerTest::SetUp() {
   content::RenderViewHostTestHarness::SetUp();
   installer_.reset(new PluginInstaller());
 }
 
 void PluginInstallerTest::TearDown() {
   installer_.reset();
   content::RenderViewHostTestHarness::TearDown();
 }
 
 scoped_ptr<content::MockDownloadItem>
 PluginInstallerTest::CreateMockDownloadItem() {
   scoped_ptr<content::MockDownloadItem> mock_download_item(
       new testing::StrictMock<content::MockDownloadItem>());
-  ON_CALL(*mock_download_item, AddObserver(_))
-      .WillByDefault(testing::SaveArg<0>(&last_download_item_observer_));
-  ON_CALL(*mock_download_item, RemoveObserver(_)).WillByDefault(
-      testing::Assign(&last_download_item_observer_,
-                      static_cast<content::DownloadItem::Observer*>(NULL)));
   ON_CALL(*mock_download_item, GetState())
       .WillByDefault(testing::Return(content::DownloadItem::IN_PROGRESS));
   return mock_download_item.Pass();
 }
 
 class TestPluginInstallerObserver : public PluginInstallerObserver {
  public:
   explicit TestPluginInstallerObserver(PluginInstaller* installer)
       : PluginInstallerObserver(installer),
         download_started_(false),
@@ skipping 41 matching lines @@
   base::RunLoop run_loop;
   scoped_ptr<content::MockDownloadItem> download_item(CreateMockDownloadItem());
 
   EXPECT_CALL(mock_download_manager,
               DownloadUrlMock(testing::Property(
                   &content::DownloadUrlParameters::url, GURL(kTestUrl))))
       .WillOnce(testing::DoAll(
           InvokeOnStartedCallback(download_item.get(),
                                   content::DOWNLOAD_INTERRUPT_REASON_NONE),
           InvokeClosure(run_loop.QuitClosure())));
-  EXPECT_CALL(*download_item, AddObserver(_));
   EXPECT_CALL(*download_item, SetOpenWhenComplete(_));
 
   TestPluginInstallerObserver installer_observer(installer());
   installer()->StartInstallingWithDownloadManager(
       GURL(kTestUrl), web_contents(), &mock_download_manager);
   run_loop.Run();
 
-  ASSERT_TRUE(last_download_item_observer());
   EXPECT_TRUE(installer_observer.download_started());
   EXPECT_FALSE(installer_observer.download_finished());
 
   EXPECT_CALL(*download_item, GetState())
       .WillOnce(testing::Return(content::DownloadItem::COMPLETE));
-  EXPECT_CALL(*download_item, RemoveObserver(_));
-  last_download_item_observer()->OnDownloadUpdated(download_item.get());
+  download_item->NotifyObserversDownloadUpdated();
   EXPECT_TRUE(installer_observer.download_finished());
 }
 
 // Test that DownloadStarted()/DownloadError() notifications are sent to
 // observers when a download initiated by PluginInstaller fails to start.
 TEST_F(PluginInstallerTest, StartInstalling_FailedStart) {
   content::MockDownloadManager mock_download_manager;
   base::RunLoop run_loop;
   scoped_ptr<content::MockDownloadItem> download_item(CreateMockDownloadItem());
 
   EXPECT_CALL(mock_download_manager,
               DownloadUrlMock(testing::Property(
                   &content::DownloadUrlParameters::url, GURL(kTestUrl))))
       .WillOnce(
           testing::DoAll(InvokeOnStartedCallback(
                              download_item.get(),
                              content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED),
                          InvokeClosure(run_loop.QuitClosure())));
 
   TestPluginInstallerObserver installer_observer(installer());
   installer()->StartInstallingWithDownloadManager(
       GURL(kTestUrl), web_contents(), &mock_download_manager);
   run_loop.Run();
 
-  EXPECT_FALSE(last_download_item_observer());
   EXPECT_TRUE(installer_observer.download_started());
   EXPECT_FALSE(installer_observer.download_finished());
   EXPECT_EQ("Error 20: NETWORK_FAILED", installer_observer.download_error());
 }
 
 // Test that DownloadStarted()/DownloadError() notifications are sent to
 // observers when a download initiated by PluginInstaller starts successfully
 // but is interrupted later.
 TEST_F(PluginInstallerTest, StartInstalling_Interrupted) {
   content::MockDownloadManager mock_download_manager;
   base::RunLoop run_loop;
   scoped_ptr<content::MockDownloadItem> download_item(CreateMockDownloadItem());
 
   EXPECT_CALL(mock_download_manager,
               DownloadUrlMock(testing::Property(
                   &content::DownloadUrlParameters::url, GURL(kTestUrl))))
       .WillOnce(testing::DoAll(
           InvokeOnStartedCallback(download_item.get(),
                                   content::DOWNLOAD_INTERRUPT_REASON_NONE),
           InvokeClosure(run_loop.QuitClosure())));
-  EXPECT_CALL(*download_item, AddObserver(_));
   EXPECT_CALL(*download_item, SetOpenWhenComplete(_));
 
   TestPluginInstallerObserver installer_observer(installer());
   installer()->StartInstallingWithDownloadManager(
       GURL(kTestUrl), web_contents(), &mock_download_manager);
   run_loop.Run();
 
-  ASSERT_TRUE(last_download_item_observer());
   EXPECT_TRUE(installer_observer.download_started());
   EXPECT_FALSE(installer_observer.download_finished());
 
   EXPECT_CALL(*download_item, GetState())
       .WillOnce(testing::Return(content::DownloadItem::INTERRUPTED));
-  EXPECT_CALL(*download_item, RemoveObserver(_));
   EXPECT_CALL(*download_item, GetLastReason()).WillOnce(
       testing::Return(content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED));
-  last_download_item_observer()->OnDownloadUpdated(download_item.get());
+  download_item->NotifyObserversDownloadUpdated();
 
-  EXPECT_FALSE(last_download_item_observer());
   EXPECT_TRUE(installer_observer.download_started());
   EXPECT_FALSE(installer_observer.download_finished());
   EXPECT_EQ("NETWORK_FAILED", installer_observer.download_error());
 }