Refactor FaviconDriver::OnFaviconAvailable()

components/favicon/ios/web_favicon_driver.h

Index: components/favicon/ios/web_favicon_driver.h
diff --git a/components/favicon/ios/web_favicon_driver.h b/components/favicon/ios/web_favicon_driver.h
index 1e17e49e4c3985dbebcffc8e483e874e6840c33d..e40f0f29cfe6b139c0b0fa56e6753d50f2972853 100644
--- a/components/favicon/ios/web_favicon_driver.h
+++ b/components/favicon/ios/web_favicon_driver.h
@@ -31,14 +31,17 @@ class WebFaviconDriver : public web::WebStateObserver,
   // FaviconDriver implementation.
   void FetchFavicon(const GURL& url) override;
   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;
+  void OnFaviconUpdated(
+      const GURL& page_url,
+      FaviconDriverObserver::NotificationIconType notification_icon_type,
+      const GURL& icon_url,
+      bool icon_url_changed,
+      const gfx::Image& image) override;
 
  private:
   friend class web::WebStateUserData<WebFaviconDriver>;
@@ -53,9 +56,6 @@ class WebFaviconDriver : public web::WebStateObserver,
   void FaviconUrlUpdated(
       const std::vector<web::FaviconURL>& candidates) override;
 
-  // Returns the active navigation entry's favicon.
-  web::FaviconStatus& GetFaviconStatus();
-
   // The URL passed to FetchFavicon().
   GURL fetch_favicon_url_;