Download code cleanup patch of death:

chrome/browser/dom_ui/downloads_dom_handler.cc

 // Copyright (c) 2009 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/dom_ui/downloads_dom_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/thread.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/fileicon_source.h"
+#include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
@@ skipping 76 matching lines @@
   if (it == download_items_.end())
     return;
   const int id = static_cast<int>(it - download_items_.begin());
 
   ListValue results_value;
   results_value.Append(download_util::CreateDownloadItemValue(download, id));
   dom_ui_->CallJavascriptFunction(L"downloadUpdated", results_value);
 }
 
 // A download has started or been deleted. Query our DownloadManager for the
-// current set of downloads, which will call us back in SetDownloads once it
-// has retrieved them.
+// current set of downloads.
 void DownloadsDOMHandler::ModelChanged() {
   ClearDownloadItems();
-  download_manager_->GetDownloads(this, search_text_);
+  download_manager_->download_history()->Search(
+      WideToUTF16(search_text_),
+      NewCallback(this, &DownloadsDOMHandler::OnSearchDownloadsComplete));
 }
 
-void DownloadsDOMHandler::SetDownloads(
-    std::vector<DownloadItem*>& downloads) {
+void DownloadsDOMHandler::OnSearchDownloadsComplete(
+    std::vector<DownloadItem*> downloads) {
   ClearDownloadItems();
 
   // Swap new downloads in.
   download_items_.swap(downloads);
   sort(download_items_.begin(), download_items_.end(), DownloadItemSorter());
 
   // Scan for any in progress downloads and add ourself to them as an observer.
   for (OrderedDownloads::iterator it = download_items_.begin();
        it != download_items_.end(); ++it) {
     if (static_cast<int>(it - download_items_.begin()) > kMaxDownloads)
@@ skipping 10 matching lines @@
   }
 
   SendCurrentDownloads();
 }
 
 void DownloadsDOMHandler::HandleGetDownloads(const Value* value) {
   std::wstring new_search = ExtractStringValue(value);
   if (search_text_.compare(new_search) != 0) {
     search_text_ = new_search;
     ClearDownloadItems();
-    download_manager_->GetDownloads(this, search_text_);
+    download_manager_->download_history()->Search(
+        WideToUTF16(search_text_),
+        NewCallback(this, &DownloadsDOMHandler::OnSearchDownloadsComplete));
   } else {
     SendCurrentDownloads();
   }
 }
 
 void DownloadsDOMHandler::HandleOpenFile(const Value* value) {
   DownloadItem* file = GetDownloadByValue(value);
   if (file)
     download_manager_->OpenDownload(file, NULL);
 }
@@ skipping 83 matching lines @@
   return NULL;
 }
 
 DownloadItem* DownloadsDOMHandler::GetDownloadByValue(const Value* value) {
   int id;
   if (ExtractIntegerValue(value, &id)) {
     return GetDownloadById(id);
   }
   return NULL;
 }