Avoid cyclic dependency FaviconHandler<-->FaviconDriverImpl

components/favicon/core/favicon_driver_impl.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_CORE_FAVICON_DRIVER_IMPL_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/favicon/core/favicon_driver.h"
+#include "components/favicon/core/favicon_handler.h"
 
 class GURL;
-class SkBitmap;
-
 namespace bookmarks {
 class BookmarkModel;
 }
 
-namespace gfx {
-class Size;
-}
 
 namespace history {
 class HistoryService;
 }
 
 namespace favicon {
 
-class FaviconHandler;
 class FaviconService;
 struct FaviconURL;
 
 // FaviconDriverImpl is a partial implementation of FaviconDriver that allow
 // sharing implementation between different embedder.
 //
 // FaviconDriverImpl works with FaviconHandlers to fetch the favicons. It
 // fetches the given page's icons, requesting them from history backend. If the
 // icon is not available or expired, the icon will be downloaded and saved in
 // the history backend.
-class FaviconDriverImpl : public FaviconDriver {
+class FaviconDriverImpl : public FaviconDriver,
+                          public FaviconHandler::Delegate {
  public:
-  // Favicon download callback.
-  // Public for testing.
-  void DidDownloadFavicon(int id,
-                          int http_status_code,
-                          const GURL& image_url,
-                          const std::vector<SkBitmap>& bitmaps,
-                          const std::vector<gfx::Size>& original_bitmap_sizes);
-
   // FaviconDriver implementation.
   void FetchFavicon(const GURL& url) override;
+
+  // FaviconHandler::Delegate implementation.
   bool IsBookmarked(const GURL& url) override;
-  bool HasPendingTasksForTest() override;
+
+  // Returns whether the driver is waiting for a download to complete or for
+  // data from the FaviconService. Reserved for testing.
+  bool HasPendingTasksForTest();
 
  protected:
   FaviconDriverImpl(FaviconService* favicon_service,
                     history::HistoryService* history_service,
                     bookmarks::BookmarkModel* bookmark_model);
   ~FaviconDriverImpl() override;
 
   // Returns whether downloading favicon for |url| previously failed.
   bool WasUnableToDownloadFavicon(const GURL& url);
 
@@ skipping 22 matching lines @@
   // |touch_icon_handler_| may be null depending on the platform and variations.
   std::unique_ptr<FaviconHandler> favicon_handler_;
   std::unique_ptr<FaviconHandler> touch_icon_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_