Update all bookmarks which use an icon URL when a favicon's bitmap is updated

ios/chrome/browser/history/history_client_impl.cc

 // Copyright 2015 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 "ios/chrome/browser/history/history_client_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/history/core/browser/history_service.h"
 #include "ios/chrome/browser/history/history_backend_client_impl.h"
 #include "ios/chrome/browser/history/history_utils.h"
 #include "url/gurl.h"
 
 HistoryClientImpl::HistoryClientImpl(bookmarks::BookmarkModel* bookmark_model)
     : bookmark_model_(bookmark_model), is_bookmark_model_observer_(false) {
 }
 
 HistoryClientImpl::~HistoryClientImpl() {
 }
 
 void HistoryClientImpl::OnHistoryServiceCreated(
     history::HistoryService* history_service) {
   DCHECK(!is_bookmark_model_observer_);
   if (bookmark_model_) {
     on_bookmarks_removed_ =
         base::Bind(&history::HistoryService::URLsNoLongerBookmarked,
                    base::Unretained(history_service));
-    favicon_changed_subscription_ = history_service->AddFaviconChangedCallback(
-        base::Bind(&bookmarks::BookmarkModel::OnFaviconChanged,
-                   base::Unretained(bookmark_model_)));
+    favicons_changed_subscription_ =
+        history_service->AddFaviconsChangedCallback(
+            base::Bind(&bookmarks::BookmarkModel::OnFaviconsChanged,
+                       base::Unretained(bookmark_model_)));
     bookmark_model_->AddObserver(this);
     is_bookmark_model_observer_ = true;
   }
 }
 
 void HistoryClientImpl::Shutdown() {
   // It's possible that bookmarks haven't loaded and history is waiting for
   // bookmarks to complete loading. In such a situation history can't shutdown
   // (meaning if we invoked HistoryService::Cleanup now, we would deadlock). To
   // break the deadlock we tell BookmarkModel it's about to be deleted so that
   // it can release the signal history is waiting on, allowing history to
   // shutdown (HistoryService::Cleanup to complete). In such a scenario history
   // sees an incorrect view of bookmarks, but it's better than a deadlock.
   if (bookmark_model_) {
     if (is_bookmark_model_observer_) {
       is_bookmark_model_observer_ = false;
       bookmark_model_->RemoveObserver(this);
-      favicon_changed_subscription_.reset();
+      favicons_changed_subscription_.reset();
       on_bookmarks_removed_.Reset();
     }
     bookmark_model_->Shutdown();
   }
 }
 
 bool HistoryClientImpl::CanAddURL(const GURL& url) {
   return ios::CanAddURLToHistory(url);
 }
 
@@ skipping 17 matching lines @@
   if (!on_bookmarks_removed_.is_null())
     on_bookmarks_removed_.Run(no_longer_bookmarked);
 }
 
 void HistoryClientImpl::BookmarkAllUserNodesRemoved(
     bookmarks::BookmarkModel* model,
     const std::set<GURL>& removed_urls) {
   if (!on_bookmarks_removed_.is_null())
     on_bookmarks_removed_.Run(removed_urls);
 }