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

chrome/browser/history/visit_database.cc

 // 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 "chrome/browser/history/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 238 matching lines @@
   statement.BindInt(3, transition);
   statement.BindInt64(4,
       max_results ? max_results : std::numeric_limits<int64>::max());
 
   AddEventToVisitLog(VisitLog::SELECT_VISIT);
   FillVisitVector(statement, visits);
 }
 
 void VisitDatabase::GetVisibleVisitsInRange(base::Time begin_time,
                                             base::Time end_time,
-                                            bool most_recent_visit_only,
                                             int max_count,
                                             VisitVector* visits) {
   visits->clear();
   // The visit_time values can be duplicated in a redirect chain, so we sort
   // by id too, to ensure a consistent ordering just in case.
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT" HISTORY_VISIT_ROW_FIELDS "FROM visits "
       "WHERE visit_time >= ? AND visit_time < ? "
       "AND (transition & ?) != 0 "  // CHAIN_END
       "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
@@ skipping 12 matching lines @@
   statement.BindInt(3, PageTransition::CORE_MASK);
   statement.BindInt(4, PageTransition::AUTO_SUBFRAME);
   statement.BindInt(5, PageTransition::MANUAL_SUBFRAME);
   statement.BindInt(6, PageTransition::KEYWORD_GENERATED);
 
   AddEventToVisitLog(VisitLog::SELECT_VISIT);
   std::set<URLID> found_urls;
   while (statement.Step()) {
     VisitRow visit;
     FillVisitRow(statement, &visit);
-    if (most_recent_visit_only) {
-      // Make sure the URL this visit corresponds to is unique if required.
-      if (found_urls.find(visit.url_id) != found_urls.end())
-        continue;
-      found_urls.insert(visit.url_id);
-    }
+    // Make sure the URL this visit corresponds to is unique.
+    if (found_urls.find(visit.url_id) != found_urls.end())
+      continue;
+    found_urls.insert(visit.url_id);
     visits->push_back(visit);
 
     if (max_count > 0 && static_cast<int>(visits->size()) >= max_count)
       break;
   }
 }
 
 VisitID VisitDatabase::GetMostRecentVisitForURL(URLID url_id,
                                                 VisitRow* visit_row) {
   // The visit_time values can be duplicated in a redirect chain, so we sort
@@ skipping 141 matching lines @@
   AddEventToVisitLog(VisitLog::SELECT_VISIT);
   if (!statement || !statement.Step() || statement.ColumnInt64(0) == 0) {
     *first_visit = base::Time::Now();
     return false;
   }
   *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0));
   return true;
 }
 
 }  // namespace history