Change AndroidHistoryProviderService to use CancelableTaskTracker (6/6)

chrome/browser/history/android/android_history_provider_service.h

Index: chrome/browser/history/android/android_history_provider_service.h
diff --git a/chrome/browser/history/android/android_history_provider_service.h b/chrome/browser/history/android/android_history_provider_service.h
index 56949eef8c7294b68a7ccfc5c2cb23e50cc33366..8f66c0e3a807f82d0670c4d3ef23602605496156 100644
--- a/chrome/browser/history/android/android_history_provider_service.h
+++ b/chrome/browser/history/android/android_history_provider_service.h
@@ -37,12 +37,9 @@ class AndroidHistoryProviderService : public CancelableRequestProvider {
   // 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
@@ -85,12 +82,12 @@ class AndroidHistoryProviderService : public CancelableRequestProvider {
   // |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.
@@ -100,11 +97,12 @@ class AndroidHistoryProviderService : public CancelableRequestProvider {
       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
@@ -148,11 +146,12 @@ class AndroidHistoryProviderService : public CancelableRequestProvider {
   // |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.
   //