Pass an instance of FaviconClient to FaviconService.

chrome/browser/favicon/favicon_service.cc

 // 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.
 
 #include "chrome/browser/favicon/favicon_service.h"
 
 #include "base/hash.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/history_backend.h"
@@ skipping 46 matching lines @@
       tracker->NewTrackedTaskId(&is_canceled_cb);
   favicon_base::FaviconResultsCallback cancelable_cb =
       Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback);
   ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(profile,
       page_url, desired_scale_factors, cancelable_cb);
   return id;
 }
 
 }  // namespace
 
-FaviconService::FaviconService(Profile* profile)
-    : history_service_(HistoryServiceFactory::GetForProfile(
-          profile, Profile::EXPLICIT_ACCESS)),
-      profile_(profile) {
+FaviconService::FaviconService(Profile* profile, FaviconClient* favicon_client)
+    : history_service_(
+          HistoryServiceFactory::GetForProfile(profile,
+                                               Profile::EXPLICIT_ACCESS)),
+      profile_(profile),
+      favicon_client_(favicon_client) {
 }
 
 // static
 void FaviconService::FaviconResultsCallbackRunner(
     const favicon_base::FaviconResultsCallback& callback,
     const std::vector<favicon_base::FaviconBitmapResult>* results) {
   callback.Run(*results);
 }
 
 base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImage(
@@ skipping 320 matching lines @@
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(resized_image.AsBitmap(), false,
                                          &resized_bitmap_data)) {
     callback.Run(favicon_base::FaviconBitmapResult());
     return;
   }
 
   bitmap_result.bitmap_data = base::RefCountedBytes::TakeVector(
       &resized_bitmap_data);
   callback.Run(bitmap_result);
 }