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

chrome/browser/history/history.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 312 matching lines @@
 
   // Schedules a query to get the most recent redirects ending at the given
   // URL.
   Handle QueryRedirectsTo(const GURL& to_url,
                           CancelableRequestConsumerBase* consumer,
                           QueryRedirectsCallback* callback);
 
   typedef Callback4<Handle,
                     bool,        // Were we able to determine the # of visits?
                     int,         // Number of visits.
-                    base::Time>::Type  // Time of first visit. Only first bool
+                    base::Time>::Type  // Time of first visit. Only set if bool
                                        // is true and int is > 0.
-      GetVisitCountToHostCallback;
+      GetVisibleVisitCountToHostCallback;
 
-  // Requests the number of visits to all urls on the scheme/host/post
-  // identified by url. This is only valid for http and https urls.
-  Handle GetVisitCountToHost(const GURL& url,
-                             CancelableRequestConsumerBase* consumer,
-                             GetVisitCountToHostCallback* callback);
+  // Requests the number of user-visible visits (i.e. no redirects or subframes)
+  // to all urls on the same scheme/host/port as |url|.  This is only valid for
+  // HTTP and HTTPS URLs.
+  Handle GetVisibleVisitCountToHost(
+      const GURL& url,
+      CancelableRequestConsumerBase* consumer,
+      GetVisibleVisitCountToHostCallback* callback);
 
   // Called when QueryTopURLsAndRedirects completes. The vector contains a list
   // of the top |result_count| URLs.  For each of these URLs, there is an entry
   // in the map containing redirects from the URL.  For example, if we have the
   // redirect chain A -> B -> C and A is a top visited URL, then A will be in
   // the vector and "A => {B -> C}" will be in the map.
   typedef Callback4<Handle,
                     bool,  // Did we get the top urls and redirects?
                     std::vector<GURL>*,  // List of top URLs.
                     history::RedirectMap*>::Type  // Redirects for top URLs.
@@ skipping 515 matching lines @@
   BookmarkService* bookmark_service_;
   bool no_db_;
 
   // True if needs top site migration.
   bool needs_top_sites_migration_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_