Pass an instance of FaviconClient to FaviconService.

chrome/browser/favicon/favicon_service.h

 // Copyright (c) 2012 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 CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "ui/base/layout.h"
 
+class FaviconClient;
 class GURL;
 class HistoryService;
 struct ImportedFaviconUsage;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
 // backend behind the scenes.
 class FaviconService : public KeyedService {
  public:
-  explicit FaviconService(Profile* profile);
+  explicit FaviconService(Profile* profile, FaviconClient* favicon_client);

[blundell, 2014/05/27 18:48:40]

nit: get rid of explicit

[blundell, 2014/05/27 18:48:40]

Add a comment on these parameters, including their expected lifetimes. Add a
TODO(jif) to eliminate the Profile parameter with a bug link.

[jif, 2014/05/28 09:05:40]

Done.

 
   virtual ~FaviconService();
 
   // Auxiliary argument structure for requesting favicons for URLs.
   struct FaviconForURLParams {
     FaviconForURLParams(const GURL& page_url,
                         int icon_types,
                         int desired_size_in_dip)
         : page_url(page_url),
           icon_types(icon_types),
@@ skipping 174 matching lines @@
   // Avoid repeated requests to download missing favicon.
   void UnableToDownloadFavicon(const GURL& icon_url);
   bool WasUnableToDownloadFavicon(const GURL& icon_url) const;
   void ClearUnableToDownloadFavicons();
 
  private:
   typedef uint32 MissingFaviconURLHash;
   base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
   HistoryService* history_service_;
   Profile* profile_;
+  FaviconClient* favicon_client_;
 
   // Helper function for GetFaviconImageForURL(), GetRawFaviconForURL() and
   // GetFaviconForURL().
   base::CancelableTaskTracker::TaskId GetFaviconForURLImpl(
       const FaviconForURLParams& params,
       const std::vector<ui::ScaleFactor>& desired_scale_factors,
       const favicon_base::FaviconResultsCallback& callback,
       base::CancelableTaskTracker* tracker);
 
   // Intermediate callback for GetFaviconImage() and GetFaviconImageForURL()
@@ skipping 14 matching lines @@
       const  favicon_base::FaviconRawCallback& callback,
       int desired_size_in_dip,
       ui::ScaleFactor desired_scale_factor,
       const std::vector<favicon_base::FaviconBitmapResult>&
           favicon_bitmap_results);
 
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_SERVICE_H_