[Downloads] Add real observers to MockDownloadItem.

chrome/browser/download/download_status_updater_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/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "content/public/test/mock_download_item.h"
@@ skipping 36 matching lines @@
 
 class DownloadStatusUpdaterTest : public testing::Test {
  public:
   DownloadStatusUpdaterTest()
       : updater_(new TestDownloadStatusUpdater()),
         ui_thread_(content::BrowserThread::UI, &loop_) {}
 
   virtual ~DownloadStatusUpdaterTest() {
     for (size_t mgr_idx = 0; mgr_idx < managers_.size(); ++mgr_idx) {
       EXPECT_CALL(*Manager(mgr_idx), RemoveObserver(_));
-      for (size_t item_idx = 0; item_idx < manager_items_[mgr_idx].size();
-           ++item_idx) {
-        EXPECT_CALL(*Item(mgr_idx, item_idx), RemoveObserver(_));
-      }
     }
 
     delete updater_;
     updater_ = NULL;
     VerifyAndClearExpectations();
 
     managers_.clear();
     for (std::vector<Items>::iterator it = manager_items_.begin();
          it != manager_items_.end(); ++it)
       STLDeleteContainerPointers(it->begin(), it->end());
@@ skipping 38 matching lines @@
       manager_items_.resize(manager_index+1);
 
     std::vector<content::DownloadItem*> item_list;
     for (int i = 0; i < item_count; ++i) {
       content::MockDownloadItem* item =
           new StrictMock<content::MockDownloadItem>;
       content::DownloadItem::DownloadState state =
           i < in_progress_count ? content::DownloadItem::IN_PROGRESS
               : content::DownloadItem::CANCELLED;
       EXPECT_CALL(*item, GetState()).WillRepeatedly(Return(state));
-      EXPECT_CALL(*item, AddObserver(_))
-          .WillOnce(Return());
       manager_items_[manager_index].push_back(item);
     }
     EXPECT_CALL(*manager, GetAllDownloads(_))
         .WillRepeatedly(SetArgPointee<0>(manager_items_[manager_index]));
   }
 
   // Return the specified manager.
   content::MockDownloadManager* Manager(int manager_index) {
     DCHECK_GT(managers_.size(), static_cast<size_t>(manager_index));
     return managers_[manager_index];
@@ skipping 209 matching lines @@
   SetItemValues(0, 0, 10, 20, false);
   SetItemValues(0, 1, 50, 60, false);
   SetItemValues(1, 0, 80, 90, false);
 
   float progress = -1;
   int download_count = -1;
   EXPECT_TRUE(updater_->GetProgress(&progress, &download_count));
   EXPECT_FLOAT_EQ((10+50+80)/(20.0f+60+90), progress);
   EXPECT_EQ(3, download_count);
 }