Change AndroidHistoryProviderService to use CancelableTaskTracker (4/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,
+AndroidURLID HistoryBackend::InsertHistoryAndBookmark(
     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);
+  return id;
 }
 
 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) {
   AndroidStatement* statement = NULL;
   if (android_provider_backend_) {
     statement = android_provider_backend_->QueryHistoryAndBookmarks(
@@ skipping 72 matching lines @@
 
   return cur;
 }
 
 void HistoryBackend::CloseStatement(AndroidStatement* statement) {
   delete statement;
 }
 
 // Search Term -----------------------------------------------------------------
 
-void HistoryBackend::InsertSearchTerm(scoped_refptr<InsertRequest> request,
-                                      const SearchRow& row) {
-  if (request->canceled())
-    return;
-
+SearchTermID HistoryBackend::InsertSearchTerm(const SearchRow& row) {
   SearchTermID id = 0;
   if (android_provider_backend_)
     id = android_provider_backend_->InsertSearchTerm(row);
-
-  request->ForwardResult(request->handle(), id != 0, id);
+  return id;
 }
 
 void HistoryBackend::UpdateSearchTerms(
     scoped_refptr<UpdateRequest> request,
     const SearchRow& row,
     const std::string& selection,
     const std::vector<base::string16> selection_args) {
   if (request->canceled())
     return;
 
@@ skipping 30 matching lines @@
     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