bookmarks: Get rid of the dependency on history_notifications.h

chrome/browser/history/android/android_provider_backend.h

Index: chrome/browser/history/android/android_provider_backend.h
diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h
index 7cc864467f9606aa818ab948643334e91c3a653b..1991a607c90d564fbe8ea4ceb43ab1782503a214 100644
--- a/chrome/browser/history/android/android_provider_backend.h
+++ b/chrome/browser/history/android/android_provider_backend.h
@@ -22,6 +22,10 @@
 
 class BookmarkService;
 
+namespace chrome {
+struct FaviconChangedDetails;
+}
+
 namespace history {
 
 class AndroidProviderBackend;
@@ -153,6 +157,7 @@ class AndroidProviderBackend {
     HistoryDetails* detail;
   };
   typedef std::vector<HistoryNotification> HistoryNotifications;
+  typedef std::vector<chrome::FaviconChangedDetails*> FaviconNotifications;
 
   // The scoped transaction for AndroidProviderBackend.
   //
@@ -199,19 +204,22 @@ class AndroidProviderBackend {
   // |selection| is the SQL WHERE clause without 'WHERE'.
   // |selection_args| is the arguments for the WHERE clause.
   bool UpdateHistoryAndBookmarks(const HistoryAndBookmarkRow& row,
-                       const std::string& selection,
-                       const std::vector<string16>& selection_args,
-                       int* update_count,
-                       HistoryNotifications* notifications);
+                                 const std::string& selection,
+                                 const std::vector<string16>& selection_args,
+                                 int* update_count,
+                                 HistoryNotifications* notifications,
+                                 FaviconNotifications* favicon_notifications);
 
   // Inserts the given values and returns the URLID of the inserted row.
   // The notifications are returned in |notifications| and the ownership of them
   // is transfered to caller.
   // The EnsureInitializedAndUpdated() will not be invoked if the
   // |ensure_initialized_and_updated| is false.
-  AndroidURLID InsertHistoryAndBookmark(const HistoryAndBookmarkRow& values,
-                                        HistoryNotifications* notifications,
-                                        bool ensure_initialized_and_updated);
+  AndroidURLID InsertHistoryAndBookmark(
+      const HistoryAndBookmarkRow& values,
+      HistoryNotifications* notifications,
+      FaviconNotifications* favicon_notifications,
+      bool ensure_initialized_and_updated);

[sky, 2013/05/20 14:48:13]

out params should be last.

 
   // Deletes the specified rows and returns the number of the deleted rows in
   // |deleted_count|.
@@ -235,7 +243,8 @@ class AndroidProviderBackend {
   bool DeleteHistory(const std::string& selection,
                      const std::vector<string16>& selection_args,
                      int* deleted_count,
-                     HistoryNotifications* notifications);
+                     HistoryNotifications* notifications,
+                     FaviconNotifications* favicon_notifications);
 
   // Initializes and updates tables if necessary.
   bool EnsureInitializedAndUpdated();
@@ -310,6 +319,9 @@ class AndroidProviderBackend {
                              bool delete_bookmarks,
                              HistoryNotifications* notifications);
 
+  void SendFaviconChangedNotifications(
+      const FaviconNotifications& favicon_notifications);
+
   void BroadcastNotifications(const HistoryNotifications& notifications);
 
   // Add the search term from the given |values|. It will add the values.url()