Make DownloadHistory observe manager, items

chrome/browser/download/save_page_browsertest.cc

Index: chrome/browser/download/save_page_browsertest.cc
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 92ed9b39dfeeac30cb8f7995808452cd24cff96e..4ad2a31d154f1ffc62371c793374ff67168d6d28 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -125,12 +126,11 @@ class SavePageBrowserTest : public InProcessBrowserTest {
 
   void QueryDownloadHistory() {
     // Query the history system.
-    ChromeDownloadManagerDelegate* delegate =
-      static_cast<ChromeDownloadManagerDelegate*>(
-          GetDownloadManager()->GetDelegate());
-    delegate->download_history()->Load(
-        base::Bind(&SavePageBrowserTest::OnQueryDownloadEntriesComplete,
-                   base::Unretained(this)));
+    HistoryService* hs = HistoryServiceFactory::GetForProfile(
+        browser()->profile(), Profile::EXPLICIT_ACCESS);
+    hs->QueryDownloads(&history_consumer_, base::Bind(
+        &SavePageBrowserTest::OnQueryDownloadEntriesComplete,
+        base::Unretained(this)));
 
     // Run message loop until a quit message is sent from
     // OnQueryDownloadEntriesComplete().
@@ -206,6 +206,7 @@ class SavePageBrowserTest : public InProcessBrowserTest {
   ScopedTempDir save_dir_;
 
  private:
+  CancelableRequestConsumer history_consumer_;
   DISALLOW_COPY_AND_ASSIGN(SavePageBrowserTest);
 };