Kill DownloadManager::SearchDownloads, DownloadItem::MatchesQuery

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 21c0f3c2226703a6d26c8baf73e0ff90e27bc39b..3ad9bd3b68619ff7c7e66d5d1e76e551306a70b9 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -1693,136 +1693,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxLargeTheme) {
   ASSERT_TRUE(extension_service->GetExtensionById(kLargeThemeCrxId, false));
 }
 
-// Sort download items by db_handle.
-static bool DownloadItemSorter(DownloadItem* d1, DownloadItem* d2) {
-  return d1->GetDbHandle() < d2->GetDbHandle();
-}
-
-// Confirm that searching through the history works properly
-IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
-  // Downloads to populate history with.
-  base::Time current(base::Time::Now());
-  DownloadPersistentStoreInfo population_entries[] = {
-    DownloadPersistentStoreInfo(
-        FilePath(FILE_PATH_LITERAL("/path/to/file")),
-        GURL("http://www.google.com/fantasy_download"),
-        GURL(""),
-        current - base::TimeDelta::FromMinutes(5),
-        current,
-        128,
-        128,
-        DownloadItem::COMPLETE,
-        1,
-        false),
-    DownloadPersistentStoreInfo(
-        FilePath(FILE_PATH_LITERAL("/path/to/another_file")),
-        GURL("http://www.google.com/reality_download"),
-        GURL(""),
-        current - base::TimeDelta::FromMinutes(10),
-        current,
-        256,
-        256,
-        DownloadItem::COMPLETE,
-        2,
-        false),
-    DownloadPersistentStoreInfo(
-        FilePath(FILE_PATH_LITERAL("/different_path/to/another_file")),
-        GURL("http://www.izzle.com/not_really_a_download"),
-        GURL(""),
-        current - base::TimeDelta::FromMinutes(15),
-        current,
-        512,
-        512,
-        DownloadItem::COMPLETE,
-        3,
-        true)
-  };
-  std::vector<DownloadPersistentStoreInfo> entries(
-      population_entries, population_entries + arraysize(population_entries));
-
-  // Populate the manager.
-  DownloadManager* manager = DownloadManagerForBrowser(browser());
-  manager->OnPersistentStoreQueryComplete(&entries);
-
-  // Do some searches and check the results.
-  std::vector<DownloadItem*> search_results;
-
-  manager->GetAllDownloads(&search_results);
-  ASSERT_EQ(3u, search_results.size());
-  std::sort(search_results.begin(), search_results.end(),
-            DownloadItemSorter);
-  // We do a full check only once to protect against the data
-  // somehow getting scrambled on its way into the DownloadItems.
-  {
-    DownloadItem* d1 = search_results[0];
-    DownloadItem* d2 = search_results[1];
-    DownloadItem* d3 = search_results[2];
-    EXPECT_EQ(FilePath(FILE_PATH_LITERAL("/path/to/file")), d1->GetFullPath());
-    EXPECT_EQ(GURL("http://www.google.com/fantasy_download"),
-              d1->GetOriginalUrl());
-    EXPECT_EQ(current - base::TimeDelta::FromMinutes(5),
-              d1->GetStartTime());
-    EXPECT_EQ(current, d1->GetEndTime());
-    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")),
-              d2->GetFullPath());
-    EXPECT_EQ(GURL("http://www.google.com/reality_download"),
-              d2->GetOriginalUrl());
-    EXPECT_EQ(current - base::TimeDelta::FromMinutes(10),
-              d2->GetStartTime());
-    EXPECT_EQ(current, d2->GetEndTime());
-    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")),
-              d3->GetFullPath());
-    EXPECT_EQ(GURL("http://www.izzle.com/not_really_a_download"),
-              d3->GetOriginalUrl());
-    EXPECT_EQ(current - base::TimeDelta::FromMinutes(15),
-              d3->GetStartTime());
-    EXPECT_EQ(current, d3->GetEndTime());
-    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();
-
-  string16 search_input;
-  manager->SearchDownloads(UTF8ToUTF16("www.google.com"), &search_results);
-  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();
-}
-
 // Tests for download initiation functions.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));