Removes usage of NavigationEntry from favicon_handler.*

components/favicon/core/favicon_driver.h

 // Copyright 2014 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 COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_H_
 
 class GURL;
 
+namespace gfx {
+class Image;
+}
+
 namespace content {
 // TODO(jif): Abstract the NavigationEntry (crbug.com/359598).
 class NavigationEntry;
 }
 
 // Interface that allows Favicon core code to interact with its driver (i.e.,
 // obtain information from it and give information to it). A concrete
 // implementation must be provided by the driver.
 class FaviconDriver {
  public:
@@ skipping 11 matching lines @@
   // is the only result. A |max_bitmap_size| of 0 means unlimited.
   virtual int StartDownload(const GURL& url, int max_bitmap_size) = 0;
 
   // Notifies the driver that the favicon for the active entry was updated.
   // |icon_url_changed| is true if a favicon with a different icon URL has
   // been selected since the previous call to NotifyFaviconUpdated().
   virtual void NotifyFaviconUpdated(bool icon_url_changed) = 0;
 
   // Returns whether the user is operating in an off-the-record context.
   virtual bool IsOffTheRecord() = 0;
+
+  virtual const GURL GetActiveURL() = 0;
+
+  virtual const GURL GetActiveFaviconURL() = 0;
+
+  virtual bool GetActiveFaviconValidity() = 0;
+
+  virtual void SetActiveFaviconValidity(bool validity) = 0;
+
+  virtual void SetActiveFaviconImage(gfx::Image image) = 0;
+
+  virtual void SetActiveFaviconURL(GURL url) = 0;
 };
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_H_