Make DownloadHistory observe manager, items

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index c6ae215c872efe0d82d5e9fb432c342d0822a08f..c17f8c85e8918ce27828873a4b620093a7a813bb 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -1523,42 +1523,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadCancelled) {
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
 
-// Confirm a download makes it into the history properly.
-IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadHistoryCheck) {
-  FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
-  GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
-  FilePath origin_file(OriginFile(file));
-  int64 origin_size;
-  file_util::GetFileSize(origin_file, &origin_size);
-
-  // Download the file and wait.  We do not expect the Select File dialog.
-  DownloadAndWait(browser(), url);
-
-  // Get details of what downloads have just happened.
-  std::vector<DownloadItem*> downloads;
-  GetDownloads(browser(), &downloads);
-  ASSERT_EQ(1u, downloads.size());
-  int64 db_handle = downloads[0]->GetDbHandle();
-
-  // Check state.
-  EXPECT_EQ(1, browser()->tab_count());
-  CheckDownload(browser(), file, file);
-  EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
-
-  // Check history results.
-  DownloadsHistoryDataCollector history_collector(
-      db_handle,
-      DownloadManagerForBrowser(browser()));
-  DownloadPersistentStoreInfo info;
-  EXPECT_TRUE(history_collector.GetDownloadsHistoryEntry(&info)) << db_handle;
-  EXPECT_EQ(file, info.path.BaseName());
-  EXPECT_EQ(url, info.url);
-  // Ignore start_time.
-  EXPECT_EQ(origin_size, info.received_bytes);
-  EXPECT_EQ(origin_size, info.total_bytes);
-  EXPECT_EQ(DownloadItem::COMPLETE, info.state);
-}
-
 // Test for crbug.com/14505. This tests that chrome:// urls are still functional
 // after download of a file while viewing another chrome://.
 IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) {
@@ -1809,9 +1773,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxLargeTheme) {
   ASSERT_TRUE(extension_service->GetExtensionById(kLargeThemeCrxId, false));
 }
 
-// Sort download items by db_handle.
+// Sort download items by id.
 static bool DownloadItemSorter(DownloadItem* d1, DownloadItem* d2) {
-  return d1->GetDbHandle() < d2->GetDbHandle();
+  return d1->GetId() < d2->GetId();
 }
 
 // Confirm that searching through the history works properly
@@ -1882,7 +1846,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
     EXPECT_EQ(128, d1->GetReceivedBytes());
     EXPECT_EQ(128, d1->GetTotalBytes());
     EXPECT_EQ(DownloadItem::COMPLETE, d1->GetState());
-    EXPECT_EQ(1, d1->GetDbHandle());
     EXPECT_FALSE(d1->GetOpened());
 
     EXPECT_EQ(FilePath(FILE_PATH_LITERAL("/path/to/another_file")),
@@ -1895,7 +1858,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
     EXPECT_EQ(256, d2->GetReceivedBytes());
     EXPECT_EQ(256, d2->GetTotalBytes());
     EXPECT_EQ(DownloadItem::COMPLETE, d2->GetState());
-    EXPECT_EQ(2, d2->GetDbHandle());
     EXPECT_FALSE(d2->GetOpened());
 
     EXPECT_EQ(FilePath(FILE_PATH_LITERAL("/different_path/to/another_file")),
@@ -1908,7 +1870,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
     EXPECT_EQ(512, d3->GetReceivedBytes());
     EXPECT_EQ(512, d3->GetTotalBytes());
     EXPECT_EQ(DownloadItem::COMPLETE, d3->GetState());
-    EXPECT_EQ(3, d3->GetDbHandle());
     EXPECT_TRUE(d3->GetOpened());
   }
   search_results.clear();
@@ -1918,24 +1879,18 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
   ASSERT_EQ(2u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
-  EXPECT_EQ(1, search_results[0]->GetDbHandle());
-  EXPECT_EQ(2, search_results[1]->GetDbHandle());
   search_results.clear();
 
   manager->SearchDownloads(UTF8ToUTF16("real"), &search_results);
   ASSERT_EQ(2u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
-  EXPECT_EQ(2, search_results[0]->GetDbHandle());
-  EXPECT_EQ(3, search_results[1]->GetDbHandle());
   search_results.clear();
 
   manager->SearchDownloads(UTF8ToUTF16("another_file"), &search_results);
   ASSERT_EQ(2u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
-  EXPECT_EQ(2, search_results[0]->GetDbHandle());
-  EXPECT_EQ(3, search_results[1]->GetDbHandle());
   search_results.clear();
 }