Index: chrome/browser/prerender/prerender_unittest.cc |
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc |
index 59fbd4280ab42bb2c35cc335340b7313547bc1be..c015ab8839768ef01b5edea8254f6d2eacea35b3 100644 |
--- a/chrome/browser/prerender/prerender_unittest.cc |
+++ b/chrome/browser/prerender/prerender_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/prerender/prerender_manager.h" |
#include "chrome/browser/prerender/prerender_origin.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/prerender_types.h" |
#include "chrome/test/base/testing_browser_process.h" |
#include "chrome/test/base/testing_profile.h" |
#include "content/public/browser/render_view_host.h" |
@@ -83,6 +84,8 @@ int DummyPrerenderContents::g_next_route_id_ = 0; |
const gfx::Size kSize(640, 480); |
+const uint32 kDefaultRelTypes = PrerenderRelTypePrerender; |
+ |
} // namespace |
class UnitTestPrerenderManager : public PrerenderManager { |
@@ -279,10 +282,6 @@ class PrerenderTest : public testing::Test { |
static const int kDefaultRenderViewRouteId = -1; |
PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_), |
- prerender_manager_(new UnitTestPrerenderManager( |
- &profile_, prerender_tracker())), |
- prerender_link_manager_( |
- new PrerenderLinkManager(prerender_manager_.get())), |
last_prerender_id_(0), |
field_trial_list_(NULL) { |
// Enable omnibox prerendering. |
@@ -292,16 +291,24 @@ class PrerenderTest : public testing::Test { |
} |
virtual ~PrerenderTest() { |
- prerender_link_manager_->OnChannelClosing(kDefaultChildId); |
- prerender_link_manager_->Shutdown(); |
- prerender_manager_->Shutdown(); |
+ prerender_link_manager()->OnChannelClosing(kDefaultChildId); |
+ prerender_link_manager()->Shutdown(); |
+ prerender_manager()->Shutdown(); |
} |
UnitTestPrerenderManager* prerender_manager() { |
+ if (!prerender_manager_) { |
+ prerender_manager_.reset( |
+ new UnitTestPrerenderManager(&profile_, prerender_tracker())); |
+ } |
return prerender_manager_.get(); |
} |
PrerenderLinkManager* prerender_link_manager() { |
+ if (!prerender_link_manager_) { |
+ prerender_link_manager_.reset( |
+ new PrerenderLinkManager(prerender_manager())); |
+ } |
return prerender_link_manager_.get(); |
} |
@@ -313,8 +320,8 @@ class PrerenderTest : public testing::Test { |
concurrency); |
} |
- bool IsEmptyPrerenderLinkManager() const { |
- return prerender_link_manager_->IsEmpty(); |
+ bool IsEmptyPrerenderLinkManager() { |
+ return prerender_link_manager()->IsEmpty(); |
} |
int last_prerender_id() const { |
@@ -336,10 +343,9 @@ class PrerenderTest : public testing::Test { |
// true iff the prerender has been added to the PrerenderManager by the |
// PrerenderLinkManager and the PrerenderManager returned a handle. |
bool AddSimplePrerender(const GURL& url) { |
- prerender_link_manager()->OnAddPrerender(kDefaultChildId, |
- GetNextPrerenderID(), |
- url, content::Referrer(), |
- kSize, kDefaultRenderViewRouteId); |
+ prerender_link_manager()->OnAddPrerender( |
+ kDefaultChildId, GetNextPrerenderID(), url, kDefaultRelTypes, |
+ content::Referrer(), kSize, kDefaultRenderViewRouteId); |
return LauncherHasRunningPrerender(kDefaultChildId, last_prerender_id()); |
} |
@@ -594,10 +600,9 @@ TEST_F(PrerenderTest, MaxConcurrencyTest) { |
ASSERT_TRUE(prerender_contentses.back()->GetRouteId(&route_id)); |
GURL extra_url("http://google.com/extraurl"); |
- prerender_link_manager()->OnAddPrerender(child_id, |
- GetNextPrerenderID(), |
- extra_url, content::Referrer(), |
- kSize, route_id); |
+ prerender_link_manager()->OnAddPrerender( |
+ child_id, GetNextPrerenderID(), extra_url, kDefaultRelTypes, |
+ content::Referrer(), kSize, route_id); |
const int prerender_id = last_prerender_id(); |
EXPECT_TRUE(LauncherHasRunningPrerender(child_id, prerender_id)); |
prerender_link_manager()->OnCancelPrerender(child_id, prerender_id); |
@@ -784,11 +789,40 @@ TEST_F(PrerenderTest, SourceRenderViewClosed) { |
prerender_manager()->CreateNextPrerenderContents( |
url, |
FINAL_STATUS_MANAGER_SHUTDOWN); |
- prerender_link_manager()->OnAddPrerender(100, GetNextPrerenderID(), url, |
- Referrer(), kSize, 200); |
+ prerender_link_manager()->OnAddPrerender( |
+ 100, GetNextPrerenderID(), url, kDefaultRelTypes, Referrer(), kSize, 200); |
EXPECT_FALSE(LauncherHasRunningPrerender(100, last_prerender_id())); |
} |
+// Tests that prerendering doesn't launch rel=next prerenders without the field |
+// trial. |
+TEST_F(PrerenderTest, NoRelNextByDefault) { |
+ GURL url("http://www.google.com/"); |
+ prerender_manager()->CreateNextPrerenderContents( |
+ url, FINAL_STATUS_MANAGER_SHUTDOWN); |
+ DummyPrerenderContents* null = NULL; |
+ |
+ prerender_link_manager()->OnAddPrerender( |
+ kDefaultChildId, GetNextPrerenderID(), url, PrerenderRelTypeNext, |
+ Referrer(), kSize, kDefaultRenderViewRouteId); |
+ EXPECT_EQ(null, prerender_manager()->FindEntry(url)); |
+} |
+ |
+// Tests that prerendering does launch rel=next prerenders with the field trial. |
+TEST_F(PrerenderTest, RelNextByFieldTrial) { |
+ ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("PrerenderRelNextTrial", |
+ "Yes")); |
+ GURL url("http://www.google.com/"); |
+ DummyPrerenderContents* prerender_contents = |
+ prerender_manager()->CreateNextPrerenderContents( |
+ url, FINAL_STATUS_MANAGER_SHUTDOWN); |
+ |
+ prerender_link_manager()->OnAddPrerender( |
+ kDefaultChildId, GetNextPrerenderID(), url, PrerenderRelTypeNext, |
+ Referrer(), kSize, kDefaultRenderViewRouteId); |
+ EXPECT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); |
+} |
+ |
// Tests that prerendering is cancelled when we launch a second prerender of |
// the same target within a short time interval. |
TEST_F(PrerenderTest, RecentlyVisited) { |
@@ -1344,10 +1378,9 @@ TEST_F(PrerenderTest, LinkManagerClearOnPendingAbandon) { |
ASSERT_TRUE(prerender_contents->GetRouteId(&route_id)); |
GURL pending_url("http://www.neverlaunched.com"); |
- prerender_link_manager()->OnAddPrerender(child_id, |
- GetNextPrerenderID(), |
- pending_url, content::Referrer(), |
- kSize, route_id); |
+ prerender_link_manager()->OnAddPrerender( |
+ child_id, GetNextPrerenderID(), pending_url, kDefaultRelTypes, |
+ content::Referrer(), kSize, route_id); |
const int second_prerender_id = last_prerender_id(); |
EXPECT_FALSE(IsEmptyPrerenderLinkManager()); |