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

chrome/browser/sync/glue/bookmark_model_associator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 454 matching lines @@
         return unrecoverable_error_handler_->CreateAndUploadError(
             FROM_HERE,
             "Failed to lookup node.",
             model_type());
       }
 
       const BookmarkNode* child_node = NULL;
       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(
             &sync_child_node, parent_node, bookmark_model_, index);
         if (!child_node) {
           // This can happen if a sync bookmark node doesn't have a valid url.
           // As far as we can tell, it appears this can only happen if something
           // interrupts association. For now, we just ignore the bookmark.
           LOG(ERROR) << "Failed to create bookmark node with title "
                      << sync_child_node.GetTitle() << " and url "
@@ skipping 172 matching lines @@
 
 bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, user_share_);
   const syncer::ModelTypeSet encrypted_types = trans.GetEncryptedTypes();
   return !encrypted_types.Has(syncer::BOOKMARKS) ||
       trans.GetCryptographer()->is_ready();
 }
 
 }  // namespace browser_sync