Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/webui/favicon_source.cc

Index: chrome/browser/ui/webui/favicon_source.cc
===================================================================
--- chrome/browser/ui/webui/favicon_source.cc	(revision 152993)
+++ chrome/browser/ui/webui/favicon_source.cc	(working copy)
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
@@ -43,7 +44,7 @@
                                      bool is_incognito,
                                      int request_id) {
   FaviconService* favicon_service =
-      profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
+      FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
     SendDefaultResponse(request_id);
     return;
@@ -105,6 +106,7 @@
 
     // TODO(estade): fetch the requested size.
     handle = favicon_service->GetFaviconForURL(
+        profile_,
         url,
         icon_types_,
         &cancelable_consumer_,
@@ -132,7 +134,7 @@
     FaviconService::Handle request_handle,
     history::FaviconData favicon) {
   FaviconService* favicon_service =
-      profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
+      FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   int request_id = cancelable_consumer_.GetClientData(favicon_service,
                                                       request_handle);