Change AndroidHistoryProviderService to use CancelableTaskTracker (6/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 104 matching lines @@
     statement_ = statement;
     base::MessageLoop::current()->Quit();
   }
 
   void OnUpdated(int count) {
     success_ = count != 0;
     count_ = count;
     base::MessageLoop::current()->Quit();
   }
 
-  void OnDeleted(AndroidHistoryProviderService::Handle handle,
-                 bool success,
-                 int count) {
-    success_ = success;
+  void OnDeleted(int count) {
+    success_ = count != 0;
     count_ = count;
     base::MessageLoop::current()->Quit();
   }
 
   void OnStatementMoved(int cursor_position) {
     cursor_position_ = cursor_position;
     base::MessageLoop::current()->Quit();
   }
 
  private:
@@ skipping 61 matching lines @@
       update_row,
       std::string(),
       std::vector<base::string16>(),
       Bind(&CallbackHelper::OnUpdated, callback.get()),
       &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 
   // Delete the row.
-  service_->DeleteHistoryAndBookmarks(std::string(),
+  service_->DeleteHistoryAndBookmarks(
+      std::string(),
       std::vector<base::string16>(),
-      &cancelable_consumer_, Bind(&CallbackHelper::OnDeleted, callback.get()));
+      Bind(&CallbackHelper::OnDeleted, callback.get()),
+      &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 TEST_F(AndroidHistoryProviderServiceTest, TestSearchTerm) {
   SearchRow search_row;
   search_row.set_search_term(base::UTF8ToUTF16("google"));
   search_row.set_url(GURL("http://google.com"));
   search_row.set_keyword_id(1);
@@ skipping 44 matching lines @@
   service_->UpdateSearchTerms(update_row,
                               std::string(),
                               std::vector<base::string16>(),
                               Bind(&CallbackHelper::OnUpdated, callback.get()),
                               &cancelable_tracker_);
   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()));
+  service_->DeleteSearchTerms(std::string(),
+                              std::vector<base::string16>(),
+                              Bind(&CallbackHelper::OnDeleted, callback.get()),
+                              &cancelable_tracker_);
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace