Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/webui/extensions/extension_icon_source.cc

Index: chrome/browser/ui/webui/extensions/extension_icon_source.cc
===================================================================
--- chrome/browser/ui/webui/extensions/extension_icon_source.cc	(revision 152958)
+++ chrome/browser/ui/webui/extensions/extension_icon_source.cc	(working copy)
@@ -15,7 +15,6 @@
 #include "base/threading/thread.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -205,7 +204,7 @@
 
 void ExtensionIconSource::LoadFaviconImage(int request_id) {
   FaviconService* favicon_service =
-      FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+      profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
   // Fall back to the default icons if the service isn't available.
   if (favicon_service == NULL) {
     LoadDefaultImage(request_id);
@@ -214,7 +213,6 @@
 
   GURL favicon_url = GetData(request_id)->extension->GetFullLaunchURL();
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      profile_,
       favicon_url,
       history::FAVICON,
       &cancelable_consumer_,
@@ -227,8 +225,7 @@
     FaviconService::Handle request_handle,
     history::FaviconData favicon) {
   int request_id = cancelable_consumer_.GetClientData(
-      FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS),
-      request_handle);
+      profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), request_handle);
   ExtensionIconRequest* request = GetData(request_id);
 
   // Fallback to the default icon if there wasn't a favicon.