Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / history_ui.h

diff --git a/src/chrome/browser/ui/webui/history_ui.h b/src/chrome/browser/ui/webui/history_ui.h
index bb3d147..98b807d 100644 (file)
--- a/src/chrome/browser/ui/webui/history_ui.h
+++ b/src/chrome/browser/ui/webui/history_ui.h
@@ -12,7 +12,6 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
-#include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/web_history_service.h"
 #include "content/public/browser/notification_registrar.h"
@@ -144,7 +143,6 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler,
   // Callback from the history system when a history query has completed.
   void QueryComplete(const base::string16& search_text,
                      const history::QueryOptions& options,
-                     HistoryService::Handle request_handle,
                      history::QueryResults* results);
 
   // Callback from the WebHistoryService when a query has completed.
@@ -174,8 +172,8 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler,
 
   content::NotificationRegistrar registrar_;
 
-  // Consumer for search requests to the history service.
-  CancelableRequestConsumerT<int, 0> history_request_consumer_;
+  // Tracker for search requests to the history service.
+  base::CancelableTaskTracker query_task_tracker_;
 
   // The currently-executing request for synced history results.
   // Deleting the request will cancel it.