From ada01b945465efd456813c51ff9090f43337d49c Mon Sep 17 00:00:00 2001 From: "dominich@chromium.org" Date: Wed, 7 Sep 2011 21:01:39 +0000 Subject: Revert 100003 - Moved PrerenderManager to ProfileKeyedService system. As per https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/554b5b0ca05e001d# it is recommended that weak references to services be removed from Profiles and constructed as ProfileKeyedServices instead. This does this for the PrerenderManager. BUG=94643 TEST=Prerender* Review URL: http://codereview.chromium.org/7795009 TBR=dominich@chromium.org Review URL: http://codereview.chromium.org/7837045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100014 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/prerender/prerender_manager.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'chrome/browser/prerender/prerender_manager.h') diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index bcbaca2..8566b85 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -23,7 +23,6 @@ #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_origin.h" -#include "chrome/browser/profiles/profile_keyed_service.h" #include "googleurl/src/gurl.h" class Profile; @@ -53,8 +52,7 @@ class PrerenderTracker; // views of webpages. All methods must be called on the UI thread unless // indicated otherwise. class PrerenderManager : public base::SupportsWeakPtr, - public base::NonThreadSafe, - public ProfileKeyedService { + public base::NonThreadSafe { public: // PrerenderManagerMode is used in a UMA_HISTOGRAM, so please do not // add in the middle. @@ -82,9 +80,6 @@ class PrerenderManager : public base::SupportsWeakPtr, virtual ~PrerenderManager(); - // ProfileKeyedService implementation. - virtual void Shutdown() OVERRIDE; - // Entry points for adding prerenders. // Adds a prerender for |url| if valid. |process_id| and |route_id| identify @@ -223,11 +218,6 @@ class PrerenderManager : public base::SupportsWeakPtr, PendingContentsData* FindPendingEntry(const GURL& url); - // Utility method that is called from the virtual Shutdown method on this - // class but is called directly from the TestPrerenderManager in the unit - // tests. - void DoShutdown(); - private: // Test that needs needs access to internal functions. friend class PrerenderBrowserTest; -- cgit v1.1