Avoid cyclic dependency FaviconHandler<-->FaviconDriverImpl

components/favicon/ios/web_favicon_driver.mm

 // 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.
 
 #include "components/favicon/ios/web_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/core/favicon_url.h"
 #include "components/favicon/ios/favicon_url_util.h"
 #include "ios/web/public/browser_state.h"
@@ skipping 31 matching lines @@
       web_state()->GetNavigationManager()->GetLastCommittedItem();
   return item ? item->GetFavicon().image : gfx::Image();
 }
 
 bool WebFaviconDriver::FaviconIsValid() const {
   web::NavigationItem* item =
       web_state()->GetNavigationManager()->GetLastCommittedItem();
   return item ? item->GetFavicon().valid : false;
 }
 
-int WebFaviconDriver::StartDownload(const GURL& url, int max_image_size) {
+int WebFaviconDriver::DownloadImage(const GURL& url,
+                                    int max_image_size,
+                                    ImageDownloadCallback callback) {
   if (WasUnableToDownloadFavicon(url)) {
     DVLOG(1) << "Skip Failed FavIcon: " << url;
     return 0;
   }
 
-  return web_state()->DownloadImage(
-      url, true, max_image_size, false,
-      base::Bind(&FaviconDriverImpl::DidDownloadFavicon,
-                 base::Unretained(this)));
+  return web_state()->DownloadImage(url, true, max_image_size, false, callback);
 }
 
 bool WebFaviconDriver::IsOffTheRecord() {
   DCHECK(web_state());
   return web_state()->GetBrowserState()->IsOffTheRecord();
 }
 
 GURL WebFaviconDriver::GetActiveURL() {
   web::NavigationItem* item =
       web_state()->GetNavigationManager()->GetVisibleItem();
@@ skipping 30 matching lines @@
 WebFaviconDriver::~WebFaviconDriver() {
 }
 
 void WebFaviconDriver::FaviconUrlUpdated(
     const std::vector<web::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   OnUpdateFaviconURL(GetActiveURL(), FaviconURLsFromWebFaviconURLs(candidates));
 }
 
 }  // namespace favicon