Change AndroidHistoryProviderService to use CancelableTaskTracker (2/6)

chrome/browser/history/history_backend.h

Index: chrome/browser/history/history_backend.h
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 9e24f06c8226ca75f856db89e23731e07486e305..94a3f7d3d9f204def8255f38321aeaa01f905a64 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -284,8 +284,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   void InsertHistoryAndBookmark(scoped_refptr<InsertRequest> request,
                                 const HistoryAndBookmarkRow& row);
 
-  void QueryHistoryAndBookmarks(
-      scoped_refptr<QueryRequest> request,
+  history::AndroidStatement* QueryHistoryAndBookmarks(
       const std::vector<HistoryAndBookmarkRow::ColumnID>& projections,
       const std::string& selection,
       const std::vector<base::string16>& selection_args,
@@ -329,11 +328,11 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
                          const std::string& selection,
                          const std::vector<base::string16> selection_args);
 
-  void QuerySearchTerms(scoped_refptr<QueryRequest> request,
-                        const std::vector<SearchRow::ColumnID>& projections,
-                        const std::string& selection,
-                        const std::vector<base::string16>& selection_args,
-                        const std::string& sort_order);
+  history::AndroidStatement* QuerySearchTerms(

[Miguel Garcia, 2014/07/07 09:51:57]

nit: can you document what the methods you are touching do? I know they were
there before but since you are touching them..

[sdefresne, 2014/07/16 08:07:24]

Done.

+      const std::vector<SearchRow::ColumnID>& projections,
+      const std::string& selection,
+      const std::vector<base::string16>& selection_args,
+      const std::string& sort_order);
 
 #endif  // defined(OS_ANDROID)