Change AndroidHistoryProviderService to use CancelableTaskTracker (3/6)

chrome/browser/history/android/android_history_provider_service_unittest.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/history/android/android_history_provider_service.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 116 matching lines @@
   }
 
   void OnDeleted(AndroidHistoryProviderService::Handle handle,
                  bool success,
                  int count) {
     success_ = success;
     count_ = count;
     base::MessageLoop::current()->Quit();
   }
 
-  void OnStatementMoved(AndroidHistoryProviderService::Handle handle,
-                        int cursor_position) {
+  void OnStatementMoved(int cursor_position) {
     cursor_position_ = cursor_position;
     base::MessageLoop::current()->Quit();
   }
 
  private:
   friend class base::RefCountedThreadSafe<CallbackHelper>;
   ~CallbackHelper() {
   }
 
   bool success_;
@@ skipping 28 matching lines @@
       std::vector<base::string16>(),
       std::string(),
       Bind(&CallbackHelper::OnQueryResult, callback.get()),
       &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   ASSERT_TRUE(callback->success());
 
   // Move the cursor to the begining and verify whether we could get
   // the same result.
   AndroidStatement* statement = callback->statement();
-  service_->MoveStatement(statement, 0, -1, &cancelable_consumer_,
-      Bind(&CallbackHelper::OnStatementMoved, callback.get()));
+  service_->MoveStatement(
+      statement,
+      0,
+      -1,
+      Bind(&CallbackHelper::OnStatementMoved, callback.get()),
+      &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_EQ(-1, callback->cursor_position());
   EXPECT_TRUE(callback->statement()->statement()->Step());
   EXPECT_FALSE(callback->statement()->statement()->Step());
   service_->CloseStatement(statement);
 
   // Update the row.
   HistoryAndBookmarkRow update_row;
   update_row.set_visit_count(3);
   service_->UpdateHistoryAndBookmarks(update_row, std::string(),
@@ skipping 38 matching lines @@
       std::vector<base::string16>(),
       std::string(),
       Bind(&CallbackHelper::OnQueryResult, callback.get()),
       &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   ASSERT_TRUE(callback->success());
 
   // Move the cursor to the begining and verify whether we could get
   // the same result.
   AndroidStatement* statement = callback->statement();
-  service_->MoveStatement(statement, 0, -1, &cancelable_consumer_,
-      Bind(&CallbackHelper::OnStatementMoved, callback.get()));
+  service_->MoveStatement(
+      statement,
+      0,
+      -1,
+      Bind(&CallbackHelper::OnStatementMoved, callback.get()),
+      &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_EQ(-1, callback->cursor_position());
   EXPECT_TRUE(callback->statement()->statement()->Step());
   EXPECT_FALSE(callback->statement()->statement()->Step());
   service_->CloseStatement(statement);
 
   // Update the row.
   SearchRow update_row;
   update_row.set_search_time(Time::Now());
   service_->UpdateSearchTerms(update_row, std::string(),
       std::vector<base::string16>(), &cancelable_consumer_,
       Bind(&CallbackHelper::OnUpdated, callback.get()));
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 
   // Delete the row.
   service_->DeleteSearchTerms(std::string(), std::vector<base::string16>(),
       &cancelable_consumer_, Bind(&CallbackHelper::OnDeleted, callback.get()));
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace