Change AndroidHistoryProviderService to use CancelableTaskTracker (4/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 e04336538154c5cfa882fb857f1d551dac9d246b..f0c82d97fbea3a5e11748617efb3e8f32a228409 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -25,6 +25,10 @@
 #include "components/history/core/browser/keyword_id.h"
 #include "sql/init_status.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/history/android/android_history_types.h"
+#endif
+
 class TestingProfile;
 class TypedUrlSyncableService;
 struct ThumbnailScore;
@@ -281,8 +285,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // Android Provider ---------------------------------------------------------
 
   // History and bookmarks ----------------------------------------------------
-  void InsertHistoryAndBookmark(scoped_refptr<InsertRequest> request,
-                                const HistoryAndBookmarkRow& row);
+  AndroidURLID InsertHistoryAndBookmark(const HistoryAndBookmarkRow& row);

[Miguel Garcia, 2014/07/07 09:54:49]

please document both methods

[sdefresne, 2014/07/16 11:51:08]

Done.

 
   history::AndroidStatement* QueryHistoryAndBookmarks(
       const std::vector<HistoryAndBookmarkRow::ColumnID>& projections,
@@ -315,8 +318,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   void CloseStatement(AndroidStatement* statement);
 
   // Search terms -------------------------------------------------------------
-  void InsertSearchTerm(scoped_refptr<InsertRequest> request,
-                        const SearchRow& row);
+  SearchTermID InsertSearchTerm(const SearchRow& row);
 
   void UpdateSearchTerms(scoped_refptr<UpdateRequest> request,
                          const SearchRow& row,