Eliminate QueryOptions::most_recent_visit_only. All non-unittest consumers o...

chrome/browser/history/history_querying_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/history/history.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 130 matching lines @@
 
   DISALLOW_EVIL_CONSTRUCTORS(HistoryQueryTest);
 };
 
 TEST_F(HistoryQueryTest, Basic) {
   ASSERT_TRUE(history_.get());
 
   QueryOptions options;
   QueryResults results;
 
-  // First query for all of them to make sure they are there and in
-  // chronological order, most recent first.
+  // Test duplicate collapsing.
   QueryHistory(std::wstring(), options, &results);
-  ASSERT_EQ(5U, results.size());
+  EXPECT_EQ(4U, results.size());
   EXPECT_TRUE(NthResultIs(results, 0, 4));
   EXPECT_TRUE(NthResultIs(results, 1, 2));
   EXPECT_TRUE(NthResultIs(results, 2, 3));
   EXPECT_TRUE(NthResultIs(results, 3, 1));
-  EXPECT_TRUE(NthResultIs(results, 4, 0));
 
   // Next query a time range. The beginning should be inclusive, the ending
   // should be exclusive.
   options.begin_time = test_entries[3].time;
   options.end_time = test_entries[2].time;
   QueryHistory(std::wstring(), options, &results);
   EXPECT_EQ(1U, results.size());
   EXPECT_TRUE(NthResultIs(results, 0, 3));
 }
 
 // Tests max_count feature for basic (non-Full Text Search) queries.
 TEST_F(HistoryQueryTest, BasicCount) {
   ASSERT_TRUE(history_.get());
 
   QueryOptions options;
   QueryResults results;
 
   // Query all time but with a limit on the number of entries. We should
   // get the N most recent entries.
   options.max_count = 2;
   QueryHistory(std::wstring(), options, &results);
   EXPECT_EQ(2U, results.size());
   EXPECT_TRUE(NthResultIs(results, 0, 4));
   EXPECT_TRUE(NthResultIs(results, 1, 2));
 }
 
-// Tests duplicate collapsing and not in non-Full Text Search situations.
-TEST_F(HistoryQueryTest, BasicDupes) {
-  ASSERT_TRUE(history_.get());
-
-  QueryOptions options;
-  QueryResults results;
-
-  // We did the query for no collapsing in the "Basic" test above, so here we
-  // only test collapsing.
-  options.most_recent_visit_only = true;
-  QueryHistory(std::wstring(), options, &results);
-  EXPECT_EQ(4U, results.size());
-  EXPECT_TRUE(NthResultIs(results, 0, 4));
-  EXPECT_TRUE(NthResultIs(results, 1, 2));
-  EXPECT_TRUE(NthResultIs(results, 2, 3));
-  EXPECT_TRUE(NthResultIs(results, 3, 1));
-}
-
 TEST_F(HistoryQueryTest, ReachedBeginning) {
   ASSERT_TRUE(history_.get());
 
   QueryOptions options;
   QueryResults results;
 
   QueryHistory(std::wstring(), options, &results);
   EXPECT_TRUE(results.reached_beginning());
 
   options.begin_time = test_entries[1].time;
@@ skipping 137 matching lines @@
    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 Full Text Search situations.
 TEST_F(HistoryQueryTest, FTSDupes) {
   ASSERT_TRUE(history_.get());
 
   QueryOptions options;
   QueryResults results;
 
-  // First do the search with collapsing.
-  QueryHistory(std::wstring(L"Other"), options, &results);
-  EXPECT_EQ(2, results.urls().size());
-  EXPECT_TRUE(NthResultIs(results, 0, 4));
-  EXPECT_TRUE(NthResultIs(results, 1, 0));
-
-  // Now with collapsing.
-  options.most_recent_visit_only = true;
   QueryHistory(std::wstring(L"Other"), options, &results);
   EXPECT_EQ(1, results.urls().size());
   EXPECT_TRUE(NthResultIs(results, 0, 4));
 }
 */
 
 }  // namespace history