Eliminate the archived history database and clean up related code.

chrome/browser/history/history_querying_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 365 matching lines @@
 
   // Now query a subset of the pages and limit by N items. "FOO" should match
   // the 2nd & 3rd pages, but we should only get the 3rd one because of the one
   // page max restriction.
   options.max_count = 1;
   QueryHistory("FOO", options, &results);
   EXPECT_EQ(1U, results.size());
   EXPECT_TRUE(NthResultIs(results, 0, 3));
 }
 
-// Tests that text search queries can find URLs when they exist only in the
-// archived database. This also tests that imported URLs can be found, since
-// we use AddPageWithDetails just like the importer.
-TEST_F(HistoryQueryTest, TextSearchArchived) {
-  ASSERT_TRUE(history_.get());
-
-  URLRows urls_to_add;
-
-  URLRow row1(GURL("http://foo.bar/"));
-  row1.set_title(base::UTF8ToUTF16("archived title same"));
-  row1.set_last_visit(Time::Now() - TimeDelta::FromDays(365));
-  urls_to_add.push_back(row1);
-
-  URLRow row2(GURL("http://foo.bar/"));
-  row2.set_title(base::UTF8ToUTF16("nonarchived title same"));
-  row2.set_last_visit(Time::Now());
-  urls_to_add.push_back(row2);
-
-  history_->AddPagesWithDetails(urls_to_add, history::SOURCE_BROWSED);
-
-  QueryOptions options;
-  QueryResults results;
-
-  // Query all time. The title we get should be the one in the archived and
-  // not the most current title (since otherwise highlighting in
-  // the title might be wrong).
-  QueryHistory("archived", options, &results);
-  ASSERT_EQ(1U, results.size());
-  EXPECT_TRUE(row1.url() == results[0].url());
-  EXPECT_TRUE(row1.title() == results[0].title());
-
-  // Check query is ordered correctly when split between archived and
-  // non-archived database.
-  QueryHistory("same", options, &results);
-  ASSERT_EQ(2U, results.size());
-  EXPECT_TRUE(row2.url() == results[0].url());
-  EXPECT_TRUE(row2.title() == results[0].title());
-  EXPECT_TRUE(row1.url() == results[1].url());
-  EXPECT_TRUE(row1.title() == results[1].title());
-}
-
-/* TODO(brettw) re-enable this. It is commented out because the current history
-   code prohibits adding more than one indexed page with the same URL. When we
-   have tiered history, there could be a dupe in the archived history which
-   won't get picked up by the deletor and it can happen again. When this is the
-   case, we should fix this test to duplicate that situation.
-
-// Tests duplicate collapsing and not in text search situations.
-TEST_F(HistoryQueryTest, TextSearchDupes) {
-  ASSERT_TRUE(history_.get());
-
-  QueryOptions options;
-  QueryResults results;
-
-  QueryHistory("Other", options, &results);
-  EXPECT_EQ(1U, results.size());
-  EXPECT_TRUE(NthResultIs(results, 0, 4));
-}
-*/
-
 // Tests IDN text search by both ASCII and UTF.
 TEST_F(HistoryQueryTest, TextSearchIDN) {
   ASSERT_TRUE(history_.get());
 
   QueryOptions options;
   QueryResults results;
 
   TestEntry entry = { "http://xn--d1abbgf6aiiy.xn--p1ai/",  "Nothing", 0, };
   AddEntryToHistory(entry);
 
@@ skipping 23 matching lines @@
 
 TEST_F(HistoryQueryTest, TextSearchPaging) {
   // Since results are fetched 1 and 2 at a time, entry #0 and #6 will not
   // be de-duplicated. Entry #4 does not contain the text "title", so it
   // shouldn't appear.
   int expected_results[] = { 2, 3, 1, 7, 6, 5 };
   TestPaging("title", expected_results, arraysize(expected_results));
 }
 
 }  // namespace history