Download code cleanup patch of death:

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2010 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/automation_provider.h"
 
 #include <set>
 
 #include "app/message_box_flags.h"
 #include "base/callback.h"
@@ skipping 2081 matching lines @@
   if (title.length())
     hs->SetPageTitle(gurl, title);
   reply.SendSuccess(NULL);
 }
 
 // Sample json input: { "command": "GetDownloadsInfo" }
 // Refer chrome/test/pyautolib/download_info.py for sample json output.
 void AutomationProvider::GetDownloadsInfo(Browser* browser,
                                           DictionaryValue* args,
                                           IPC::Message* reply_message) {
-  AutomationProviderDownloadManagerObserver observer;
-  std::vector<DownloadItem*> downloads;
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   AutomationJSONReply reply(this, reply_message);
 
   if (!profile_->HasCreatedDownloadManager()) {
     reply.SendError("no download manager");
     return;
   }
-  // Use DownloadManager's GetDownloads() method and not GetCurrentDownloads()
-  // since that would be transient; a download might enter and empty out
-  // the current download queue too soon to be noticed.
-  profile_->GetDownloadManager()->GetDownloads(&observer, L"");
-  downloads = observer.Downloads();
+
+  std::vector<DownloadItem*> downloads;
+  profile_->GetDownloadManager()->GetAllDownloads(FilePath(), &downloads);
 
   std::map<DownloadItem::DownloadState, std::string> state_to_string;
   state_to_string[DownloadItem::IN_PROGRESS] = std::string("IN_PROGRESS");
   state_to_string[DownloadItem::CANCELLED] = std::string("CANCELLED");
   state_to_string[DownloadItem::REMOVING] = std::string("REMOVING");
   state_to_string[DownloadItem::COMPLETE] = std::string("COMPLETE");
 
   std::map<DownloadItem::SafetyState, std::string> safety_state_to_string;
   safety_state_to_string[DownloadItem::SAFE] = std::string("SAFE");
   safety_state_to_string[DownloadItem::DANGEROUS] = std::string("DANGEROUS");
@@ skipping 27 matching lines @@
 
   reply.SendSuccess(return_value.get());
   // All value objects allocated above are owned by |return_value|
   // and get freed by it.
 }
 
 void AutomationProvider::WaitForDownloadsToComplete(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
-  AutomationProviderDownloadManagerObserver observer;
-  std::vector<DownloadItem*> downloads;
   AutomationJSONReply reply(this, reply_message);
 
   // Look for a quick return.
   if (!profile_->HasCreatedDownloadManager()) {
     reply.SendSuccess(NULL);  // No download manager.
     return;
   }
-  profile_->GetDownloadManager()->GetCurrentDownloads(&observer, FilePath());
-  downloads = observer.Downloads();
-  if (downloads.size() == 0) {
+  std::vector<DownloadItem*> downloads;
+  profile_->GetDownloadManager()->GetCurrentDownloads(FilePath(), &downloads);
+  if (downloads.empty()) {
     reply.SendSuccess(NULL);
     return;
   }
 
   // The observer owns itself.  When the last observed item pings, it
   // deletes itself.
   AutomationProviderDownloadItemObserver* item_observer =
       new AutomationProviderDownloadItemObserver(
           this, reply_message, downloads.size());
   for (std::vector<DownloadItem*>::iterator i = downloads.begin();
@@ skipping 2210 matching lines @@
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)
 
 void AutomationProvider::ResetToDefaultTheme() {
   profile_->ClearTheme();
 }