For prerendering, keep track of all the intermediate redirects, and hook into...

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
===================================================================
--- chrome/browser/prerender/prerender_manager.cc	(revision 71174)
+++ chrome/browser/prerender/prerender_manager.cc	(working copy)
@@ -39,7 +39,8 @@
   }
 }
 
-void PrerenderManager::AddPreload(const GURL& url) {
+void PrerenderManager::AddPreload(const GURL& url,
+                                  const std::vector<GURL>& alias_urls) {
   DCHECK(CalledOnValidThread());
   DeleteOldEntries();
   // If the URL already exists in the set of preloaded URLs, don't do anything.
@@ -52,6 +53,7 @@
   PrerenderContentsData data(CreatePrerenderContents(url),
                              GetCurrentTime(), url);
   prerender_list_.push_back(data);
+  data.contents_->AddAliasURLs(alias_urls);
   data.contents_->StartPrerendering();
   while (prerender_list_.size() > max_elements_) {
     data = prerender_list_.front();
@@ -75,7 +77,8 @@
   for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
        it != prerender_list_.end();
        ++it) {
-    if (it->url_ == url) {
+    PrerenderContents* pc = it->contents_;
+    if (pc->MatchesUrl(url)) {
       PrerenderContents* pc = it->contents_;
       prerender_list_.erase(it);
       return pc;