Give prerendering RVH's RenderWidgetHostViews.

chrome/browser/prerender/prerender_manager_unittest.cc

 // Copyright (c) 2011 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 "base/time.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
@@ skipping 21 matching lines @@
                          FinalStatus expected_final_status)
       : PrerenderContents(prerender_manager, NULL, url, alias_urls, GURL()),
         has_started_(false),
         expected_final_status_(expected_final_status) {
   }
 
   virtual ~DummyPrerenderContents() {
     EXPECT_EQ(expected_final_status_, final_status());
   }
 
-  virtual void StartPrerendering() OVERRIDE {
+  virtual void StartPrerendering(
+      const RenderViewHost* source_render_view_host) OVERRIDE {
     has_started_ = true;
   }
 
   virtual bool GetChildId(int* child_id) const OVERRIDE {
     *child_id = 0;
     return true;
   }
 
   virtual bool GetRouteId(int* route_id) const OVERRIDE {
     *route_id = 0;
@@ skipping 24 matching lines @@
   void AdvanceTimeTicks(base::TimeDelta delta) {
     time_ticks_ += delta;
   }
 
   void SetNextPrerenderContents(PrerenderContents* pc) {
     next_pc_.reset(pc);
   }
 
   // Shorthand to add a simple preload with no aliases.
   bool AddSimplePreload(const GURL& url) {
-    return AddPreload(url, std::vector<GURL>(), GURL());
+    return AddPreload(std::pair<int, int>(-1, -1), url, std::vector<GURL>(),
+                      GURL());
   }
 
   bool IsPendingEntry(const GURL& url) {
     return (PrerenderManager::FindPendingEntry(url) != NULL);
   }
 
   void set_rate_limit_enabled(bool enabled) { rate_limit_enabled_ = true; }
 
+  // Shorthand to add a simple preload with aliases.
+  bool AddSimplePreloadWithAliases(const GURL& url,
+                                   const std::vector<GURL>& alias_urls) {
+    return AddPreload(std::pair<int, int>(-1, -1), url, alias_urls, GURL());
+  }
+
   PrerenderContents* next_pc() { return next_pc_.get(); }
 
  protected:
   virtual ~TestPrerenderManager() {
     if (next_pc()) {
       next_pc()->set_final_status(
           FINAL_STATUS_MANAGER_SHUTDOWN);
     }
   }
 
@@ skipping 166 matching lines @@
   GURL alias_url2("http://google.com/");
   GURL not_an_alias_url("http://google.com/index.html");
   std::vector<GURL> alias_urls;
   alias_urls.push_back(alias_url1);
   alias_urls.push_back(alias_url2);
   DummyPrerenderContents* pc =
       new DummyPrerenderContents(prerender_manager_.get(), url, alias_urls,
                                  FINAL_STATUS_USED);
   // Test that all of the aliases work, but nont_an_alias_url does not.
   prerender_manager_->SetNextPrerenderContents(pc);
-  EXPECT_TRUE(prerender_manager_->AddPreload(url, alias_urls, GURL()));
+  EXPECT_TRUE(prerender_manager_->AddSimplePreloadWithAliases(url, alias_urls));
   ASSERT_EQ(NULL, prerender_manager_->GetEntry(not_an_alias_url));
   ASSERT_EQ(pc, prerender_manager_->GetEntry(alias_url1));
   prerender_manager_->SetNextPrerenderContents(pc);
-  EXPECT_TRUE(prerender_manager_->AddPreload(url, alias_urls, GURL()));
+  EXPECT_TRUE(prerender_manager_->AddSimplePreloadWithAliases(url, alias_urls));
   ASSERT_EQ(pc, prerender_manager_->GetEntry(alias_url2));
   prerender_manager_->SetNextPrerenderContents(pc);
-  EXPECT_TRUE(prerender_manager_->AddPreload(url, alias_urls, GURL()));
+  EXPECT_TRUE(prerender_manager_->AddSimplePreloadWithAliases(url, alias_urls));
   ASSERT_EQ(pc, prerender_manager_->GetEntry(url));
 
   // Test that alias URLs can not be added.
   prerender_manager_->SetNextPrerenderContents(pc);
-  EXPECT_TRUE(prerender_manager_->AddPreload(url, alias_urls, GURL()));
+  EXPECT_TRUE(prerender_manager_->AddSimplePreloadWithAliases(url, alias_urls));
   EXPECT_FALSE(prerender_manager_->AddSimplePreload(url));
   EXPECT_FALSE(prerender_manager_->AddSimplePreload(alias_url1));
   EXPECT_FALSE(prerender_manager_->AddSimplePreload(alias_url2));
   ASSERT_EQ(pc, prerender_manager_->GetEntry(url));
 
   pc->set_final_status(FINAL_STATUS_USED);
   delete pc;
 }
 
 // Ensure that we ignore prerender requests within the rate limit.
@@ skipping 112 matching lines @@
       &result));
   ASSERT_EQ(GURL("http://www.abercrombie.com/webapp/wcs/stores/servlet/StoreLocator?catalogId=&storeId=10051&langId=-1").spec(), result.spec());
   EXPECT_FALSE(PrerenderManager::MaybeGetQueryStringBasedAliasURL(
       GURL("http://www.google.com/url?sadf=test&blah=blahblahblah"), &result));
   EXPECT_FALSE(PrerenderManager::MaybeGetQueryStringBasedAliasURL(
       GURL("http://www.google.com/?url=INVALIDurlsAREsoMUCHfun.com"), &result));
   EXPECT_TRUE(PrerenderManager::MaybeGetQueryStringBasedAliasURL(
       GURL("http://www.google.com/?url=http://validURLSareGREAT.com"),
       &result));
   ASSERT_EQ(GURL("http://validURLSareGREAT.com").spec(), result.spec());
 }

[cbentzel, 2011/04/19 17:42:41]

I'd really like to see a unit test for the PrerenderManager pruning entries
which have a pending final status.

[mmenke, 2011/04/19 20:00:01]

Added two tests for this.

 
 }  // namespace prerender