Change AndroidHistoryProviderService to use CancelableTaskTracker (2/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"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "sql/statement.h"
 
 class Profile;
 
 // This class provides the methods to communicate with history backend service
 // for the Android content provider.
 // The methods of this class must run on the UI thread to cooperate with the
 // BookmarkModel task posted in the DB thread.
 class AndroidHistoryProviderService : public CancelableRequestProvider {
  public:
   explicit AndroidHistoryProviderService(Profile* profile);
   virtual ~AndroidHistoryProviderService();
 
   // The callback definitions ------------------------------------------------
-  typedef base::Callback<void(
-                    Handle,                // handle
-                    bool,                  // true if the query succeeded.
-                    history::AndroidStatement*)>  // the result of query
-                    QueryCallback;
-  typedef CancelableRequest<QueryCallback> QueryRequest;
+
+  // Callback invoked when a method creating an |AndroidStatement| object is
+  // 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
@@ skipping 17 matching lines @@
 
   // 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.
-  Handle QueryHistoryAndBookmarks(
+  base::CancelableTaskTracker::TaskId QueryHistoryAndBookmarks(
       const std::vector<history::HistoryAndBookmarkRow::ColumnID>& projections,
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
       const std::string& sort_order,
-      CancelableRequestConsumerBase* consumer,
-      const QueryCallback& callback);
+      const QueryCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
   // Runs the given update and the number of the row updated is returned to the
   // |callback| on success.
   //
   // |row| is the value to update.
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   Handle UpdateHistoryAndBookmarks(
       const history::HistoryAndBookmarkRow& row,
       const std::string& selection,
@@ skipping 64 matching lines @@
   // 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);
 
-  // Returns the result of the given query from the |callback|.
+  // 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.
-  Handle QuerySearchTerms(
+  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,
-      CancelableRequestConsumerBase* consumer,
-      const QueryCallback& callback);
+      const QueryCallback& callback,
+      base::CancelableTaskTracker* tracker);
 
  private:
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_ANDROID_ANDROID_HISTORY_PROVIDER_SERVICE_H_