Change AndroidHistoryProviderService to use CancelableTaskTracker (5/6)

chrome/browser/history/history_backend_android.cc

Index: chrome/browser/history/history_backend_android.cc
diff --git a/chrome/browser/history/history_backend_android.cc b/chrome/browser/history/history_backend_android.cc
index 83776ec145a2552559a5cca70119d3c42b5d1fcd..e27b8dc80298d800c472639f238bb4621581c3e5 100644
--- a/chrome/browser/history/history_backend_android.cc
+++ b/chrome/browser/history/history_backend_android.cc
@@ -29,22 +29,16 @@ AndroidStatement* HistoryBackend::QueryHistoryAndBookmarks(
   return statement;
 }
 
-void HistoryBackend::UpdateHistoryAndBookmarks(
-    scoped_refptr<UpdateRequest> request,
+int HistoryBackend::UpdateHistoryAndBookmarks(
     const HistoryAndBookmarkRow& row,
     const std::string& selection,
     const std::vector<base::string16>& selection_args) {
-  if (request->canceled())
-    return;
-
   int count = 0;
-  bool result = false;
   if (android_provider_backend_) {
-    result = android_provider_backend_->UpdateHistoryAndBookmarks(row,
-        selection, selection_args, &count);
+    android_provider_backend_->UpdateHistoryAndBookmarks(
+        row, selection, selection_args, &count);
   }
-
-  request->ForwardResult(request->handle(), result, count);
+  return count;
 }
 
 void HistoryBackend::DeleteHistoryAndBookmarks(
@@ -113,21 +107,16 @@ SearchTermID HistoryBackend::InsertSearchTerm(const SearchRow& row) {
   return id;
 }
 
-void HistoryBackend::UpdateSearchTerms(
-    scoped_refptr<UpdateRequest> request,
+int HistoryBackend::UpdateSearchTerms(
     const SearchRow& row,
     const std::string& selection,
     const std::vector<base::string16> selection_args) {
-  if (request->canceled())
-    return;
-
   int count = 0;
-  bool result = false;
   if (android_provider_backend_) {
-    result =  android_provider_backend_->UpdateSearchTerms(row, selection,
-        selection_args, &count);
+    android_provider_backend_->UpdateSearchTerms(
+        row, selection, selection_args, &count);
   }
-  request->ForwardResult(request->handle(), result, count);
+  return count;
 }
 
 void HistoryBackend::DeleteSearchTerms(