Enable history counting for time ranges.

components/history/core/browser/visit_database.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 "components/history/core/browser/visit_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 519 matching lines @@
   }
 
   if (!statement.Succeeded())
     return false;
 
   *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0));
   *count = statement.ColumnInt(1);
   return true;
 }
 
-bool VisitDatabase::GetHistoryCount(int* count) {
+bool VisitDatabase::GetHistoryCount(const base::Time& begin_time,
+                                    const base::Time& end_time,
+                                    int* count) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT COUNT(*) FROM ("
       "SELECT DISTINCT url, "
       // Convert unit of timestamp from the numbers of microseconds since
       // Windows Epoch to the number of seconds from Unix Epoch. Leap seconds
       // are not handled in both timestamp units, so a linear conversion is
       // valid here.
-      "DATE((visit_time - ?) / ?, 'unixepoch', 'localtime') "
+      "DATE((visit_time - ?) / ?, 'unixepoch', 'localtime')"
       "FROM visits "
       "WHERE (transition & ?) != 0 "  // CHAIN_END
-      "AND (transition & ?) NOT IN (?, ?, ?)"  // NO SUBFRAME or
-                                               // KEYWORD_GENERATED
+      "AND (transition & ?) NOT IN (?, ?, ?) "  // NO SUBFRAME or
+                                                // KEYWORD_GENERATED
+      "AND visit_time >= ? AND visit_time < ?"
       ")"));
 
   statement.BindInt64(0, base::Time::kTimeTToMicrosecondsOffset);

[lwchkg, 2015/09/25 04:15:02]

Just to remind that you have proposed to change this constant because this
theoretically wrong.

[msramek, 2015/09/25 10:44:35]

I keep it in mind, but I'll fix this in a separate CL.

   statement.BindInt64(1, base::Time::kMicrosecondsPerSecond);
   statement.BindInt(2, ui::PAGE_TRANSITION_CHAIN_END);
   statement.BindInt(3, ui::PAGE_TRANSITION_CORE_MASK);
   statement.BindInt(4, ui::PAGE_TRANSITION_AUTO_SUBFRAME);
   statement.BindInt(5, ui::PAGE_TRANSITION_MANUAL_SUBFRAME);
   statement.BindInt(6, ui::PAGE_TRANSITION_KEYWORD_GENERATED);
+  statement.BindInt64(7, begin_time.ToInternalValue());
+  statement.BindInt64(8, end_time.ToInternalValue());
 
   if (!statement.Step())
     return false;
 
   *count = statement.ColumnInt(0);
   return true;
 }
 
 bool VisitDatabase::GetStartDate(base::Time* first_visit) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
@@ skipping 52 matching lines @@
     // Old versions don't have the visit_duration column, we modify the table
     // to add that field.
     if (!GetDB().Execute("ALTER TABLE visits "
         "ADD COLUMN visit_duration INTEGER DEFAULT 0 NOT NULL"))
       return false;
   }
   return true;
 }
 
 }  // namespace history