Remove NOTIFICATION_FAVICON_UPDATED

chrome/browser/favicon/favicon_tab_helper.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/favicon/favicon_tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 250 matching lines @@
 }
 
 void FaviconTabHelper::SetActiveFaviconImage(const gfx::Image& image) {
   GetFaviconStatus().image = image;
 }
 
 void FaviconTabHelper::OnFaviconAvailable(const gfx::Image& image,
                                           const GURL& icon_url,
                                           bool is_active_favicon) {
   if (is_active_favicon) {
+    bool icon_url_changed = GetActiveFaviconURL() != icon_url;
     // No matter what happens, we need to mark the favicon as being set.
     SetActiveFaviconValidity(true);
-    bool icon_url_changed = GetActiveFaviconURL() != icon_url;
     SetActiveFaviconURL(icon_url);
 
     if (image.IsEmpty())
       return;
 
     SetActiveFaviconImage(image);
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_FAVICON_UPDATED,
-        content::Source<WebContents>(web_contents()),
-        content::Details<bool>(&icon_url_changed));
-    web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
+    NotifyFaviconUpdated(icon_url_changed);
   }
   if (!image.IsEmpty()) {
     FOR_EACH_OBSERVER(favicon::FaviconDriverObserver, observer_list_,
                       OnFaviconAvailable(image));
   }
 }
 
+void FaviconTabHelper::NotifyFaviconUpdated(bool icon_url_changed) {
+  FOR_EACH_OBSERVER(favicon::FaviconDriverObserver, observer_list_,
+                    OnFaviconUpdated(this, icon_url_changed));
+  web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
+}
+
 void FaviconTabHelper::DidDownloadFavicon(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
   if (bitmaps.empty() && http_status_code == 404) {
     DVLOG(1) << "Failed to Download Favicon:" << image_url;
     if (favicon_service_)
       favicon_service_->UnableToDownloadFavicon(image_url);
@@ skipping 56 matching lines @@
   DCHECK(!candidates.empty());
   favicon_urls_ = candidates;
   std::vector<favicon::FaviconURL> favicon_urls =
       favicon::FaviconURLsFromContentFaviconURLs(candidates);
   favicon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (large_icon_handler_.get())
     large_icon_handler_->OnUpdateFaviconURL(favicon_urls);
 }