PrerenderManager: No longer expose weak pointers.

BUG=none

Review-Url: https://codereview.chromium.org/2346863003
Cr-Commit-Position: refs/heads/master@{#419341}

chrome/browser/prerender/prerender_manager.cc

@@ -157,12 +157,14 @@ struct PrerenderManager::NavigationRecord {
 PrerenderManager::PrerenderManager(Profile* profile)
     : profile_(profile),
       prerender_contents_factory_(PrerenderContents::CreateFactory()),
-      last_prerender_start_time_(GetCurrentTimeTicks() -
+      last_prerender_start_time_(
+          GetCurrentTimeTicks() -
           base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs)),
       prerender_history_(new PrerenderHistory(kHistoryLength)),
       histograms_(new PrerenderHistograms()),
       profile_network_bytes_(0),
-      last_recorded_profile_network_bytes_(0) {
+      last_recorded_profile_network_bytes_(0),
+      weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Certain experiments override our default config_ values.
@@ -1032,7 +1034,8 @@ void PrerenderManager::PeriodicCleanup() {
 void PrerenderManager::PostCleanupTask() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(&PrerenderManager::PeriodicCleanup, AsWeakPtr()));
+      FROM_HERE, base::Bind(&PrerenderManager::PeriodicCleanup,
+                            weak_factory_.GetWeakPtr()));
 }
 
 base::TimeTicks PrerenderManager::GetExpiryTimeForNewPrerender(

chrome/browser/prerender/prerender_manager.h

@@ -71,8 +71,7 @@ class PrerenderLocalPredictor;
 // PrerenderManager is responsible for initiating and keeping prerendered
 // views of web pages. All methods must be called on the UI thread unless
 // indicated otherwise.
-class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
-                         public content::NotificationObserver,
+class PrerenderManager : public content::NotificationObserver,
                          public content::RenderProcessHostObserver,
                          public KeyedService,
                          public MediaCaptureDevicesDispatcher::Observer {
@@ -588,6 +587,8 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   using PrerenderProcessSet = std::set<content::RenderProcessHost*>;
   PrerenderProcessSet prerender_process_hosts_;
 
+  base::WeakPtrFactory<PrerenderManager> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -240,8 +240,6 @@ class NetInternalsMessageHandler
   // This is the "real" message handler, which lives on the IO thread.
   scoped_refptr<IOThreadImpl> proxy_;
 
-  base::WeakPtr<prerender::PrerenderManager> prerender_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(NetInternalsMessageHandler);
 };
 
@@ -410,14 +408,6 @@ void NetInternalsMessageHandler::RegisterMessages() {
   proxy_->AddRequestContextGetter(profile->GetRequestContextForExtensions());
 #endif
 
-  prerender::PrerenderManager* prerender_manager =
-      prerender::PrerenderManagerFactory::GetForProfile(profile);
-  if (prerender_manager) {
-    prerender_manager_ = prerender_manager->AsWeakPtr();
-  } else {
-    prerender_manager_ = base::WeakPtr<prerender::PrerenderManager>();
-  }
-
   web_ui()->RegisterMessageCallback(
       "notifyReady",
       base::Bind(&NetInternalsMessageHandler::OnRendererReady,
@@ -542,8 +532,12 @@ void NetInternalsMessageHandler::OnGetPrerenderInfo(
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::unique_ptr<base::DictionaryValue> value;
-  if (prerender_manager_) {
-    value = prerender_manager_->GetAsValue();
+
+  prerender::PrerenderManager* prerender_manager =
+      prerender::PrerenderManagerFactory::GetForProfile(
+          Profile::FromWebUI(web_ui()));
+  if (prerender_manager) {
+    value = prerender_manager->GetAsValue();
   } else {
     value.reset(new base::DictionaryValue());
     value->SetBoolean("enabled", false);