Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/ui/toolbar/back_forward_menu_model.cc

Index: chrome/browser/ui/toolbar/back_forward_menu_model.cc
===================================================================
--- chrome/browser/ui/toolbar/back_forward_menu_model.cc	(revision 152958)
+++ chrome/browser/ui/toolbar/back_forward_menu_model.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/event_disposition.h"
-#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -241,12 +240,12 @@
     return;
   }
   requested_favicons_.insert(entry->GetUniqueID());
-  FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
-      browser_->profile(), Profile::EXPLICIT_ACCESS);
+  FaviconService* favicon_service =
+      browser_->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
   FaviconService::Handle handle = favicon_service->GetFaviconForURL(
-      browser_->profile(), entry->GetURL(), history::FAVICON, &load_consumer_,
+      entry->GetURL(), history::FAVICON, &load_consumer_,
       base::Bind(&BackForwardMenuModel::OnFavIconDataAvailable,
                  base::Unretained(this)));
   load_consumer_.SetClientData(favicon_service, handle, entry->GetUniqueID());
Property changes on: chrome/browser/ui/toolbar/back_forward_menu_model.cc
___________________________________________________________________
Deleted: svn:mergeinfo