Revert 152904 - Moving FaviconService to a ProfileKeyedService.

chrome/test/base/testing_profile.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 205 matching lines @@
   virtual Profile* GetOriginalProfile() OVERRIDE;
   virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;
   virtual ExtensionService* GetExtensionService() OVERRIDE;
   virtual extensions::UserScriptMaster* GetUserScriptMaster() OVERRIDE;
   virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;
   virtual extensions::EventRouter* GetExtensionEventRouter() OVERRIDE;
   void SetExtensionSpecialStoragePolicy(
       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.
   net::CookieMonster* GetCookieMonster();
 
   virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;
   virtual policy::PolicyService* GetPolicyService() OVERRIDE;
   // Sets the profile's PrefService. If a pref service hasn't been explicitly
   // set GetPrefs creates one, so normally you need not invoke this. If you need
   // to set a pref service you must invoke this before GetPrefs.
@@ skipping 71 matching lines @@
  private:
   // Creates a temporary directory for use by this profile.
   void CreateTempProfileDir();
 
   // Common initialization between the two constructors.
   void Init();
 
   // 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_;
 
   // Internally, this is a TestURLRequestContextGetter that creates a dummy
   // request context. Currently, only the CookieMonster is hooked up.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   scoped_refptr<net::URLRequestContextGetter> extensions_request_context_;
 
   std::wstring id_;
 
@@ skipping 32 matching lines @@
   // testing.
   ProfileDependencyManager* profile_dependency_manager_;
 
   scoped_ptr<content::MockResourceContext> resource_context_;
 
   // Weak pointer to a delegate for indicating that a profile was created.
   Delegate* delegate_;
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_