Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: chrome/browser/prerender/prerender_manager_unittest.cc

Issue 6685012: Give prerendering RVH's RenderWidgetHostViews. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 'queued' renamed to 'pending' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_manager_unittest.cc
===================================================================
--- chrome/browser/prerender/prerender_manager_unittest.cc (revision 82104)
+++ chrome/browser/prerender/prerender_manager_unittest.cc (working copy)
@@ -39,7 +39,8 @@
EXPECT_EQ(expected_final_status_, final_status());
}
- virtual void StartPrerendering() OVERRIDE {
+ virtual void StartPrerendering(
+ const RenderViewHost* source_render_view_host) OVERRIDE {
has_started_ = true;
}
@@ -84,7 +85,8 @@
// 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) {
@@ -93,6 +95,12 @@
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:
@@ -279,19 +287,19 @@
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));

Powered by Google App Engine
This is Rietveld 408576698