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

chrome/browser/fav_icon_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAV_ICON_HELPER_H__
 #define CHROME_BROWSER_FAV_ICON_HELPER_H__
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/favicon_service.h"
-#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/tab_contents/web_navigation_observer.h"
 #include "chrome/common/ref_counted_util.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
 class Profile;
 class RefCountedMemory;
 class SkBitmap;
 class TabContents;
 
 // FavIconHelper is used to fetch the favicon for TabContents.
@@ skipping 31 matching lines @@
 //   between page to favicon url. The callback for this is OnFavIconData.
 //
 // OnFavIconData either updates the favicon of the NavigationEntry (if the
 // db knew about the favicon), or requests the renderer to download the
 // favicon.
 //
 // When the renderer downloads the favicon SetFavIconImageData is invoked,
 // at which point we update the favicon of the NavigationEntry and notify
 // the database to save the favicon.
 
-class FavIconHelper : public RenderViewHostDelegate::FavIcon {
+class FavIconHelper : public WebNavigationObserver {
  public:
   explicit FavIconHelper(TabContents* tab_contents);
   virtual ~FavIconHelper();
 
   // Initiates loading the favicon for the specified url.
   void FetchFavIcon(const GURL& url);
 
   // Initiates loading an image from given |image_url|. Returns a download id
   // for caller to track the request. When download completes, |callback| is
   // called with the three params: the download_id, a boolean flag to indicate
@@ skipping 13 matching lines @@
                     ImageDownloadCallback* callback)
         : url(url),
           image_url(image_url),
           callback(callback) { }
 
     GURL url;
     GURL image_url;
     ImageDownloadCallback* callback;
   };
 
-  // RenderViewHostDelegate::Favicon implementation.
-  virtual void DidDownloadFavIcon(RenderViewHost* render_view_host,
-                                  int id,
-                                  const GURL& image_url,
-                                  bool errored,
-                                  const SkBitmap& image);
-  virtual void UpdateFavIconURL(RenderViewHost* render_view_host,
-                                int32 page_id,
-                                const GURL& icon_url);
+  // WebNavigationObserver implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message);
+
+  void OnDidDownloadFavIcon(int id,
+                            const GURL& image_url,
+                            bool errored,
+                            const SkBitmap& image);
+  void OnUpdateFavIconURL(int32 page_id, const GURL& icon_url);
 
   // Return the NavigationEntry for the active entry, or NULL if the active
   // entries URL does not match that of the URL last passed to FetchFavIcon.
   NavigationEntry* GetEntry();
 
   Profile* profile();
 
   FaviconService* GetFaviconService();
 
   // See description above class for details.
@@ skipping 62 matching lines @@
   bool fav_icon_expired_;
 
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(FavIconHelper);
 };
 
 #endif  // CHROME_BROWSER_FAV_ICON_HELPER_H__