Refactor FaviconDriver::OnFaviconAvailable()

components/favicon/content/content_favicon_driver.h

Index: components/favicon/content/content_favicon_driver.h
diff --git a/components/favicon/content/content_favicon_driver.h b/components/favicon/content/content_favicon_driver.h
index 1af8bb17115d77cbcfa4c4f218de463988868986..02c00834f77ae84da675cef46c9be95170c3a2c4 100644
--- a/components/favicon/content/content_favicon_driver.h
+++ b/components/favicon/content/content_favicon_driver.h
@@ -43,14 +43,11 @@ class ContentFaviconDriver
 
   // FaviconDriver implementation.
   gfx::Image GetFavicon() const override;
+  GURL GetFaviconURL() const override;
   bool FaviconIsValid() const override;
   int StartDownload(const GURL& url, int max_bitmap_size) override;
   bool IsOffTheRecord() override;
   GURL GetActiveURL() override;
-  void SetActiveFaviconValidity(bool valid) override;
-  GURL GetActiveFaviconURL() override;
-  void SetActiveFaviconURL(const GURL& url) override;
-  void SetActiveFaviconImage(const gfx::Image& image) override;
 
  protected:
   ContentFaviconDriver(content::WebContents* web_contents,
@@ -63,7 +60,12 @@ class ContentFaviconDriver
   friend class content::WebContentsUserData<ContentFaviconDriver>;
 
   // FaviconDriver implementation.
-  void NotifyFaviconUpdated(bool icon_url_changed) override;
+  void OnFaviconUpdated(
+      const GURL& page_url,
+      FaviconDriverObserver::NotificationIconType icon_type,
+      const GURL& icon_url,
+      bool icon_url_changed,
+      const gfx::Image& image) override;
 
   // content::WebContentsObserver implementation.
   void DidUpdateFaviconURL(
@@ -75,9 +77,6 @@ class ContentFaviconDriver
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) override;
 
-  // Returns the active navigation entry's favicon.
-  content::FaviconStatus& GetFaviconStatus();
-
   GURL bypass_cache_page_url_;
   std::vector<content::FaviconURL> favicon_urls_;