Change AndroidHistoryProviderService to use CancelableTaskTracker (2/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 415077420ff77e7369458d0c7c62e580a6539e3a..f2be5ac9543077a292414789ae1fbd92900bfbfb 100644
--- a/chrome/browser/history/history_backend_android.cc
+++ b/chrome/browser/history/history_backend_android.cc
@@ -21,21 +21,17 @@ void HistoryBackend::InsertHistoryAndBookmark(
   request->ForwardResult(request->handle(), id != 0, id);
 }
 
-void HistoryBackend::QueryHistoryAndBookmarks(
-    scoped_refptr<QueryRequest> request,
+AndroidStatement* HistoryBackend::QueryHistoryAndBookmarks(
     const std::vector<HistoryAndBookmarkRow::ColumnID>& projections,
     const std::string& selection,
     const std::vector<base::string16>& selection_args,
     const std::string& sort_order) {
-  if (request->canceled())
-    return;
-
   AndroidStatement* statement = NULL;
   if (android_provider_backend_) {
     statement = android_provider_backend_->QueryHistoryAndBookmarks(
         projections, selection, selection_args, sort_order);
   }
-  request->ForwardResult(request->handle(), statement, statement);
+  return statement;
 }
 
 void HistoryBackend::UpdateHistoryAndBookmarks(
@@ -163,21 +159,17 @@ void HistoryBackend::DeleteSearchTerms(
   request->ForwardResult(request->handle(), result, count);
 }
 
-void HistoryBackend::QuerySearchTerms(
-    scoped_refptr<QueryRequest> request,
+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) {
-  if (request->canceled())
-    return;
-
   AndroidStatement* statement = NULL;
-  if (android_provider_backend_)
+  if (android_provider_backend_) {

[Miguel Garcia, 2014/07/07 09:51:57]

why would this not be there? Can we DCHECK(android_provider_backend_); and
remove the if?

[sdefresne, 2014/07/16 08:07:24]

The code already tested for the pointer to be non-NULL (the initialization of
android_provider_backend_ is asynchronous, which may explain why there is a test
and not a DCHECK). I prefer not to change the logic of the code in this CL.

     statement = android_provider_backend_->QuerySearchTerms(projections,
         selection, selection_args, sort_order);
-
-  request->ForwardResult(request->handle(), statement, statement);
+  }
+  return statement;
 }
 
 }  // namespace history