Revert 155351 - Make DownloadManager::GetAllDownloads return all downloads regardless of state, per…

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_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/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 85 matching lines @@
     DCHECK_GT(managers_.size(), static_cast<size_t>(manager_index));
     content::MockDownloadManager* manager = managers_[manager_index].get();
 
     if (manager_items_.size() <= static_cast<size_t>(manager_index))
       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>;
-      EXPECT_CALL(*item, IsTemporary())
-          .WillRepeatedly(Return(false));
       if (i < in_progress_count) {
         EXPECT_CALL(*item, GetState())
             .WillRepeatedly(Return(content::DownloadItem::IN_PROGRESS));
         EXPECT_CALL(*item, AddObserver(updater_))
             .WillOnce(Return());
       } else {
         EXPECT_CALL(*item, GetState())
             .WillRepeatedly(Return(content::DownloadItem::COMPLETE));
       }
       manager_items_[manager_index].push_back(item);
     }
-    EXPECT_CALL(*manager, GetAllDownloads(_))
-        .WillOnce(SetArgPointee<0>(manager_items_[manager_index]));
+    EXPECT_CALL(*manager, SearchDownloads(string16(), _))
+        .WillOnce(SetArgPointee<1>(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].get();
   }
 
   // Return the specified item.
   content::MockDownloadItem* Item(int manager_index, int item_index) {
@@ skipping 201 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);
 }