The DeleteOnUIThread for PrerenderManager was causing leaks on unit tests. Reverting and fixing the tests, rather than doing suppressions.

Revert 81930 - Delete PrerenderManager on UI thread.BUG=77930,79582TEST=NoneReview URL: http://codereview.chromium.org/6864017
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/6883008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81933 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 8 deletions

diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 50da3b8..8b9dd00 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -16,7 +16,6 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/prerender/prerender_contents.h"
-#include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
@@ -39,9 +38,7 @@ namespace prerender {
 
 // PrerenderManager is responsible for initiating and keeping prerendered
 // views of webpages.
-class PrerenderManager
-    : public base::RefCountedThreadSafe<PrerenderManager,
-                                        BrowserThread::DeleteOnUIThread> {
+class PrerenderManager : public base::RefCountedThreadSafe<PrerenderManager> {
  public:
   // PrerenderManagerMode is used in a UMA_HISTOGRAM, so please do not
   // add in the middle.
@@ -56,10 +53,6 @@ class PrerenderManager
   // Owned by a Profile object for the lifetime of the profile.
   explicit PrerenderManager(Profile* profile);
 
-  // Destructor should no be called explicitly, but needs to be public
-  // for DeleteOnUIThread.
-  virtual ~PrerenderManager();
-
   // Preloads the URL supplied.  alias_urls indicates URLs that redirect
   // to the same URL to be preloaded. Returns true if the URL was added,
   // false if it was not.
@@ -140,6 +133,8 @@ class PrerenderManager
  protected:
   struct PendingContentsData;
 
+  virtual ~PrerenderManager();
+
   void SetPrerenderContentsFactory(
       PrerenderContents::Factory* prerender_contents_factory);
   bool rate_limit_enabled_;