Browser test for prerendering in general

chrome/browser/prerender/prerender_manager.cc

 // Copyright (c) 2010 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_manager.h"
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/common/render_messages.h"
 
 struct PrerenderManager::PrerenderContentsData {
   PrerenderContents* contents_;
   base::Time start_time_;
   GURL url_;
@@ skipping 14 matching lines @@
 }
 
 PrerenderManager::~PrerenderManager() {
   while (prerender_list_.size() > 0) {
     PrerenderContentsData data = prerender_list_.front();
     prerender_list_.pop_front();
     delete data.contents_;
   }
 }
 
+void PrerenderManager::SetPrerenderContentsFactory(
+    PrerenderContents::Factory* prerender_contents_factory) {
+  prerender_contents_factory_.reset(prerender_contents_factory);
+}
+
 void PrerenderManager::AddPreload(const GURL& url,
                                   const std::vector<GURL>& alias_urls) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DeleteOldEntries();
   // If the URL already exists in the set of preloaded URLs, don't do anything.
   for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
        it != prerender_list_.end();
        ++it) {
     if (it->url_ == url)
       return;
   }
   PrerenderContentsData data(CreatePrerenderContents(url, alias_urls),
                              GetCurrentTime(), url);
@@ skipping 26 matching lines @@
       PrerenderContents* pc = it->contents_;
       prerender_list_.erase(it);
       return pc;
     }
   }
   // Entry not found.
   return NULL;
 }
 
 bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tc, const GURL& url) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<PrerenderContents> pc(GetEntry(url));
   if (pc.get() == NULL)
     return false;
 
   RenderViewHost* rvh = pc->render_view_host();
   pc->set_render_view_host(NULL);
   rvh->Send(new ViewMsg_DisplayPrerenderedPage(rvh->routing_id()));
   tc->SwapInRenderViewHost(rvh);
 
   ViewHostMsg_FrameNavigate_Params* p = pc->navigate_params();
   if (p != NULL)
     tc->DidNavigate(rvh, *p);
 
   string16 title = pc->title();
   if (!title.empty())
     tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
 
   return true;
 }
 
 void PrerenderManager::RemoveEntry(PrerenderContents* entry) {
-  DCHECK(CalledOnValidThread());
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
        it != prerender_list_.end();
        ++it) {
     if (it->contents_ == entry) {
       prerender_list_.erase(it);
       break;
     }
   }
   delete entry;
   DeleteOldEntries();
 }
 
 base::Time PrerenderManager::GetCurrentTime() const {
   return base::Time::Now();
 }
 
 bool PrerenderManager::IsPrerenderElementFresh(const base::Time start) const {
   base::Time now = GetCurrentTime();
   return (now - start < max_prerender_age_);
 }
 
 PrerenderContents* PrerenderManager::CreatePrerenderContents(
     const GURL& url,
     const std::vector<GURL>& alias_urls) {
+  if (prerender_contents_factory_.get()) {

[cbentzel, 2011/01/21 18:37:02]

Should you just have a default factory which is created in the PrerenderManager
constructor? Removes the get here. Not worried about optimizations, just fewer
NULL checks required. 

[mmenke, 2011/01/21 20:12:20]

Done.  I've seen both done in the code, but think always using a factory is a
bit more consistent (Though I wouldn't be surprised if the null check were
actually faster, on a pointless side note).

+    return prerender_contents_factory_->CreatePrerenderContents(
+        this, profile_, url, alias_urls);
+  }
   return new PrerenderContents(this, profile_, url, alias_urls);
 }
+
+PrerenderContents* PrerenderManager::FindEntry(const GURL& url) {
+  DeleteOldEntries();

[cbentzel, 2011/01/21 18:37:02]

I'm not sure if you need to do pruning here.

[mmenke, 2011/01/21 20:12:20]

Removed.  I was thinking it would be easier to debug issues caused
DeleteOldEntries() if it occurs here, rather than if it occurs in the middle of
swapping out a page.

That having been said, we do have unit tests for that, anyways.

+  for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
+       it != prerender_list_.end();
+       ++it) {
+    if (it->contents_->MatchesURL(url))
+      return it->contents_;
+  }
+  // Entry not found.
+  return NULL;
+}