[Sync::USS] Add missing favicon code to Bookmarks USS implementation
Favicon code has been removed intentionally to make earlier patches
simpler and focused on the core skeleton of the processor.
This CLs fills in the missing pieces when handling remote updates
and processing local changes by adjusting the favicon code.
Bug: 516866
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I955f011c687b3165956510a0245363bcea8d34ec
Reviewed-on: https://chromium-review.googlesource.com/1052767
Commit-Queue: Mohamed Amir Yosef <[email protected]>
Reviewed-by: Mikel Astiz <[email protected]>
Cr-Commit-Position: refs/heads/master@{#582578}diff --git a/components/sync_bookmarks/bookmark_model_merger.h b/components/sync_bookmarks/bookmark_model_merger.h
index 580c44a..322e3fc 100644
--- a/components/sync_bookmarks/bookmark_model_merger.h
+++ b/components/sync_bookmarks/bookmark_model_merger.h
@@ -16,6 +16,10 @@
class BookmarkNode;
} // namespace bookmarks
+namespace favicon {
+class FaviconService;
+} // namespace favicon
+
namespace sync_bookmarks {
class SyncedBookmarkTracker;
@@ -27,10 +31,11 @@
// used by the BookmarkModelTypeProcessor().
class BookmarkModelMerger {
public:
- // |updates|, |bookmark_model| and |bookmark_tracker| must not be null and
- // must outlive this object.
+ // |updates|, |bookmark_model|, |favicon_service| and |bookmark_tracker| must
+ // not be null and must outlive this object.
BookmarkModelMerger(const syncer::UpdateResponseDataList* updates,
bookmarks::BookmarkModel* bookmark_model,
+ favicon::FaviconService* favicon_service,
SyncedBookmarkTracker* bookmark_tracker);
~BookmarkModelMerger();
@@ -71,6 +76,7 @@
const syncer::UpdateResponseDataList* const updates_;
bookmarks::BookmarkModel* const bookmark_model_;
+ favicon::FaviconService* const favicon_service_;
SyncedBookmarkTracker* const bookmark_tracker_;
// Stores the tree of |updates_| as a map from a remote node to a
// vector of remote children. It's constructed in the c'tor.
