[Sync] Overwrite the local favicon with sync's favicon at association time

chrome/browser/sync/glue/bookmark_model_associator.cc

Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 5040400514da0d72a23753249fefd43b83d39315..db0caf36a1df101da016be492aa7d5b146a2fa99 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -472,12 +472,9 @@ syncer::SyncError BookmarkModelAssociator::BuildAssociations() {
       child_node = node_finder.FindBookmarkNode(sync_child_node);
       if (child_node) {
         bookmark_model_->Move(child_node, parent_node, index);
-        // Set the favicon for bookmark node from sync node or vice versa.
-        if (BookmarkChangeProcessor::SetBookmarkFavicon(
-            &sync_child_node, child_node, bookmark_model_)) {
-          BookmarkChangeProcessor::SetSyncNodeFavicon(
-              child_node, bookmark_model_, &sync_child_node);
-        }
+        // Set the favicon for bookmark node from the sync node.
+        BookmarkChangeProcessor::SetBookmarkFavicon(
+            &sync_child_node, child_node, bookmark_model_);
       } else {
         // Create a new bookmark node for the sync node.
         child_node = BookmarkChangeProcessor::CreateBookmarkNode(