Change GetVisitCountToHost() to GetVisibleVisitCountToHost(), and restrict it to returning "user-...

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 414 matching lines @@
     statement.BindInt64(0, row.referring_visit);
 
     if (!statement.Step())
       return false;
 
     *from_url = GURL(statement.ColumnString(0));
   }
   return true;
 }
 
-bool VisitDatabase::GetVisitCountToHost(const GURL& url,
-                                        int* count,
-                                        base::Time* first_visit) {
+bool VisitDatabase::GetVisibleVisitCountToHost(const GURL& url,
+                                               int* count,
+                                               base::Time* first_visit) {
   if (!url.SchemeIs(chrome::kHttpScheme) && !url.SchemeIs(chrome::kHttpsScheme))
     return false;
 
   // We need to search for URLs with a matching host/port. One way to query for
   // this is to use the LIKE operator, eg 'url LIKE http://google.com/%'. This
   // is inefficient though in that it doesn't use the index and each entry must
   // be visited. The same query can be executed by using >= and < operator.
   // The query becomes:
   // 'url >= http://google.com/' and url < http://google.com0'.
   // 0 is used as it is one character greater than '/'.
-  GURL search_url(url);
-  const std::string host_query_min = search_url.GetOrigin().spec();
-
+  const std::string host_query_min = url.GetOrigin().spec();
   if (host_query_min.empty())
     return false;
 
-  std::string host_query_max = host_query_min;
-  host_query_max[host_query_max.size() - 1] = '0';
-
+  // We also want to restrict ourselves to main frame navigations that are not
+  // in the middle of redirect chains, hence the transition checks.
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT MIN(v.visit_time), COUNT(*) "
       "FROM visits v INNER JOIN urls u ON v.url = u.id "
-      "WHERE (u.url >= ? AND u.url < ?)"));
+      "WHERE u.url >= ? AND u.url < ? "
+      "AND (transition & ?) != 0 "
+      "AND (transition & ?) NOT IN (?, ?, ?)"));
   if (!statement)
     return false;
 
   statement.BindString(0, host_query_min);
-  statement.BindString(1, host_query_max);
+  statement.BindString(1,
+      host_query_min.substr(0, host_query_min.size() - 1) + '0');
+  statement.BindInt(2, PageTransition::CHAIN_END);
+  statement.BindInt(3, PageTransition::CORE_MASK);
+  statement.BindInt(4, PageTransition::AUTO_SUBFRAME);
+  statement.BindInt(5, PageTransition::MANUAL_SUBFRAME);
+  statement.BindInt(6, PageTransition::KEYWORD_GENERATED);
 
   if (!statement.Step()) {
     // We've never been to this page before.
     *count = 0;
     return true;
   }
 
   *first_visit = base::Time::FromInternalValue(statement.ColumnInt64(0));
   *count = statement.ColumnInt(1);
   return true;
@@ skipping 42 matching lines @@
     // Get the source entries out of the query result.
     while (statement.Step()) {
       std::pair<VisitID, VisitSource> source_entry(statement.ColumnInt64(0),
           static_cast<VisitSource>(statement.ColumnInt(1)));
       sources->insert(source_entry);
     }
   }
 }
 
 }  // namespace history