Removes usage of NavigationEntry from favicon_handler.*

chrome/browser/favicon/favicon_handler.h

Index: chrome/browser/favicon/favicon_handler.h
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 6cb9d5913a8ea1ae610873071b76f1c0e43d0db0..47f3cc0e221aa2ff6f595f0c69418af7bf572ea3 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -28,9 +28,6 @@ namespace base {
 class RefCountedMemory;
 }
 
-namespace content {
-class NavigationEntry;
-}
 
 // FaviconHandler works with FaviconTabHelper to fetch the specific type of
 // favicon.
@@ -123,9 +120,9 @@ class FaviconHandler {
   // These virtual methods make FaviconHandler testable and are overridden by
   // TestFaviconHandler.
 
-  // 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.
-  virtual content::NavigationEntry* GetEntry();
+  //
+  //
+  bool NavigationEntryConcernsFavicon();
 
   // Asks the render to download favicon, returns the request id.
   virtual int DownloadFavicon(const GURL& image_url, int max_bitmap_size);
@@ -235,11 +232,9 @@ class FaviconHandler {
   // Sets the favicon's data on the NavigationEntry.
   // If the WebContents has a delegate, it is invalidated (INVALIDATE_TYPE_TAB).
   void SetFaviconOnNavigationEntry(
-      content::NavigationEntry* entry,
       const std::vector<favicon_base::FaviconBitmapResult>&
           favicon_bitmap_results);
-  void SetFaviconOnNavigationEntry(content::NavigationEntry* entry,
-                                   const GURL& icon_url,
+  void SetFaviconOnNavigationEntry(const GURL& icon_url,
                                    const gfx::Image& image);
 
   // Return the current candidate if any.