Regression fix: Downloads page in Incognito mode works fine now.

Additionally, it fixes another ancient bug that prevented downloads search
from working in Incognito mode.

The design of DownloadHistory is also nicer now, with no dependencies
on DownloadManager.

TEST=see bug
BUG=51955

Review URL: http://codereview.chromium.org/3112011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56266 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 9 deletions

diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index cdd6087..3d36b6e 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -168,7 +168,7 @@ class DownloadsCompleteObserver : public DownloadManager::Observer,
 
     download_manager_->RemoveObserver(this);
     // waiting_ will have been set if not all downloads were complete on first
-    // pass below in OnSearchDownloadsComplete().
+    // pass below in ModelChanged().
     if (waiting_)
       MessageLoopForUI::current()->Quit();
     return true;
@@ -186,14 +186,9 @@ class DownloadsCompleteObserver : public DownloadManager::Observer,
 
   // DownloadManager::Observer
   virtual void ModelChanged() {
-    download_manager_->download_history()->Search(
-        string16(),
-        NewCallback(this,
-                    &DownloadsCompleteObserver::OnSearchDownloadsComplete));
-  }
+    downloads_.clear();
+    download_manager_->SearchDownloads(string16(), &downloads_);
 
-  void OnSearchDownloadsComplete(std::vector<DownloadItem*> downloads) {
-    downloads_ = downloads;
     if (CheckAllDownloadsComplete())
       return;
 
@@ -203,7 +198,6 @@ class DownloadsCompleteObserver : public DownloadManager::Observer,
     }
   }
 
-
  private:
   // The observed download manager.
   DownloadManager* download_manager_;