Move pending prerender logic into PrerenderLinkManager.

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 82477b288025f24077a4ba48c8be9344b88bfc0f..2c4c54770dccf6041b8ec8511145db1d06172b8c 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -195,28 +195,9 @@ PrerenderContents::Observer::Observer() {
 PrerenderContents::Observer::~Observer() {
 }
 
-PrerenderContents::PendingPrerenderInfo::PendingPrerenderInfo(
-    base::WeakPtr<PrerenderHandle> weak_prerender_handle,
-    Origin origin,
-    const GURL& url,
-    const content::Referrer& referrer,
-    const gfx::Size& size)
-    : weak_prerender_handle(weak_prerender_handle),
-      origin(origin),
-      url(url),
-      referrer(referrer),
-      size(size) {
-}
-
-PrerenderContents::PendingPrerenderInfo::~PendingPrerenderInfo() {
-}
-
-void PrerenderContents::AddPendingPrerender(
-    scoped_ptr<PendingPrerenderInfo> pending_prerender_info) {
-  pending_prerenders_.push_back(pending_prerender_info.release());
-}
-
 void PrerenderContents::PrepareForUse() {

[gavinp, 2014/01/30 19:58:49]

Methods in .cc files should be in the same order as in the .h file.

[davidben, 2014/01/30 21:01:51]

Yeah, a lot of this file is rather horrifically out of order. (I just removed a
function and added a line to PrepareForUse; I think the diff is confused.)

Moved it somewhere more accurate as far as the header goes.

+  SetFinalStatus(FINAL_STATUS_USED);
+
   if (prerender_contents_.get()) {
     prerender_contents_->SendToAllFrames(
         new PrerenderMsg_SetIsPrerendering(MSG_ROUTING_NONE, false));
@@ -224,16 +205,6 @@ void PrerenderContents::PrepareForUse() {
 
   NotifyPrerenderStop();
 
-  SessionStorageNamespace* session_storage_namespace = NULL;
-  if (prerender_contents_) {
-    // TODO(ajwong): This does not correctly handle storage for isolated apps.
-    session_storage_namespace = prerender_contents_->
-        GetController().GetDefaultSessionStorageNamespace();
-  }
-  prerender_manager_->StartPendingPrerenders(
-      child_id_, &pending_prerenders_, session_storage_namespace);
-  pending_prerenders_.clear();
-
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
@@ -420,8 +391,10 @@ bool PrerenderContents::GetRouteId(int* route_id) const {
 }
 
 void PrerenderContents::SetFinalStatus(FinalStatus final_status) {
-  DCHECK(final_status >= FINAL_STATUS_USED && final_status < FINAL_STATUS_MAX);
-  DCHECK(final_status_ == FINAL_STATUS_MAX);
+  DCHECK_GE(final_status, FINAL_STATUS_USED);
+  DCHECK_LT(final_status, FINAL_STATUS_MAX);
+
+  DCHECK_EQ(FINAL_STATUS_MAX, final_status_);
 
   final_status_ = final_status;
 }
@@ -510,10 +483,6 @@ void PrerenderContents::OnRenderViewHostCreated(
     RenderViewHost* new_render_view_host) {
 }
 
-size_t PrerenderContents::pending_prerender_count() const {

[gavinp, 2014/01/30 19:58:49]

Nice to get rid of this style violation.

-  return pending_prerenders_.size();
-}
-
 WebContents* PrerenderContents::CreateWebContents(
     SessionStorageNamespace* session_storage_namespace) {
   // TODO(ajwong): Remove the temporary map once prerendering is aware of