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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7210020: Added prerendering to omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error. Created 9 years, 6 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
« chrome/browser/instant/instant_controller.cc ('K') | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/prerender/prerender_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_manager_unittest.cc
diff --git a/chrome/browser/prerender/prerender_manager_unittest.cc b/chrome/browser/prerender/prerender_manager_unittest.cc
index 9b82c162a76b8e9ce897f089ab753e652a934ba9..7e76c23672484806d50396f53c449600f1ae7166 100644
--- a/chrome/browser/prerender/prerender_manager_unittest.cc
+++ b/chrome/browser/prerender/prerender_manager_unittest.cc
@@ -118,11 +118,6 @@ class TestPrerenderManager : public PrerenderManager {
return prerender_contents;
}
- // Shorthand to add a simple preload with no aliases.
- bool AddSimplePreload(const GURL& url) {
- return AddPreload(std::pair<int, int>(-1, -1), url, GURL());
- }
-
bool IsPendingEntry(const GURL& url) {
return (PrerenderManager::FindPendingEntry(url) != NULL);
}
@@ -203,7 +198,7 @@ class PrerenderManagerTest : public testing::Test {
TEST_F(PrerenderManagerTest, EmptyTest) {
GURL url("http://www.google.com/");
- EXPECT_FALSE(prerender_manager()->MaybeUsePreloadedPage(NULL, url, false));
+ EXPECT_FALSE(prerender_manager()->MaybeUsePrerenderedPage(NULL, url, false));
}
TEST_F(PrerenderManagerTest, FoundTest) {
@@ -212,7 +207,7 @@ TEST_F(PrerenderManagerTest, FoundTest) {
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_TRUE(prerender_contents->has_started());
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));
}
@@ -226,7 +221,7 @@ TEST_F(PrerenderManagerTest, DropSecondRequestTest) {
url,
FINAL_STATUS_USED);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
@@ -234,7 +229,7 @@ TEST_F(PrerenderManagerTest, DropSecondRequestTest) {
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_MANAGER_SHUTDOWN);
- EXPECT_FALSE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_FALSE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(prerender_contents1,
prerender_manager()->next_prerender_contents());
EXPECT_FALSE(prerender_contents1->has_started());
@@ -250,7 +245,7 @@ TEST_F(PrerenderManagerTest, ExpireTest) {
url,
FINAL_STATUS_TIMED_OUT);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
prerender_manager()->AdvanceTime(prerender_manager()->max_prerender_age()
@@ -267,7 +262,7 @@ TEST_F(PrerenderManagerTest, DropOldestRequestTest) {
url,
FINAL_STATUS_EVICTED);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
@@ -276,7 +271,7 @@ TEST_F(PrerenderManagerTest, DropOldestRequestTest) {
prerender_manager()->CreateNextPrerenderContents(
url1,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url1));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url1));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents1->has_started());
@@ -294,7 +289,7 @@ TEST_F(PrerenderManagerTest, TwoElementPrerenderTest) {
url,
FINAL_STATUS_EVICTED);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
@@ -303,7 +298,7 @@ TEST_F(PrerenderManagerTest, TwoElementPrerenderTest) {
prerender_manager()->CreateNextPrerenderContents(
url1,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url1));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url1));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents1->has_started());
@@ -312,7 +307,7 @@ TEST_F(PrerenderManagerTest, TwoElementPrerenderTest) {
prerender_manager()->CreateNextPrerenderContents(
url2,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url2));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url2));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents2->has_started());
@@ -334,25 +329,25 @@ TEST_F(PrerenderManagerTest, AliasURLTest) {
DummyPrerenderContents* prerender_contents =
prerender_manager()->CreateNextPrerenderContents(
url, alias_urls, FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
ASSERT_EQ(NULL, prerender_manager()->GetEntry(not_an_alias_url));
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(alias_url1));
prerender_contents = prerender_manager()->CreateNextPrerenderContents(
url, alias_urls, FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(alias_url2));
prerender_contents = prerender_manager()->CreateNextPrerenderContents(
url, alias_urls, FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));
// Test that alias URLs can not be added.
prerender_contents = prerender_manager()->CreateNextPrerenderContents(
url, alias_urls, FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
- EXPECT_FALSE(prerender_manager()->AddSimplePreload(url));
- EXPECT_FALSE(prerender_manager()->AddSimplePreload(alias_url1));
- EXPECT_FALSE(prerender_manager()->AddSimplePreload(alias_url2));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
+ EXPECT_FALSE(prerender_manager()->AddPrerenderWithNoTag(url));
+ EXPECT_FALSE(prerender_manager()->AddPrerenderWithNoTag(alias_url1));
+ EXPECT_FALSE(prerender_manager()->AddPrerenderWithNoTag(alias_url2));
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));
}
@@ -364,7 +359,7 @@ TEST_F(PrerenderManagerTest, RateLimitInWindowTest) {
url,
FINAL_STATUS_MANAGER_SHUTDOWN);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
@@ -375,7 +370,7 @@ TEST_F(PrerenderManagerTest, RateLimitInWindowTest) {
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_MANAGER_SHUTDOWN);
- EXPECT_FALSE(prerender_manager()->AddSimplePreload(url1));
+ EXPECT_FALSE(prerender_manager()->AddPrerenderWithNoTag(url1));
prerender_manager()->set_rate_limit_enabled(false);
}
@@ -387,7 +382,7 @@ TEST_F(PrerenderManagerTest, RateLimitOutsideWindowTest) {
url,
FINAL_STATUS_EVICTED);
DummyPrerenderContents* null = NULL;
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(prerender_contents->has_started());
@@ -400,19 +395,19 @@ TEST_F(PrerenderManagerTest, RateLimitOutsideWindowTest) {
prerender_manager()->CreateNextPrerenderContents(
url1,
FINAL_STATUS_MANAGER_SHUTDOWN);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url1));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url1));
EXPECT_EQ(null, prerender_manager()->next_prerender_contents());
EXPECT_TRUE(rate_limit_prerender_contents->has_started());
prerender_manager()->set_rate_limit_enabled(false);
}
-TEST_F(PrerenderManagerTest, PendingPreloadTest) {
+TEST_F(PrerenderManagerTest, PendingPrerenderTest) {
GURL url("http://www.google.com/");
DummyPrerenderContents* prerender_contents =
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
int child_id;
int route_id;
@@ -422,9 +417,9 @@ TEST_F(PrerenderManagerTest, PendingPreloadTest) {
GURL pending_url("http://news.google.com/");
EXPECT_TRUE(
- prerender_manager()->AddPreload(std::make_pair(child_id, route_id),
- pending_url,
- url));
+ prerender_manager()->AddPrerender(std::make_pair(child_id, route_id),
+ pending_url,
+ url));
EXPECT_TRUE(prerender_manager()->IsPendingEntry(pending_url));
EXPECT_TRUE(prerender_contents->has_started());
@@ -460,7 +455,7 @@ TEST_F(PrerenderManagerTest, ControlGroup) {
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_CONTROL_GROUP);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_FALSE(prerender_contents->has_started());
}
@@ -472,7 +467,7 @@ TEST_F(PrerenderManagerTest, SourceRenderViewClosed) {
prerender_manager()->CreateNextPrerenderContents(
url,
FINAL_STATUS_MANAGER_SHUTDOWN);
- EXPECT_FALSE(prerender_manager()->AddPreload(
+ EXPECT_FALSE(prerender_manager()->AddPrerender(
std::pair<int, int>(100, 100), url, GURL()));
}
@@ -485,7 +480,7 @@ TEST_F(PrerenderManagerTest, PageMatchesFragmentTest) {
DummyPrerenderContents* prerender_contents =
prerender_manager()->CreateNextPrerenderContents(url,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(url));
EXPECT_TRUE(prerender_contents->has_started());
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(fragment_url));
}
@@ -499,7 +494,7 @@ TEST_F(PrerenderManagerTest, FragmentMatchesPageTest) {
DummyPrerenderContents* prerender_contents =
prerender_manager()->CreateNextPrerenderContents(fragment_url,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(fragment_url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(fragment_url));
EXPECT_TRUE(prerender_contents->has_started());
ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));
}
@@ -513,7 +508,7 @@ TEST_F(PrerenderManagerTest, FragmentMatchesFragmentTest) {
DummyPrerenderContents* prerender_contents =
prerender_manager()->CreateNextPrerenderContents(fragment_url,
FINAL_STATUS_USED);
- EXPECT_TRUE(prerender_manager()->AddSimplePreload(fragment_url));
+ EXPECT_TRUE(prerender_manager()->AddPrerenderWithNoTag(fragment_url));
EXPECT_TRUE(prerender_contents->has_started());
ASSERT_EQ(prerender_contents,
prerender_manager()->GetEntry(other_fragment_url));
« chrome/browser/instant/instant_controller.cc ('K') | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/prerender/prerender_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698