Change multi-prerender API to include per launcher slots.

chrome/browser/prerender/prerender_contents.cc

 // 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.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 194 matching lines @@
       has_stopped_loading_(false),
       has_finished_loading_(false),
       final_status_(FINAL_STATUS_MAX),
       match_complete_status_(MATCH_COMPLETE_DEFAULT),
       prerendering_has_been_cancelled_(false),
       child_id_(-1),
       route_id_(-1),
       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() {
   PrerenderContents* new_contents = prerender_manager_->CreatePrerenderContents(
       prerender_url(), referrer(), origin(), experiment_id());
 
   new_contents->load_start_time_ = load_start_time_;
   new_contents->session_storage_namespace_id_ = session_storage_namespace_id_;
   new_contents->set_match_complete_status(
       PrerenderContents::MATCH_COMPLETE_REPLACEMENT_PENDING);
@@ skipping 366 matching lines @@
             GetFinalStatus(child_id_, route_id_, &final_status)) {
       NOTREACHED();
     }
   }
   SetFinalStatus(final_status);
 
   prerendering_has_been_cancelled_ = true;
   prerender_manager_->AddToHistory(this);
   prerender_manager_->MoveEntryToPendingDelete(this, final_status);
 
+  // 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();
   }
-
-  // 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);
 }
 
 base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
   if (process_metrics_.get() == NULL) {
     // If a PrenderContents hasn't started prerending, don't be fully formed.
     if (!GetRenderViewHost() || !GetRenderViewHost()->GetProcess())
       return NULL;
     base::ProcessHandle handle = GetRenderViewHost()->GetProcess()->GetHandle();
     if (handle == base::kNullProcessHandle)
       return NULL;
@@ skipping 62 matching lines @@
 
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_)
     return false;
   return (prerender_contents_->GetSiteInstance() !=
           prerender_contents_->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender