Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/ui/website_settings/website_settings.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 "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 132 matching lines @@
       site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),
       cert_store_(cert_store),
       content_settings_(profile->GetHostContentSettingsMap()) {
   Init(profile, url, ssl);
 
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
         site_url_,
+        &visit_count_request_consumer_,
         base::Bind(&WebsiteSettings::OnGotVisitCountToHost,
-                   base::Unretained(this)),
-        &visit_count_task_tracker_);
+                   base::Unretained(this)));
   }
 
   PresentSitePermissions();
   PresentSiteData();
   PresentSiteIdentity();
   PresentHistoryInfo(base::Time());
 
   // Every time the Website Settings UI is opened a |WebsiteSettings| object is
   // created. So this counts how ofter the Website Settings UI is opened.
   content::RecordAction(base::UserMetricsAction("WebsiteSettings_Opened"));
@@ skipping 96 matching lines @@
   show_info_bar_ = true;
 
 // TODO(markusheintz): This is a temporary hack to fix issue:
 // http://crbug.com/144203.
 #if defined(OS_MACOSX)
   // Refresh the UI to reflect the new setting.
   PresentSitePermissions();
 #endif
 }
 
-void WebsiteSettings::OnGotVisitCountToHost(bool found_visits,
+void WebsiteSettings::OnGotVisitCountToHost(HistoryService::Handle handle,
+                                            bool found_visits,
                                             int visit_count,
                                             base::Time first_visit) {
   if (!found_visits) {
     // This indicates an error, such as the page's URL scheme wasn't
     // http/https.
     first_visit = base::Time();
   } else if (visit_count == 0) {
     first_visit = base::Time::Now();
   }
   PresentHistoryInfo(first_visit);
@@ skipping 401 matching lines @@
   if (visited_before_today) {
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
   }
   ui_->SetFirstVisit(first_visit_text);
 }