Change AndroidHistoryProviderService to use CancelableTaskTracker (2/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 {
 
 void HistoryBackend::InsertHistoryAndBookmark(
     scoped_refptr<InsertRequest> request,
     const HistoryAndBookmarkRow& row) {
   if (request->canceled())
     return;
 
   AndroidURLID id = 0;
   if (android_provider_backend_)
     id = android_provider_backend_->InsertHistoryAndBookmark(row);
 
   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(
     scoped_refptr<UpdateRequest> request,
     const HistoryAndBookmarkRow& row,
     const std::string& selection,
     const std::vector<base::string16>& selection_args) {
   if (request->canceled())
     return;
 
@@ skipping 107 matching lines @@
   int count = 0;
   bool result = false;
   if (android_provider_backend_) {
     result = android_provider_backend_->DeleteSearchTerms(selection,
         selection_args, &count);
   }
 
   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