Get rid of a few more interfaces from RenderViewHostDelegate that aren't need...

chrome/browser/fav_icon_helper.cc

 // Copyright (c) 2010 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/fav_icon_helper.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/render_messages.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/favicon_size.h"
 #include "skia/ext/image_operations.h"
 
 FavIconHelper::FavIconHelper(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       got_fav_icon_url_(false),
       got_fav_icon_from_history_(false),
       fav_icon_expired_(false) {
 }
@@ skipping 74 matching lines @@
   // No matter what happens, we need to mark the favicon as being set.
   entry->favicon().set_is_valid(true);
 
   if (image.empty())
     return;
 
   entry->favicon().set_bitmap(image);
   tab_contents_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TAB);
 }
 
-void FavIconHelper::UpdateFavIconURL(RenderViewHost* render_view_host,
-                                     int32 page_id,
-                                     const GURL& icon_url) {
+void FavIconHelper::OnUpdateFavIconURL(int32 page_id, const GURL& icon_url) {
   // TODO(davemoore) Should clear on empty url. Currently we ignore it.
   // This appears to be what FF does as well.
   if (icon_url.is_empty())
     return;
 
   NavigationEntry* entry = GetEntry();
   if (!entry)
     return;
 
   got_fav_icon_url_ = true;
 
   if (!GetFaviconService())
     return;
 
   if (!fav_icon_expired_ && entry->favicon().is_valid() &&
       entry->favicon().url() == icon_url) {
     // We already have the icon, no need to proceed.
     return;
   }
 
   entry->favicon().set_url(icon_url);
 
   if (got_fav_icon_from_history_)
     DownloadFavIconOrAskHistory(entry);
 }
 
-void FavIconHelper::DidDownloadFavIcon(RenderViewHost* render_view_host,
-                                       int id,
-                                       const GURL& image_url,
-                                       bool errored,
-                                       const SkBitmap& image) {
+bool FavIconHelper::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(FavIconHelper, message)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFavIconURL, OnUpdateFavIconURL)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidDownloadFavIcon, OnDidDownloadFavIcon)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void FavIconHelper::OnDidDownloadFavIcon(int id,
+                                         const GURL& image_url,
+                                         bool errored,
+                                         const SkBitmap& image) {
   DownloadRequests::iterator i = download_requests_.find(id);
   if (i == download_requests_.end()) {
     // Currently TabContents notifies us of ANY downloads so that it is
     // possible to get here.
     return;
   }
 
   if (i->second.callback) {
     i->second.callback->Run(id, errored, image);
   } else if (!errored) {
@@ skipping 141 matching lines @@
 }
 
 bool FavIconHelper::ShouldSaveFavicon(const GURL& url) {
   if (!profile()->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }