Change multi-prerender API to include per launcher slots.

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 2737f798b7bafa3ab1dc8124258d5f732fc40a51..e466484623c573e5048fa81ed49bcf4ba6c97992 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -212,7 +212,7 @@ PrerenderContents::PrerenderContents(
       origin_(origin),
       experiment_id_(experiment_id),
       creator_child_id_(-1) {
-  DCHECK(prerender_manager != NULL);
+  DCHECK_NE(static_cast<PrerenderManager*>(NULL), prerender_manager);
 }
 
 PrerenderContents* PrerenderContents::CreateMatchCompleteReplacement() {
@@ -599,17 +599,17 @@ void PrerenderContents::Destroy(FinalStatus final_status) {
   prerender_manager_->AddToHistory(this);
   prerender_manager_->MoveEntryToPendingDelete(this, final_status);
 
-  if (!prerender_manager_->IsControlGroup(experiment_id()) &&
-      (prerendering_has_started() ||
-       match_complete_status() == MATCH_COMPLETE_REPLACEMENT)) {
-    NotifyPrerenderStop();
-  }
-
   // We may destroy the PrerenderContents before we have initialized the
   // RenderViewHost. Otherwise set the Observer's PrerenderContents to NULL to
   // avoid any more messages being sent.
   if (render_view_host_observer_)
     render_view_host_observer_->set_prerender_contents(NULL);

[mmenke, 2012/12/17 20:02:23]

Why does this need to be moved?

[gavinp, 2012/12/18 00:44:14]

It doesn't. I just moved it while I was debugging a reentrancy issue, but that's
now guarded in the prerenderlinkmanager. So no point having this file in the CL
at all.

+
+  if (!prerender_manager_->IsControlGroup(experiment_id()) &&
+      (prerendering_has_started() ||
+       match_complete_status() == MATCH_COMPLETE_REPLACEMENT)) {
+    NotifyPrerenderStop();
+  }
 }
 
 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {