Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/webui/ntp/favicon_webui_handler.cc

Index: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
===================================================================
--- chrome/browser/ui/webui/ntp/favicon_webui_handler.cc	(revision 152958)
+++ chrome/browser/ui/webui/ntp/favicon_webui_handler.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/extensions/extension_icon_manager.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_resource.h"
 #include "chrome/common/url_constants.h"
@@ -89,8 +88,8 @@
   std::string dom_id;
   CHECK(args->GetString(1, &dom_id));
 
-  FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-      Profile::FromWebUI(web_ui()), Profile::EXPLICIT_ACCESS);
+  FaviconService* favicon_service =
+      Profile::FromWebUI(web_ui())->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty())
     return;
 
@@ -110,7 +109,6 @@
 
   dom_id_map_[id_] = dom_id;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      Profile::FromWebUI(web_ui()),
       url,
       history::FAVICON,
       &consumer_,
@@ -122,8 +120,8 @@
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
     history::FaviconData favicon) {
-  FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-      Profile::FromWebUI(web_ui()), Profile::EXPLICIT_ACCESS);
+  FaviconService* favicon_service =
+      Profile::FromWebUI(web_ui())->GetFaviconService(Profile::EXPLICIT_ACCESS);
   int id = consumer_.GetClientData(favicon_service, request_handle);
   scoped_ptr<StringValue> color_value;
 
Property changes on: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
___________________________________________________________________
Deleted: svn:mergeinfo