Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc

Index: chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc
===================================================================
--- chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc	(revision 152958)
+++ chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc	(working copy)
@@ -8,7 +8,6 @@
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -530,9 +529,8 @@
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->AddPage(
           url1, history::SOURCE_BROWSED);
-  FaviconServiceFactory::GetForProfile(
-      profile(), Profile::EXPLICIT_ACCESS)->SetFavicon(
-          url1, url1_favicon, icon_data, history::FAVICON);
+  profile()->GetFaviconService(Profile::EXPLICIT_ACCESS)->SetFavicon(url1,
+      url1_favicon, icon_data, history::FAVICON);
 
   // Will return the current icon (default) but start an anync call
   // to retrieve the favicon from the favicon service.