Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/ssl/ssl_blocking_page.h

 // 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
-#include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "net/ssl/ssl_info.h"
 #include "url/gurl.h"
 
 namespace base {
 class DictionaryValue;
 }
 
@@ skipping 54 matching lines @@
  private:
   void NotifyDenyCertificate();
   void NotifyAllowCertificate();
 
   // These fetch the appropriate HTML page, depending on the
   // SSLInterstitialVersion Finch trial.
   std::string GetHTMLContentsV1();
   std::string GetHTMLContentsV2();
 
   // Used to query the HistoryService to see if the URL is in history. For UMA.
-  void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit);
+  void OnGotHistoryCount(HistoryService::Handle handle,
+                         bool success,
+                         int num_visits,
+                         base::Time first_visit);
 
   // content::NotificationObserver:
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
       const content::NotificationDetails& details) OVERRIDE;
 
   base::Callback<void(bool)> callback_;
 
   content::WebContents* web_contents_;
   int cert_error_;
   const net::SSLInfo ssl_info_;
   GURL request_url_;
   // Could the user successfully override the error?
   bool overridable_;
   // Has the site requested strict enforcement of certificate errors?
   bool strict_enforcement_;
   content::InterstitialPage* interstitial_page_;  // Owns us.
   // Is the hostname for an internal network?
   bool internal_;
   // How many times is this same URL in history?
   int num_visits_;
   // Used for getting num_visits_.
-  base::CancelableTaskTracker request_tracker_;
+  CancelableRequestConsumer request_consumer_;
   // Is captive portal detection enabled?
   bool captive_portal_detection_enabled_;
   // Did the probe complete before the interstitial was closed?
   bool captive_portal_probe_completed_;
   // Did the captive portal probe receive an error or get a non-HTTP response?
   bool captive_portal_no_response_;
   // Was a captive portal detected?
   bool captive_portal_detected_;
 
   // For the FieldTrial: this contains the name of the condition.
   std::string trial_condition_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_