Sync the bookmark's icon URL

chrome/browser/bookmarks/bookmark_model.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/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 126 matching lines @@
 void BookmarkNode::Initialize(int64 id) {
   id_ = id;
   type_ = url_.is_empty() ? FOLDER : URL;
   date_added_ = Time::Now();
   favicon_state_ = INVALID_FAVICON;
   favicon_load_handle_ = 0;
   meta_info_str_.clear();
 }
 
 void BookmarkNode::InvalidateFavicon() {
+  icon_url_ = GURL();
   favicon_ = gfx::Image();
   favicon_state_ = INVALID_FAVICON;
 }
 
 namespace {
 
 // Comparator used when sorting bookmarks. Folders are sorted first, then
 // bookmarks.
 class SortComparator : public std::binary_function<const BookmarkNode*,
                                                    const BookmarkNode*,
@@ skipping 730 matching lines @@
     const history::FaviconImageResult& image_result) {
   BookmarkNode* node =
       load_consumer_.GetClientData(
           FaviconServiceFactory::GetForProfile(
               profile_, Profile::EXPLICIT_ACCESS), handle);
   DCHECK(node);
   node->set_favicon_load_handle(0);
   node->set_favicon_state(BookmarkNode::LOADED_FAVICON);
   if (!image_result.image.IsEmpty()) {
     node->set_favicon(image_result.image);
+    node->set_icon_url(image_result.icon_url);
     FaviconLoaded(node);
   }
 }
 
 void BookmarkModel::LoadFavicon(BookmarkNode* node) {
   if (node->is_folder())
     return;
 
   DCHECK(node->url().is_valid());
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
@@ skipping 70 matching lines @@
   BookmarkPermanentNode* bb_node =
       CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkPermanentNode* other_node =
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
                                  new BookmarkIndex(profile_),
                                  next_node_id_);
 }