Removes usage of NavigationEntry from favicon_handler.*

chrome/browser/favicon/favicon_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_
 
 #include <deque>
 #include <map>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "url/gurl.h"
 
 class FaviconClient;
 class FaviconDriver;
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
 }
 
-namespace content {
-class NavigationEntry;
-}
 
 // FaviconHandler works with FaviconTabHelper to fetch the specific type of
 // favicon.
 //
 // FetchFavicon requests the favicon from the favicon service which in turn
 // requests the favicon from the history database. At this point
 // we only know the URL of the page, and not necessarily the url of the
 // favicon. To ensure we handle reloading stale favicons as well as
 // reloading a favicon on page reload we always request the favicon from
 // history regardless of whether the NavigationEntry has a favicon.
@@ skipping 72 matching lines @@
 
   // For testing.
   const std::vector<content::FaviconURL>& image_urls() const {
     return image_urls_;
   }
 
  protected:
   // 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);
 
   // Ask the favicon from history
   virtual void UpdateFaviconMappingAndFetch(
       const GURL& page_url,
       const GURL& icon_url,
       favicon_base::IconType icon_type,
       const FaviconService::FaviconResultsCallback& callback,
@@ skipping 89 matching lines @@
 
   // Sets the image data for the favicon.
   void SetFavicon(const GURL& url,
                   const GURL& icon_url,
                   const gfx::Image& image,
                   favicon_base::IconType icon_type);
 
   // 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.
   content::FaviconURL* current_candidate() {
     return (!image_urls_.empty()) ? &image_urls_.front() : NULL;
   }
 
   // Returns the preferred size of the image. 0 means no preference (any size
   // will do).
   int preferred_icon_size() const {
@@ skipping 47 matching lines @@
   // Best image we've seen so far.  As images are downloaded from the page they
   // are stored here. When there is an exact match, or no more images are
   // available the favicon service and the NavigationEntry are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_