Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / history / history_querying_unittest.cc

diff --git a/src/chrome/browser/history/history_querying_unittest.cc b/src/chrome/browser/history/history_querying_unittest.cc
index 9f274ac..893bd68 100644 (file)
--- a/src/chrome/browser/history/history_querying_unittest.cc
+++ b/src/chrome/browser/history/history_querying_unittest.cc
@@ -8,8 +8,10 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/history_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -78,10 +80,11 @@ class HistoryQueryTest : public testing::Test {
   void QueryHistory(const std::string& text_query,
                     const QueryOptions& options,
                     QueryResults* results) {
-    history_->QueryHistory(
-        base::UTF8ToUTF16(text_query), options, &consumer_,
-        base::Bind(&HistoryQueryTest::QueryHistoryComplete,
-                   base::Unretained(this)));
+    history_->QueryHistory(base::UTF8ToUTF16(text_query),
+                           options,
+                           base::Bind(&HistoryQueryTest::QueryHistoryComplete,
+                                      base::Unretained(this)),
+                           &tracker_);
     // Will go until ...Complete calls Quit.
     base::MessageLoop::current()->Run();
     results->Swap(&last_query_results_);
@@ -186,7 +189,7 @@ class HistoryQueryTest : public testing::Test {
     }
   }
 
-  void QueryHistoryComplete(HistoryService::Handle, QueryResults* results) {
+  void QueryHistoryComplete(QueryResults* results) {
     results->Swap(&last_query_results_);
     base::MessageLoop::current()->Quit();  // Will return out to QueryHistory.
   }
@@ -197,7 +200,7 @@ class HistoryQueryTest : public testing::Test {
 
   base::FilePath history_dir_;
 
-  CancelableRequestConsumer consumer_;
+  base::CancelableTaskTracker tracker_;
 
   // The QueryHistoryComplete callback will put the results here so QueryHistory
   // can return them.