Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/test/base/testing_profile.h

Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h	(revision 152958)
+++ chrome/test/base/testing_profile.h	(working copy)
@@ -223,6 +223,7 @@
       ExtensionSpecialStoragePolicy* extension_special_storage_policy);
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() OVERRIDE;
+  virtual FaviconService* GetFaviconService(ServiceAccessType access) OVERRIDE;
   // The CookieMonster will only be returned if a Context has been created. Do
   // this by calling CreateRequestContext(). See the note at GetRequestContext
   // for more information.
@@ -314,12 +315,18 @@
   // Finishes initialization when a profile is created asynchronously.
   void FinishInit();
 
+  // Destroys favicon service if it has been created.
+  void DestroyFaviconService();
+
   // Creates a TestingPrefService and associates it with the TestingProfile.
   void CreateTestingPrefService();
 
   virtual base::Callback<ChromeURLDataManagerBackend*(void)>
       GetChromeURLDataManagerBackendGetter() const OVERRIDE;
 
+  // The favicon service. Only created if CreateFaviconService is invoked.
+  scoped_ptr<FaviconService> favicon_service_;
+
   // The policy service. Lazily created as a stub.
   scoped_ptr<policy::PolicyService> policy_service_;