Reland DownloadManager::GetAllDownloads actually does now

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2625 matching lines @@
                                                  IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ListValue* list_of_downloads = new ListValue;
 
   DownloadService* download_service(
       DownloadServiceFactory::GetForProfile(browser->profile()));
 
   if (download_service->HasCreatedDownloadManager()) {
     std::vector<DownloadItem*> downloads;
-    BrowserContext::GetDownloadManager(browser->profile())->
-        GetAllDownloads(FilePath(), &downloads);
+    BrowserContext::GetDownloadManager(browser->profile())->GetAllDownloads(
+        &downloads);
 
     for (std::vector<DownloadItem*>::iterator it = downloads.begin();
          it != downloads.end();
          it++) {  // Fill info about each download item.
       list_of_downloads->Append(GetDictionaryFromDownloadItem(
           *it, browser->profile()->IsOffTheRecord()));
     }
   }
   return_value->Set("downloads", list_of_downloads);
   reply.SendSuccess(return_value.get());
@@ skipping 19 matching lines @@
     return;
   }
 
   // This observer will delete itself.
   new AllDownloadsCompleteObserver(
       this, reply_message,
       BrowserContext::GetDownloadManager(browser->profile()),
       pre_download_ids);
 }
 
-namespace {
-
-DownloadItem* GetDownloadItemFromId(int id, DownloadManager* download_manager) {
-  std::vector<DownloadItem*> downloads;
-  download_manager->GetAllDownloads(FilePath(), &downloads);
-  DownloadItem* selected_item = NULL;
-
-  for (std::vector<DownloadItem*>::iterator it = downloads.begin();
-       it != downloads.end();
-       it++) {
-    DownloadItem* curr_item = *it;
-    if (curr_item->GetId() == id) {
-      selected_item = curr_item;
-      break;
-    }
-  }
-  return selected_item;
-}
-
-}  // namespace
-
 // See PerformActionOnDownload() in chrome/test/pyautolib/pyauto.py for sample
 // json input and output.
 void TestingAutomationProvider::PerformActionOnDownload(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   int id;
   std::string action;
 
   DownloadService* download_service =
       DownloadServiceFactory::GetForProfile(browser->profile());
   if (!download_service->HasCreatedDownloadManager()) {
     AutomationJSONReply(this, reply_message).SendError("No download manager.");
     return;
   }
   if (!args->GetInteger("id", &id) || !args->GetString("action", &action)) {
     AutomationJSONReply(this, reply_message)
         .SendError("Must include int id and string action.");
     return;
   }
 
   DownloadManager* download_manager =
       BrowserContext::GetDownloadManager(browser->profile());
-  DownloadItem* selected_item = GetDownloadItemFromId(id, download_manager);
+  DownloadItem* selected_item = download_manager->GetDownload(id);
   if (!selected_item) {
     AutomationJSONReply(this, reply_message)
         .SendError(StringPrintf("No download with an id of %d\n", id));
     return;
   }
 
   // We need to be IN_PROGRESS for these actions.
   if ((action == "toggle_pause" || action == "cancel") &&
       !selected_item->IsInProgress()) {
     AutomationJSONReply(this, reply_message)
@@ skipping 3699 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }