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) {
-  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)));
-}
-
-bool ContentFaviconDriver::IsOffTheRecord() {
-  DCHECK(web_contents());
-  return web_contents()->GetBrowserContext()->IsOffTheRecord();
-}
-
 GURL ContentFaviconDriver::GetActiveURL() {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   return entry ? entry->GetURL() : GURL();
 }
 
 ContentFaviconDriver::ContentFaviconDriver(
     content::WebContents* web_contents,
     FaviconService* favicon_service,
     history::HistoryService* history_service,
     bookmarks::BookmarkModel* bookmark_model)
     : content::WebContentsObserver(web_contents),
       FaviconDriverImpl(favicon_service, history_service, bookmark_model) {
 }
 
 ContentFaviconDriver::~ContentFaviconDriver() {
 }
 
+int ContentFaviconDriver::DownloadImage(const GURL& url,
+                                        int max_image_size,
+                                        ImageDownloadCallback callback) {
+  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,
+                                       callback);
+}
+
+bool ContentFaviconDriver::IsOffTheRecord() {
+  DCHECK(web_contents());
+  return web_contents()->GetBrowserContext()->IsOffTheRecord();
+}
+
 void ContentFaviconDriver::OnFaviconUpdated(
     const GURL& page_url,
     FaviconDriverObserver::NotificationIconType notification_icon_type,
     const GURL& icon_url,
     bool icon_url_changed,
     const gfx::Image& image) {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   DCHECK(entry && entry->GetURL() == page_url);
 
@@ skipping 58 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