Change AndroidHistoryProviderService to use CancelableTaskTracker (4/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 18 matching lines @@
   // complete. The pointer is NULL if the creation failed.
   typedef base::Callback<void(history::AndroidStatement*)> QueryCallback;
 
   typedef base::Callback<void(
                     Handle,                // handle
                     bool,                  // true if the update succeeded.
                     int)>                  // the number of row updated.
                     UpdateCallback;
   typedef CancelableRequest<UpdateCallback> UpdateRequest;
 
-  typedef base::Callback<void(
-                    Handle,                // handle
-                    bool,                  // true if the insert succeeded.
-                    int64)>                // the id of inserted row.
-                    InsertCallback;
-  typedef CancelableRequest<InsertCallback> InsertRequest;
+  // 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 moving an |AndroidStatement| is complete.
   // The value passed to the callback is the new position, or in case of
@@ skipping 38 matching lines @@
   //
   // if |selection| is empty all history and bookmarks are deleted.
   Handle DeleteHistoryAndBookmarks(
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
       CancelableRequestConsumerBase* consumer,
       const DeleteCallback& callback);
 
   // Inserts the given values into history backend, and invokes the |callback|
   // to return the result.
-  Handle InsertHistoryAndBookmark(const history::HistoryAndBookmarkRow& values,
-                                  CancelableRequestConsumerBase* consumer,
-                                  const InsertCallback& callback);
+  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);
 
   // 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,
       base::CancelableTaskTracker* tracker);
 
   // Closes the statement in db thread. The AndroidHistoryProviderService takes
   // the ownership of |statement|.
   void CloseStatement(history::AndroidStatement* statement);
 
   // Search term --------------------------------------------------------------
   // Inserts the given values and returns the SearchTermID of the inserted row
-  // from the |callback| on success.
-  Handle InsertSearchTerm(const history::SearchRow& row,
-                          CancelableRequestConsumerBase* consumer,
-                          const InsertCallback& callback);
+  // to the |callback| on success.
+  base::CancelableTaskTracker::TaskId InsertSearchTerm(
+      const history::SearchRow& row,
+      const InsertCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
-  // Runs the given update and returns the number of the update rows from the
+  // Runs the given update and returns the number of the update rows to the
   // |callback| on success.
   //
   // |row| is the value need to update.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for WHERE clause.
   Handle UpdateSearchTerms(const history::SearchRow& row,
                            const std::string& selection,
                            const std::vector<base::string16>& selection_args,
                            CancelableRequestConsumerBase* consumer,
                            const UpdateCallback& callback);
 
-  // Deletes the matched rows and the number of deleted rows is returned from
+  // 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);
 
   // Runs the query and invokes the |callback| to return the result.
@@ skipping 11 matching lines @@
       const QueryCallback& callback,
       base::CancelableTaskTracker* tracker);
 
  private:
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_PROVIDER_SERVICE_H_