Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/favicon/favicon_handler.cc

Index: chrome/browser/favicon/favicon_handler.cc
===================================================================
--- chrome/browser/favicon/favicon_handler.cc	(revision 152958)
+++ chrome/browser/favicon/favicon_handler.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
@@ -158,8 +157,7 @@
 }
 
 FaviconService* FaviconHandler::GetFaviconService() {
-  return FaviconServiceFactory::GetForProfile(
-      profile_, Profile::EXPLICIT_ACCESS);
+  return profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconHandler::UpdateFaviconCandidate(const GURL& url,
@@ -374,8 +372,8 @@
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconDataCallback& callback) {
-  GetFaviconService()->GetFaviconForURL(profile_, page_url, icon_types,
-                                        consumer, callback);
+  GetFaviconService()->GetFaviconForURL(page_url, icon_types, consumer,
+                                        callback);
 }
 
 void FaviconHandler::SetHistoryFavicon(