Change AndroidHistoryProviderService to use CancelableTaskTracker (6/6)

chrome/browser/history/history_backend_android.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/history_backend.h"
 
 #include "chrome/browser/history/android/android_provider_backend.h"
 
 namespace history {
 
@@ skipping 23 matching lines @@
     const std::string& selection,
     const std::vector<base::string16>& selection_args) {
   int count = 0;
   if (android_provider_backend_) {
     android_provider_backend_->UpdateHistoryAndBookmarks(
         row, selection, selection_args, &count);
   }
   return count;
 }
 
-void HistoryBackend::DeleteHistoryAndBookmarks(
-    scoped_refptr<DeleteRequest> request,
+int HistoryBackend::DeleteHistoryAndBookmarks(
     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_->DeleteHistoryAndBookmarks(selection,
-        selection_args, &count);
-
-  request->ForwardResult(request->handle(), result, count);
+  if (android_provider_backend_) {
+    android_provider_backend_->DeleteHistoryAndBookmarks(
+        selection, selection_args, &count);
+  }
+  return count;
 }
 
-void HistoryBackend::DeleteHistory(
-    scoped_refptr<DeleteRequest> request,
+int HistoryBackend::DeleteHistory(
     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_->DeleteHistory(selection, selection_args,
-                                                      &count);
+    android_provider_backend_->DeleteHistory(selection, selection_args, &count);
   }
-  request->ForwardResult(request->handle(), result, count);
+  return count;
 }
 
 // Statement -------------------------------------------------------------------
 
 int HistoryBackend::MoveStatement(history::AndroidStatement* statement,
                                   int current_pos,
                                   int destination) {
   DCHECK_LE(-1, current_pos);
   DCHECK_LE(-1, destination);
 
@@ skipping 28 matching lines @@
     const std::string& selection,
     const std::vector<base::string16> selection_args) {
   int count = 0;
   if (android_provider_backend_) {
     android_provider_backend_->UpdateSearchTerms(
         row, selection, selection_args, &count);
   }
   return count;
 }
 
-void HistoryBackend::DeleteSearchTerms(
-    scoped_refptr<DeleteRequest> request,
+int HistoryBackend::DeleteSearchTerms(
     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_->DeleteSearchTerms(selection,
-        selection_args, &count);
+    android_provider_backend_->DeleteSearchTerms(
+        selection, selection_args, &count);
   }
-
-  request->ForwardResult(request->handle(), result, count);
+  return count;
 }
 
 AndroidStatement* HistoryBackend::QuerySearchTerms(
     const std::vector<SearchRow::ColumnID>& projections,
     const std::string& selection,
     const std::vector<base::string16>& selection_args,
     const std::string& sort_order) {
   AndroidStatement* statement = NULL;
   if (android_provider_backend_) {
     statement = android_provider_backend_->QuerySearchTerms(projections,
         selection, selection_args, sort_order);
   }
   return statement;
 }
 
 }  // namespace history