Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc

Index: chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc
===================================================================
--- chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc	(revision 152958)
+++ chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "chrome/browser/android/tab_android.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/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -351,10 +350,9 @@
     if (!node)
       return;
 
-    FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-        profile, Profile::EXPLICIT_ACCESS);
+    FaviconService* favicon_service = profile->GetFaviconService(
+        Profile::EXPLICIT_ACCESS);
     FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-        profile,
         node->url(),
         history::FAVICON | history::TOUCH_ICON,
         &cancelable_consumer_,
@@ -379,8 +377,7 @@
   Profile* profile = Profile::FromBrowserContext(
       web_ui()->GetWebContents()->GetBrowserContext());
   const BookmarkNode* node = cancelable_consumer_.GetClientData(
-      FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS),
-      handle);
+      profile->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
 
   TabAndroid* tab = TabAndroid::FromWebContents(
       web_ui()->GetWebContents());