Avoid cyclic dependency FaviconHandler<-->FaviconDriverImpl

components/favicon/content/content_favicon_driver.cc

 // 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/content/content_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
@@ skipping 70 matching lines @@
   if (entry)
     return entry->GetFavicon().valid;
 
   entry = controller.GetLastCommittedEntry();
   if (entry)
     return entry->GetFavicon().valid;
 
   return false;
 }
 
-int ContentFaviconDriver::StartDownload(const GURL& url, int max_image_size) {
+int ContentFaviconDriver::DownloadImage(const GURL& url,
+                                        int max_image_size,
+                                        ImageDownloadCallback callback) {

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

Nit: Reorder this function to match order in .h file

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

Done. This however makes the diff and blame layer harder to digest.

   if (WasUnableToDownloadFavicon(url)) {
     DVLOG(1) << "Skip Failed FavIcon: " << url;
     return 0;
   }
 
   bool bypass_cache = (bypass_cache_page_url_ == GetActiveURL());
   bypass_cache_page_url_ = GURL();
 
-  return web_contents()->DownloadImage(
-      url, true, max_image_size, bypass_cache,
-      base::Bind(&FaviconDriverImpl::DidDownloadFavicon,
-                 base::Unretained(this)));
+  return web_contents()->DownloadImage(url, true, max_image_size, bypass_cache,
+                                       callback);
 }
 
 bool ContentFaviconDriver::IsOffTheRecord() {
   DCHECK(web_contents());
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
 
 GURL ContentFaviconDriver::GetActiveURL() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
@@ skipping 83 matching lines @@
   // redownloaded.
   GURL url = navigation_handle->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
 }  // namespace favicon