Change AndroidHistoryProviderService to use CancelableTaskTracker (6/6)

chrome/browser/history/history_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 293 matching lines @@
   // Returns the number of row updated by the update query.
   //
   // |row| is the value to update.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   int UpdateHistoryAndBookmarks(
       const HistoryAndBookmarkRow& row,
       const std::string& selection,
       const std::vector<base::string16>& selection_args);
 
-  void DeleteHistoryAndBookmarks(
-      scoped_refptr<DeleteRequest> request,
+  // Deletes the specified rows and returns the number of rows deleted.
+  //
+  // |selection| is the SQL WHERE clause without 'WHERE'.
+  // |selection_args| is the arguments for the WHERE clause.
+  //
+  // If |selection| is empty all history and bookmarks are deleted.
+  int DeleteHistoryAndBookmarks(
       const std::string& selection,
       const std::vector<base::string16>& selection_args);
 
-  void DeleteHistory(scoped_refptr<DeleteRequest> request,
-                     const std::string& selection,
-                     const std::vector<base::string16>& selection_args);
+  // Deletes the matched history and returns the number of rows deleted.
+  int DeleteHistory(const std::string& selection,
+                    const std::vector<base::string16>& selection_args);
 
   // Statement ----------------------------------------------------------------
   // Move the statement's current position.
   int MoveStatement(history::AndroidStatement* statement,
                     int current_pos,
                     int destination);
 
   // Close the given statement. The ownership is transfered.
   void CloseStatement(AndroidStatement* statement);
 
   // Search terms -------------------------------------------------------------
   // Inserts the given values and returns the SearchTermID of the inserted row.
   SearchTermID InsertSearchTerm(const SearchRow& row);
 
   // Returns the number of row updated by the update query.
   //
   // |row| is the value to update.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   int UpdateSearchTerms(const SearchRow& row,
                         const std::string& selection,
                         const std::vector<base::string16> selection_args);
 
-  void DeleteSearchTerms(scoped_refptr<DeleteRequest> request,
-                         const std::string& selection,
-                         const std::vector<base::string16> selection_args);
+  // Deletes the matched rows and returns the number of deleted rows.
+  //
+  // |selection| is the SQL WHERE clause without 'WHERE'.
+  // |selection_args| is the arguments for WHERE clause.
+  //
+  // If |selection| is empty all search terms will be deleted.
+  int DeleteSearchTerms(const std::string& selection,
+                        const std::vector<base::string16> selection_args);
 
   // Returns the result of the given query.
   //
   // |projections| specifies the result columns.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for WHERE clause.
   // |sort_order| is the SQL ORDER clause.
   history::AndroidStatement* QuerySearchTerms(
       const std::vector<SearchRow::ColumnID>& projections,
       const std::string& selection,
@@ skipping 518 matching lines @@
 
   // Listens for the system being under memory pressure.
   scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryBackend);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_BACKEND_H_