Download code cleanup patch of death:

chrome/test/ui_test_utils.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/test/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 150 matching lines @@
         (*it)->AddObserver(this);
         still_waiting = true;
       }
     }
 
     if (still_waiting)
       return false;
 
     download_manager_->RemoveObserver(this);
     // waiting_ will have been set if not all downloads were complete on first
-    // pass below in SetDownloads().
+    // pass below in OnSearchDownloadsComplete().
     if (waiting_)
       MessageLoopForUI::current()->Quit();
     return true;
   }
 
   // DownloadItem::Observer
   virtual void OnDownloadUpdated(DownloadItem* download) {
     if (download->state() == DownloadItem::COMPLETE) {
       CheckAllDownloadsComplete();
     }
   }
 
   virtual void OnDownloadFileCompleted(DownloadItem* download) { }
   virtual void OnDownloadOpened(DownloadItem* download) {}
 
   // DownloadManager::Observer
   virtual void ModelChanged() {
-    download_manager_->GetDownloads(this, L"");
+    download_manager_->download_history()->Search(
+        string16(),
+        NewCallback(this,
+                    &DownloadsCompleteObserver::OnSearchDownloadsComplete));
   }
 
-  virtual void SetDownloads(std::vector<DownloadItem*>& downloads) {
+  void OnSearchDownloadsComplete(std::vector<DownloadItem*> downloads) {
     downloads_ = downloads;
     if (CheckAllDownloadsComplete())
       return;
 
     if (!waiting_) {
       waiting_ = true;
       ui_test_utils::RunMessageLoop();
     }
   }
 
@@ skipping 457 matching lines @@
 TestWebSocketServer::~TestWebSocketServer() {
   scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine());
   cmd_line->AppendSwitchWithValue("server", "stop");
   cmd_line->AppendSwitch("chromium");
   cmd_line->AppendSwitchWithValue("pidfile",
                                   websocket_pid_file_.ToWStringHack());
   base::LaunchApp(*cmd_line.get(), true, false, NULL);
 }
 
 }  // namespace ui_test_utils