Removes usage of NavigationEntry from favicon_handler.*

components/favicon/core/favicon_driver.h

Index: components/favicon/core/favicon_driver.h
diff --git a/components/favicon/core/favicon_driver.h b/components/favicon/core/favicon_driver.h
index 937ace877d616c2a2a3d90f41f4c79ef06c551e6..46f17462ee471fd2e0e612dceaae966b21f74809 100644
--- a/components/favicon/core/favicon_driver.h
+++ b/components/favicon/core/favicon_driver.h
@@ -7,9 +7,8 @@
 
 class GURL;
 
-namespace content {
-// TODO(jif): Abstract the NavigationEntry (crbug.com/359598).
-class NavigationEntry;
+namespace gfx {
+class Image;
 }
 
 // Interface that allows Favicon core code to interact with its driver (i.e.,
@@ -17,9 +16,6 @@ class NavigationEntry;
 // implementation must be provided by the driver.
 class FaviconDriver {
  public:
-  // Returns the current NavigationEntry.
-  // TODO(jif): Abstract the NavigationEntry (crbug.com/359598).
-  virtual content::NavigationEntry* GetActiveEntry() = 0;
 
   // Starts the download for the given favicon. When finished, the driver
   // will call OnDidDownloadFavicon() with the results.
@@ -38,6 +34,33 @@ class FaviconDriver {
 
   // Returns whether the user is operating in an off-the-record context.
   virtual bool IsOffTheRecord() = 0;
+
+  // Returns the bitmap of the current page's favicon. Requires GetActiveURL()
+  // to be valid.
+  virtual const gfx::Image GetActiveFaviconImage() = 0;
+
+  // Returns the URL of the current page's favicon. Requires GetActiveURL() to
+  // be valid.
+  virtual const GURL GetActiveFaviconURL() = 0;
+
+  // Returns whether we've got the current page's favicon, or just using the

[blundell, 2014/05/12 07:52:19]

Update this comment to match the comment at line 61.

[jif, 2014/05/12 18:07:41]

Done.

+  // default favicon. Requires GetActiveURL() to be valid.
+  virtual bool GetActiveFaviconValidity() = 0;
+
+  // Returns the URL of the current page, if any. Returns an invalid
+  // URL otherwise.
+  virtual const GURL GetActiveURL() = 0;
+
+  // Sets the bitmap of the current page's favicon. Requires GetActiveURL() to
+  // be valid.
+  virtual void SetActiveFaviconImage(gfx::Image image) = 0;
+
+  // Sets the URL of the favicon's bitmap. Requires GetActiveURL() to be valid.
+  virtual void SetActiveFaviconURL(GURL url) = 0;
+
+  // Sets whether the page's favicon is valid (if false, the default favicon is
+  // being used). Requires GetActiveURL() to be valid.
+  virtual void SetActiveFaviconValidity(bool validity) = 0;
 };
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_H_