Change AndroidHistoryProviderService to use CancelableTaskTracker (5/6)

chrome/browser/android/provider/chrome_browser_provider.cc

Index: chrome/browser/android/provider/chrome_browser_provider.cc
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
index b50528be5b9318ea9aef150a671929406b3e57b5..904acc84602bd31d8d8f8f1139543f7d7f68dea5 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.cc
+++ b/chrome/browser/android/provider/chrome_browser_provider.cc
@@ -817,17 +817,18 @@ class UpdateBookmarksFromAPITask : public HistoryProviderTask {
           const std::vector<base::string16>& selection_args) {
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&AndroidHistoryProviderService::UpdateHistoryAndBookmarks,
-                   base::Unretained(service()), row, selection,
-                   selection_args, cancelable_consumer(),
+                   base::Unretained(service()),
+                   row,
+                   selection,
+                   selection_args,
                    base::Bind(&UpdateBookmarksFromAPITask::OnBookmarksUpdated,
-                              base::Unretained(this))));
+                              base::Unretained(this)),
+                   cancelable_tracker()));
     return result_;
   }
 
  private:
-  void OnBookmarksUpdated(AndroidHistoryProviderService::Handle handle,
-                          bool succeeded,
-                          int updated_row_count) {
+  void OnBookmarksUpdated(int updated_row_count) {
     result_ = updated_row_count;
     RequestCompleted();
   }
@@ -1063,15 +1064,12 @@ class UpdateSearchTermsFromAPITask : public SearchTermTask {
         internal_row,
         selection,
         selection_args,
-        cancelable_consumer(),
         base::Bind(&UpdateSearchTermsFromAPITask::OnSearchTermsUpdated,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        cancelable_tracker());
   }
 
-
-  void OnSearchTermsUpdated(AndroidHistoryProviderService::Handle handle,
-                            bool succeeded,
-                            int updated_row_count) {
+  void OnSearchTermsUpdated(int updated_row_count) {
     result_ = updated_row_count;
     RequestCompleted();
   }