Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/profiles/profile_impl.h

Index: chrome/browser/profiles/profile_impl.h
===================================================================
--- chrome/browser/profiles/profile_impl.h	(revision 152958)
+++ chrome/browser/profiles/profile_impl.h	(working copy)
@@ -84,6 +84,7 @@
   virtual extensions::EventRouter* GetExtensionEventRouter() OVERRIDE;
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() OVERRIDE;
+  virtual FaviconService* GetFaviconService(ServiceAccessType sat) OVERRIDE;
   virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;
   virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;
   virtual policy::PolicyService* GetPolicyService() OVERRIDE;
@@ -209,7 +210,9 @@
   scoped_refptr<content::GeolocationPermissionContext>
       geolocation_permission_context_;
   scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_;
+  scoped_ptr<FaviconService> favicon_service_;
   scoped_refptr<history::ShortcutsBackend> shortcuts_backend_;
+  bool favicon_service_created_;
 
   // Whether or not the last session exited cleanly. This is set only once.
   bool last_session_exited_cleanly_;
Property changes on: chrome/browser/profiles/profile_impl.h
___________________________________________________________________
Deleted: svn:mergeinfo