Avoid cyclic dependency FaviconHandler<-->FaviconDriverImpl

components/favicon/ios/web_favicon_driver.h

 // Copyright 2015 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_IOS_WEB_FAVICON_DRIVER_H_
 #define COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_
 
 #include "base/macros.h"
 #include "components/favicon/core/favicon_driver_impl.h"
 #import "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
@@ skipping 15 matching lines @@
  public:
   static void CreateForWebState(web::WebState* web_state,
                                 FaviconService* favicon_service,
                                 history::HistoryService* history_service,
                                 bookmarks::BookmarkModel* bookmark_model);
 
   // FaviconDriver implementation.
   void FetchFavicon(const GURL& url) override;
   gfx::Image GetFavicon() const override;
   bool FaviconIsValid() const override;
-  int StartDownload(const GURL& url, int max_bitmap_size) override;
+  GURL GetActiveURL() override;
+
+  // FaviconHandler::Delegate implementation.
+  int DownloadImage(const GURL& url,
+                    int max_image_size,
+                    ImageDownloadCallback callback) override;

[pkotwicz, 2017/02/22 02:37:54]

Nit: Can you please reorder the functions in the .cc file to match the .h file

[mastiz, 2017/02/23 21:55:54]

Done.

   bool IsOffTheRecord() override;
-  GURL GetActiveURL() 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>;
 
@@ skipping 12 matching lines @@
 
   // Image Fetcher used to fetch favicon.
   image_fetcher::IOSImageDataFetcherWrapper image_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFaviconDriver);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_