| Index: chrome/browser/ssl/ssl_blocking_page.h
|
| diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
|
| index f9782cd65c3433ab2474f7a11b8e0e15928666d7..605115854af52bd05e0c62adbebd1dbd44160c1d 100644
|
| --- a/chrome/browser/ssl/ssl_blocking_page.h
|
| +++ b/chrome/browser/ssl/ssl_blocking_page.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #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"
|
| @@ -85,7 +84,10 @@
|
| 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(
|
| @@ -109,7 +111,7 @@
|
| // 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?
|
|
|