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

chrome/browser/prerender/prerender_manager_unittest.cc

Index: chrome/browser/prerender/prerender_manager_unittest.cc
===================================================================
--- chrome/browser/prerender/prerender_manager_unittest.cc	(revision 71356)
+++ chrome/browser/prerender/prerender_manager_unittest.cc	(working copy)
@@ -13,7 +13,8 @@
 class DummyPrerenderContents : public PrerenderContents {
  public:
   DummyPrerenderContents(PrerenderManager* prerender_manager, const GURL& url)
-      : PrerenderContents(prerender_manager, NULL, url),
+      : PrerenderContents(prerender_manager, NULL, url,
+                          std::vector<GURL>()),
         has_started_(false) {
   }
 
@@ -43,6 +44,11 @@
     next_pc_.reset(pc);
   }
 
+  // Shorthand to add a simple preload with no aliases.
+  void AddSimplePreload(const GURL& url) {

[cbentzel, 2011/01/14 02:01:13]

Should you add a unit test for the multiple alias_urls case, and make sure that
the find mechanism works correctly?

[tburkard, 2011/01/18 22:29:18]

Done.

+    AddPreload(url, std::vector<GURL>());
+  }
+
   PrerenderContents* next_pc() { return next_pc_.get(); }
 
  protected:
@@ -54,7 +60,9 @@
     return time_;
   }
 
-  virtual PrerenderContents* CreatePrerenderContents(const GURL& url) {
+  virtual PrerenderContents* CreatePrerenderContents(
+      const GURL& url,
+      const std::vector<GURL>& alias_urls) {
     return next_pc_.release();
   }
 
@@ -83,7 +91,7 @@
   DummyPrerenderContents* pc =
       new DummyPrerenderContents(prerender_manager_.get(), url);
   prerender_manager_->SetNextPrerenderContents(pc);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_TRUE(pc->has_started());
   EXPECT_EQ(pc, prerender_manager_->GetEntry(url));
   delete pc;
@@ -97,13 +105,13 @@
       new DummyPrerenderContents(prerender_manager_.get(), url);
   DummyPrerenderContents* null = NULL;
   prerender_manager_->SetNextPrerenderContents(pc);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc->has_started());
   DummyPrerenderContents* pc1 =
       new DummyPrerenderContents(prerender_manager_.get(), url);
   prerender_manager_->SetNextPrerenderContents(pc1);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_EQ(pc1, prerender_manager_->next_pc());
   EXPECT_FALSE(pc1->has_started());
   EXPECT_EQ(pc, prerender_manager_->GetEntry(url));
@@ -117,7 +125,7 @@
       new DummyPrerenderContents(prerender_manager_.get(), url);
   DummyPrerenderContents* null = NULL;
   prerender_manager_->SetNextPrerenderContents(pc);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc->has_started());
   prerender_manager_->AdvanceTime(prerender_manager_->max_prerender_age()
@@ -133,14 +141,14 @@
       new DummyPrerenderContents(prerender_manager_.get(), url);
   DummyPrerenderContents* null = NULL;
   prerender_manager_->SetNextPrerenderContents(pc);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc->has_started());
   GURL url1("http://news.google.com/");
   DummyPrerenderContents* pc1 =
       new DummyPrerenderContents(prerender_manager_.get(), url1);
   prerender_manager_->SetNextPrerenderContents(pc1);
-  prerender_manager_->AddPreload(url1);
+  prerender_manager_->AddSimplePreload(url1);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc1->has_started());
   EXPECT_EQ(null, prerender_manager_->GetEntry(url));
@@ -157,21 +165,21 @@
       new DummyPrerenderContents(prerender_manager_.get(), url);
   DummyPrerenderContents* null = NULL;
   prerender_manager_->SetNextPrerenderContents(pc);
-  prerender_manager_->AddPreload(url);
+  prerender_manager_->AddSimplePreload(url);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc->has_started());
   GURL url1("http://news.google.com/");
   DummyPrerenderContents* pc1 =
       new DummyPrerenderContents(prerender_manager_.get(),  url1);
   prerender_manager_->SetNextPrerenderContents(pc1);
-  prerender_manager_->AddPreload(url1);
+  prerender_manager_->AddSimplePreload(url1);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc1->has_started());
   GURL url2("http://images.google.com/");
   DummyPrerenderContents* pc2 =
       new DummyPrerenderContents(prerender_manager_.get(), url2);
   prerender_manager_->SetNextPrerenderContents(pc2);
-  prerender_manager_->AddPreload(url2);
+  prerender_manager_->AddSimplePreload(url2);
   EXPECT_EQ(null, prerender_manager_->next_pc());
   EXPECT_TRUE(pc2->has_started());
   EXPECT_EQ(null, prerender_manager_->GetEntry(url));