Change AndroidHistoryProviderService to use CancelableTaskTracker (3/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 32 matching lines @@
                     InsertCallback;
   typedef CancelableRequest<InsertCallback> InsertRequest;
 
   typedef base::Callback<void(
                     Handle,                // handle
                     bool,                  // true if the deletion succeeded.
                     int)>                  // the number of row deleted.
                     DeleteCallback;
   typedef CancelableRequest<DeleteCallback> DeleteRequest;
 
-  typedef base::Callback<void(
-                    Handle,                // handle
-                    int)>                  // the new position.
-                    MoveStatementCallback;
-  typedef CancelableRequest<MoveStatementCallback> MoveStatementRequest;
+  // 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.
   //
   // |projections| is the vector of 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.
@@ skipping 41 matching lines @@
   // 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.
-  Handle MoveStatement(history::AndroidStatement* statement,
-                       int current_pos,
-                       int destination,
-                       CancelableRequestConsumerBase* consumer,
-                       const MoveStatementCallback& callback);
+  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,
@@ skipping 37 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_