Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
===================================================================
--- chrome/browser/favicon/favicon_service.h	(revision 152958)
+++ chrome/browser/favicon/favicon_service.h	(working copy)
@@ -11,11 +11,9 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/ref_counted_util.h"
 
 class GURL;
-class HistoryService;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
@@ -23,10 +21,9 @@
 //
 // This service is thread safe. Each request callback is invoked in the
 // thread that made the request.
-class FaviconService : public CancelableRequestProvider,
-                       public ProfileKeyedService {
+class FaviconService : public CancelableRequestProvider {
  public:
-  explicit FaviconService(HistoryService* history_service);
+  explicit FaviconService(Profile* profile);
 
   virtual ~FaviconService();
 
@@ -74,8 +71,7 @@
   // Note: this version is intended to be used to retrieve the favicon of a
   // page that has been browsed in the past. |expired| in the callback is
   // always false.
-  Handle GetFaviconForURL(Profile* profile,
-                          const GURL& page_url,
+  Handle GetFaviconForURL(const GURL& page_url,
                           int icon_types,
                           CancelableRequestConsumerBase* consumer,
                           const FaviconDataCallback& callback);
@@ -109,7 +105,7 @@
                   history::IconType icon_type);
 
  private:
-  HistoryService* history_service_;
+  Profile* profile_;
 
   // Helper to forward an empty result if we cannot get the history service.
   void ForwardEmptyResultAsync(GetFaviconRequest* request);