Make FaviconService a ProfileKeyedService

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index d122dd64bda74871cb4e9e8cf22ba3a6be1dfeb4..b7a7f080d8f1383544940d2b144e71e82813941c 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -11,9 +11,11 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/ref_counted_util.h"
 
 class GURL;
+class HistoryService;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
@@ -21,9 +23,14 @@ class Profile;
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.
-class FaviconService : public CancelableRequestProvider {
+class FaviconService : public CancelableRequestProvider,
+                       public ProfileKeyedService {
  public:
-  explicit FaviconService(Profile* profile);
+  // FIXME: We should not take a Profile pointer here.
+  // We do this now because we need to pass a Profile pointer to
+  // ChromeWebUIControllerFactory::GetFaviconForURL() until that
+  // component gets untangled too.
+  FaviconService(scoped_refptr<HistoryService>, Profile*);
 
   virtual ~FaviconService();
 
@@ -104,9 +111,12 @@ class FaviconService : public CancelableRequestProvider {
                   const std::vector<unsigned char>& image_data,
                   history::IconType icon_type);
 
+  // ProfileKeyedService
+  virtual void Shutdown();
  private:
+  scoped_refptr<HistoryService> history_service_;
+  // FIXME: remove this member variable. See comment in the constructor.
   Profile* profile_;
-
   // Helper to forward an empty result if we cannot get the history service.
   void ForwardEmptyResultAsync(GetFaviconRequest* request);