[Downloads] Add real observers to MockDownloadItem.

content/public/test/mock_download_item.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_
 #define CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_
 
 #include "base/callback.h"
+#include "base/observer_list.h"
 #include "base/time/time.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class MockDownloadItem : public DownloadItem {
  public:
   MockDownloadItem();
   virtual ~MockDownloadItem();
-  MOCK_METHOD1(AddObserver, void(DownloadItem::Observer*));
-  MOCK_METHOD1(RemoveObserver, void(DownloadItem::Observer*));
-  MOCK_METHOD0(UpdateObservers, void());
+
+  // Management of observer lists is common in tests. So Add/RemoveObserver
+  // methods are not mocks. In addition, any registered observers will receive a
+  // OnDownloadDestroyed() notification when the mock is destroyed.
+  virtual void AddObserver(Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+  virtual void UpdateObservers() OVERRIDE;

[Randy Smith (Not in Mondays), 2014/04/23 19:28:35]

I'd cluster this with the below and name it somewhat differently.  We're not
actually updating the observers; we're notifying the observers that the download
has been updated.  I'd suggest
"NotifyObserversDownload{Updated,Opened,Removed}".

[asanka, 2014/04/25 21:31:27]

Done.

+
+  // Dispatches an OnDownloadOpened() notification to observers.
+  void UpdateObserversOnOpened();
+  // Dispatches an OnDownloadRemoved() notification to observers.
+  void UpdateObserversOnRemoved();
+
   MOCK_METHOD0(ValidateDangerousDownload, void());
   MOCK_METHOD1(StealDangerousDownload, void(const AcquireFileCallback&));
   MOCK_METHOD0(Pause, void());
   MOCK_METHOD0(Resume, void());
   MOCK_METHOD1(Cancel, void(bool));
   MOCK_METHOD0(Remove, void());
   MOCK_METHOD0(OpenDownload, void());
   MOCK_METHOD0(ShowDownloadInShell, void());
   MOCK_CONST_METHOD0(GetId, uint32());
   MOCK_CONST_METHOD0(GetState, DownloadState());
@@ skipping 45 matching lines @@
   MOCK_METHOD0(GetAutoOpened, bool());
   MOCK_CONST_METHOD0(GetOpened, bool());
   MOCK_CONST_METHOD0(GetBrowserContext, BrowserContext*());
   MOCK_CONST_METHOD0(GetWebContents, WebContents*());
   MOCK_METHOD1(OnContentCheckCompleted, void(DownloadDangerType));
   MOCK_METHOD1(SetOpenWhenComplete, void(bool));
   MOCK_METHOD1(SetIsTemporary, void(bool));
   MOCK_METHOD1(SetOpened, void(bool));
   MOCK_METHOD1(SetDisplayName, void(const base::FilePath&));
   MOCK_CONST_METHOD1(DebugString, std::string(bool));
+
+ private:
+  ObserverList<Observer> observers_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_MOCK_DOWNLOAD_ITEM_H_