Change AndroidHistoryProviderService to use CancelableTaskTracker (6/6)

chrome/browser/history/android/android_history_provider_service.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_ANDROID_ANDROID_HISTORY_PROVIDER_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_PROVIDER_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 19 matching lines @@
   typedef base::Callback<void(history::AndroidStatement*)> QueryCallback;
 
   // Callback invoked when a method updating rows in the database complete.
   // The parameter is the number of rows updated or 0 if the update failed.
   typedef base::Callback<void(int)> UpdateCallback;
 
   // Callback invoked when a method inserting rows in the database complete.
   // The value is the new row id or 0 if the insertion failed.
   typedef base::Callback<void(int64)> InsertCallback;
 
-  typedef base::Callback<void(
-                    Handle,                // handle
-                    bool,                  // true if the deletion succeeded.
-                    int)>                  // the number of row deleted.
-                    DeleteCallback;
-  typedef CancelableRequest<DeleteCallback> DeleteRequest;
+  // Callback invoked when a method deleting rows in the database complete.
+  // The value is the number of rows deleted or 0 if the deletion failed.
+  typedef base::Callback<void(int)> DeleteCallback;
 
   // Callback invoked when a method moving an |AndroidStatement| is complete.
   // The value passed to the callback is the new position, or in case of
   // failure, the old position.
   typedef base::Callback<void(int)> MoveStatementCallback;
 
   // History and Bookmarks ----------------------------------------------------
   //
   // Runs the given query on history backend, and invokes the |callback| to
   // return the result.
@@ skipping 22 matching lines @@
       const std::vector<base::string16>& selection_args,
       const UpdateCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Deletes the specified rows and invokes the |callback| to return the number
   // of row deleted on success.
   //
   // |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.
-  Handle DeleteHistoryAndBookmarks(
+  // If |selection| is empty all history and bookmarks are deleted.
+  base::CancelableTaskTracker::TaskId DeleteHistoryAndBookmarks(
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
-      CancelableRequestConsumerBase* consumer,
-      const DeleteCallback& callback);
+      const DeleteCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   // Inserts the given values into history backend, and invokes the |callback|
   // to return the result.
   base::CancelableTaskTracker::TaskId InsertHistoryAndBookmark(
       const history::HistoryAndBookmarkRow& values,
       const InsertCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Deletes the matched history and invokes |callback| to return the number of
-  // the row deleted from the |callback|.
-  Handle DeleteHistory(const std::string& selection,
-                       const std::vector<base::string16>& selection_args,
-                       CancelableRequestConsumerBase* consumer,
-                       const DeleteCallback& callback);
+  // rows deleted.
+  base::CancelableTaskTracker::TaskId DeleteHistory(
+      const std::string& selection,
+      const std::vector<base::string16>& selection_args,
+      const DeleteCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   // Statement ----------------------------------------------------------------
   // Moves the statement's current row from |current_pos| to |destination| in DB
   // thread. The new position is returned to the callback. The result supplied
   // the callback is constrained by the number of rows might.
   base::CancelableTaskTracker::TaskId MoveStatement(
       history::AndroidStatement* statement,
       int current_pos,
       int destination,
       const MoveStatementCallback& callback,
@@ skipping 23 matching lines @@
       const std::vector<base::string16>& selection_args,
       const UpdateCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Deletes the matched rows and the number of deleted rows is returned to
   // the |callback| on success.
   //
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for WHERE clause.
   //
-  // if |selection| is empty all search be deleted.
-  Handle DeleteSearchTerms(const std::string& selection,
-                           const std::vector<base::string16>& selection_args,
-                           CancelableRequestConsumerBase* consumer,
-                           const DeleteCallback& callback);
+  // If |selection| is empty all search terms will be deleted.
+  base::CancelableTaskTracker::TaskId DeleteSearchTerms(
+      const std::string& selection,
+      const std::vector<base::string16>& selection_args,
+      const DeleteCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   // Runs the query and invokes the |callback| to return the result.
   //
   // |projections| specifies the result columns, can not be empty, otherwise
   // NULL is returned.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for WHERE clause.
   // |sort_order| the SQL ORDER clause.
   base::CancelableTaskTracker::TaskId QuerySearchTerms(
       const std::vector<history::SearchRow::ColumnID>& projections,
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
       const std::string& sort_order,
       const QueryCallback& callback,
       base::CancelableTaskTracker* tracker);
 
  private:
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_PROVIDER_SERVICE_H_