Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/browser/profiles/profile.h

Index: chrome/browser/profiles/profile.h
===================================================================
--- chrome/browser/profiles/profile.h	(revision 152958)
+++ chrome/browser/profiles/profile.h	(working copy)
@@ -215,6 +215,19 @@
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() = 0;
 
+  // Retrieves a pointer to the FaviconService associated with this
+  // profile.  The FaviconService is lazily created the first time
+  // that this method is called.
+  //
+  // Although FaviconService is refcounted, this will not addref, and callers
+  // do not need to do any reference counting as long as they keep the pointer
+  // only for the local scope (which they should do anyway since the browser
+  // process may decide to shut down).
+  //
+  // |access| defines what the caller plans to do with the service. See
+  // the ServiceAccessType definition above.
+  virtual FaviconService* GetFaviconService(ServiceAccessType access) = 0;
+
   // Accessor. The instance is created upon first access.
   virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() = 0;
 
Property changes on: chrome/browser/profiles/profile.h
___________________________________________________________________
Deleted: svn:mergeinfo