chrome/browser/prerender/prerender_unittest.cc - Issue 10553029: Handle interface to prerenders.

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

Issue 10553029: Handle interface to prerenders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remediated, and cleaned up in prep for uploading for review Created 8 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

« chrome/browser/prerender/prerender_manager.cc ('K') | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.h » ('j') | chrome/browser/ui/omnibox/omnibox_edit_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prerender/prerender_unittest.cc

diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc

index b6403d900366d08ba1340d9b2b7bc5d6ad3ffe6f..78963d3aedad8894a81d2fa6a6506300b7b4d941 100644

--- a/chrome/browser/prerender/prerender_unittest.cc

+++ b/chrome/browser/prerender/prerender_unittest.cc

@@ -7,6 +7,7 @@

#include "base/message_loop.h"

#include "base/time.h"

#include "chrome/browser/prerender/prerender_contents.h"

+#include "chrome/browser/prerender/prerender_handle.h"

#include "chrome/browser/prerender/prerender_link_manager.h"

#include "chrome/browser/prerender/prerender_manager.h"

#include "chrome/browser/prerender/prerender_origin.h"

@@ -26,18 +27,15 @@ namespace prerender {

namespace {

+class TestPrerenderManager;

class DummyPrerenderContents : public PrerenderContents {

public:

- DummyPrerenderContents(PrerenderManager* prerender_manager,

+ DummyPrerenderContents(TestPrerenderManager* test_prerender_manager,

PrerenderTracker* prerender_tracker,

const GURL& url,

Origin origin,

- FinalStatus expected_final_status)

- : PrerenderContents(prerender_manager, prerender_tracker,

- NULL, url, Referrer(), origin,

- PrerenderManager::kNoExperiment),

- expected_final_status_(expected_final_status) {

- }

+ FinalStatus expected_final_status);

virtual ~DummyPrerenderContents() {

EXPECT_EQ(expected_final_status_, final_status());

@@ -47,14 +45,7 @@ class DummyPrerenderContents : public PrerenderContents {

int ALLOW_UNUSED creator_child_id,

const gfx::Size& ALLOW_UNUSED size,

content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,

- bool is_control_group) OVERRIDE {

- // In the base PrerenderContents implementation, StartPrerendering will

- // be called even when the PrerenderManager is part of the control group,

- // but it will early exit before actually creating a new RenderView if

- // |is_control_group| is true;

- if (!is_control_group)

- prerendering_has_started_ = true;

- }

+ bool is_control_group) OVERRIDE;

virtual bool GetChildId(int* child_id) const OVERRIDE {

*child_id = 0;

@@ -73,11 +64,15 @@ class DummyPrerenderContents : public PrerenderContents {

}

private:

+ TestPrerenderManager* test_prerender_manager_;

FinalStatus expected_final_status_;

};

class TestPrerenderManager : public PrerenderManager {

public:

+ using PrerenderManager::kNavigationRecordWindowMs;

dominich 2012/06/28 00:34:32 not sure why you need these using statements.

+ using PrerenderManager::GetMaxAge;

explicit TestPrerenderManager(PrerenderTracker* prerender_tracker)

: PrerenderManager(&profile_, prerender_tracker),

time_(base::Time::Now()),

@@ -92,18 +87,22 @@ class TestPrerenderManager : public PrerenderManager {

next_prerender_contents_.release()->Destroy(

FINAL_STATUS_MANAGER_SHUTDOWN);

}

- // Set the final status for all PrerenderContents with an expected final

- // status of FINAL_STATUS_USED. These values are normally set when the

- // prerendered RVH is swapped into a tab, which doesn't happen in these

- // unit tests.

- for (ScopedVector<PrerenderContents>::iterator it =

- used_prerender_contents_.begin();

- it != used_prerender_contents_.end(); ++it) {

- (*it)->set_final_status(FINAL_STATUS_USED);

- }

DoShutdown();

}

+ PrerenderContents* FindEntry(const GURL& url) {

+ return PrerenderManager::FindEntry(url, NULL);

+ }

+ PrerenderContents* FindAndUseEntry(const GURL& url) {

+ if (PrerenderContents* contents = PrerenderManager::FindEntry(url, NULL)) {

+ PrerenderManager::TreatPrerenderAsUsedForTest(url, NULL);

+ return contents;

+ }

+ ADD_FAILURE() << "Error, expected an entry for " << url;

+ return NULL;

+ }

void AdvanceTime(base::TimeDelta delta) {

time_ += delta;

}

@@ -159,6 +158,15 @@ class TestPrerenderManager : public PrerenderManager {

return next_prerender_contents_.get();

}

+ // from PrerenderManager

+ virtual base::Time GetCurrentTime() const OVERRIDE {

+ return time_;

+ }

+ virtual base::TimeTicks GetCurrentTimeTicks() const OVERRIDE {

+ return time_ticks_;

+ }

private:

void SetNextPrerenderContents(DummyPrerenderContents* prerender_contents) {

DCHECK(!next_prerender_contents_.get());

@@ -167,13 +175,6 @@ class TestPrerenderManager : public PrerenderManager {

used_prerender_contents_.push_back(prerender_contents);

}

- virtual base::Time GetCurrentTime() const OVERRIDE {

- return time_;

- }

- virtual base::TimeTicks GetCurrentTimeTicks() const OVERRIDE {

- return time_ticks_;

- }

virtual PrerenderContents* CreatePrerenderContents(

const GURL& url,

@@ -208,6 +209,34 @@ class RestorePrerenderMode {

PrerenderManager::PrerenderManagerMode prev_mode_;

};

+DummyPrerenderContents::DummyPrerenderContents(

+ TestPrerenderManager* test_prerender_manager,

+ PrerenderTracker* prerender_tracker,

+ const GURL& url,

+ Origin origin,

+ FinalStatus expected_final_status)

+ : PrerenderContents(test_prerender_manager, prerender_tracker,

+ NULL, url, Referrer(), origin,

+ PrerenderManager::kNoExperiment),

+ test_prerender_manager_(test_prerender_manager),

+ expected_final_status_(expected_final_status) {

+void DummyPrerenderContents::StartPrerendering(

+ int ALLOW_UNUSED creator_child_id,

+ const gfx::Size& ALLOW_UNUSED size,

+ content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,

+ bool is_control_group) {

+ // In the base PrerenderContents implementation, StartPrerendering will

+ // be called even when the PrerenderManager is part of the control group,

+ // but it will early exit before actually creating a new RenderView if

+ // |is_control_group| is true;

+ if (!is_control_group) {

+ prerendering_has_started_ = true;

+ }

+ load_start_time_ = test_prerender_manager_->GetCurrentTimeTicks();

dominich 2012/06/28 00:34:32 if this is all you need it for, maybe make GetCurr

} // namespace

class PrerenderTest : public testing::Test {

@@ -268,12 +297,6 @@ class PrerenderTest : public testing::Test {

int last_prerender_id_;

};

-TEST_F(PrerenderTest, EmptyTest) {

- EXPECT_FALSE(prerender_manager()->MaybeUsePrerenderedPage(

- NULL,

- GURL("http://www.google.com/")));

TEST_F(PrerenderTest, FoundTest) {

GURL url("http://www.google.com/");

DummyPrerenderContents* prerender_contents =

@@ -282,7 +305,7 @@ TEST_F(PrerenderTest, FoundTest) {

FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// Make sure that if queue a request, and a second prerender request for the

@@ -307,7 +330,7 @@ TEST_F(PrerenderTest, DropSecondRequestTest) {

prerender_manager()->next_prerender_contents());

EXPECT_FALSE(prerender_contents1->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// Ensure that we expire a prerendered page after the max. permitted time.

@@ -321,9 +344,9 @@ TEST_F(PrerenderTest, ExpireTest) {

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_EQ(null, prerender_manager()->next_prerender_contents());

EXPECT_TRUE(prerender_contents->prerendering_has_started());

- prerender_manager()->AdvanceTime(prerender_manager()->GetMaxAge() +

- base::TimeDelta::FromSeconds(1));

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ prerender_manager()->AdvanceTimeTicks(prerender_manager()->GetMaxAge() +

+ base::TimeDelta::FromSeconds(1));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

}

// LRU Test. Make sure that if we prerender more than one request, that

@@ -348,8 +371,8 @@ TEST_F(PrerenderTest, DropOldestRequestTest) {

EXPECT_EQ(null, prerender_manager()->next_prerender_contents());

EXPECT_TRUE(prerender_contents1->prerendering_has_started());

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

- ASSERT_EQ(prerender_contents1, prerender_manager()->GetEntry(url1));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

+ ASSERT_EQ(prerender_contents1, prerender_manager()->FindAndUseEntry(url1));

}

// Two element prerender test. Ensure that the LRU operates correctly if we

@@ -384,9 +407,9 @@ TEST_F(PrerenderTest, TwoElementPrerenderTest) {

EXPECT_EQ(null, prerender_manager()->next_prerender_contents());

EXPECT_TRUE(prerender_contents2->prerendering_has_started());

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

- ASSERT_EQ(prerender_contents1, prerender_manager()->GetEntry(url1));

- ASSERT_EQ(prerender_contents2, prerender_manager()->GetEntry(url2));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

+ ASSERT_EQ(prerender_contents1, prerender_manager()->FindAndUseEntry(url1));

+ ASSERT_EQ(prerender_contents2, prerender_manager()->FindAndUseEntry(url2));

}

TEST_F(PrerenderTest, AliasURLTest) {

@@ -403,16 +426,18 @@ TEST_F(PrerenderTest, AliasURLTest) {

prerender_manager()->CreateNextPrerenderContents(

url, alias_urls, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

- ASSERT_EQ(NULL, prerender_manager()->GetEntry(not_an_alias_url));

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(alias_url1));

+ ASSERT_EQ(NULL, prerender_manager()->FindEntry(not_an_alias_url));

+ ASSERT_EQ(prerender_contents,

+ prerender_manager()->FindAndUseEntry(alias_url1));

prerender_contents = prerender_manager()->CreateNextPrerenderContents(

url, alias_urls, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(alias_url2));

+ ASSERT_EQ(prerender_contents,

+ prerender_manager()->FindAndUseEntry(alias_url2));

prerender_contents = prerender_manager()->CreateNextPrerenderContents(

url, alias_urls, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

// Test that alias URLs can not be added.

prerender_contents = prerender_manager()->CreateNextPrerenderContents(

@@ -421,7 +446,7 @@ TEST_F(PrerenderTest, AliasURLTest) {

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(AddSimplePrerender(alias_url1));

EXPECT_TRUE(AddSimplePrerender(alias_url2));

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// Ensure that we ignore prerender requests within the rate limit.

@@ -489,14 +514,14 @@ TEST_F(PrerenderTest, PendingPrerenderTest) {

GURL pending_url("http://news.google.com/");

- EXPECT_TRUE(prerender_manager()->AddPrerenderFromLinkRelPrerender(

- child_id, route_id,

- pending_url, Referrer(url, WebKit::WebReferrerPolicyDefault),

- gfx::Size()));

- EXPECT_TRUE(prerender_manager()->IsPendingEntry(pending_url));

+ PrerenderHandle prerender_handle =

+ prerender_manager()->AddPrerenderFromLinkRelPrerender(

+ child_id, route_id, pending_url,

+ Referrer(url, WebKit::WebReferrerPolicyDefault), gfx::Size());

+ EXPECT_TRUE(prerender_handle);

+ EXPECT_TRUE(prerender_handle && prerender_handle->IsPending());

EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// Tests that a PrerenderManager created for a browser session in the control

@@ -547,14 +572,14 @@ TEST_F(PrerenderTest, NotSoRecentlyVisited) {

prerender_manager()->RecordNavigation(url);

prerender_manager()->AdvanceTimeTicks(

base::TimeDelta::FromMilliseconds(

- PrerenderManager::kNavigationRecordWindowMs + 500));

+ TestPrerenderManager::kNavigationRecordWindowMs + 500));

DummyPrerenderContents* prerender_contents =

prerender_manager()->CreateNextPrerenderContents(

url, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// Tests that our PPLT dummy prerender gets created properly.

@@ -573,7 +598,7 @@ TEST_F(PrerenderTest, PPLTDummy) {

// Adding this ftp URL will force the expected unsupported scheme error.

prerender_contents->AddAliasURL(ftp_url);

- ASSERT_EQ(pplt_dummy_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(pplt_dummy_contents, prerender_manager()->FindAndUseEntry(url));

}

// Tests that our PPLT dummy prerender gets created properly, even

@@ -593,54 +618,7 @@ TEST_F(PrerenderTest, RecentlyVisitedPPLTDummy) {

GURL ftp_url("ftp://ftp.google.com/");

prerender_contents->AddAliasURL(ftp_url);

- ASSERT_EQ(pplt_dummy_contents, prerender_manager()->GetEntry(url));

-// Tests that the prerender manager ignores fragment references when matching

-// prerender URLs in the case the fragment is not in the prerender URL.

-TEST_F(PrerenderTest, PageMatchesFragmentTest) {

dominich 2012/06/28 00:34:32 Maybe it's worth reversing these tests and keeping

- GURL url("http://www.google.com/");

- GURL fragment_url("http://www.google.com/#test");

- DummyPrerenderContents* prerender_contents =

- prerender_manager()->CreateNextPrerenderContents(url,

- FINAL_STATUS_USED);

- EXPECT_TRUE(AddSimplePrerender(url));

- EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(fragment_url));

-// Tests that the prerender manager ignores fragment references when matching

-// prerender URLs in the case the fragment is in the prerender URL.

-// TODO(gavinp): Re-enable this in the Prerender API once we're officially

-// fragment clean.

-TEST_F(PrerenderTest, DISABLED_FragmentMatchesPageTest) {

- GURL url("http://www.google.com/");

- GURL fragment_url("http://www.google.com/#test");

- DummyPrerenderContents* prerender_contents =

- prerender_manager()->CreateNextPrerenderContents(fragment_url,

- FINAL_STATUS_USED);

- EXPECT_TRUE(AddSimplePrerender(fragment_url));

- EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

-// Tests that the prerender manager ignores fragment references when matching

-// prerender URLs in the case the fragment is in both URLs.

-// TODO(gavinp): Re-enable this in the Prerender API once we're officially

-// fragment clean.

-TEST_F(PrerenderTest, DISABLED_FragmentMatchesFragmentTest) {

- GURL fragment_url("http://www.google.com/#test");

- GURL other_fragment_url("http://www.google.com/#other_test");

- DummyPrerenderContents* prerender_contents =

- prerender_manager()->CreateNextPrerenderContents(fragment_url,

- FINAL_STATUS_USED);

- EXPECT_TRUE(AddSimplePrerender(fragment_url));

- EXPECT_TRUE(prerender_contents->prerendering_has_started());

- ASSERT_EQ(prerender_contents,

- prerender_manager()->GetEntry(other_fragment_url));

+ ASSERT_EQ(pplt_dummy_contents, prerender_manager()->FindAndUseEntry(url));

}

// Make sure that clearing works as expected.

@@ -700,7 +678,7 @@ TEST_F(PrerenderTest, LinkManagerCancel) {

EXPECT_TRUE(prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

}

@@ -728,7 +706,7 @@ TEST_F(PrerenderTest, LinkManagerCancelThenAbandon) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_TRUE(prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

}

// TODO(gavinp): Update this test after abandon has an effect on Prerenders,

@@ -750,7 +728,7 @@ TEST_F(PrerenderTest, LinkManagerAbandon) {

last_prerender_id());

EXPECT_FALSE(prerender_contents->prerendering_has_been_cancelled());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

}

@@ -771,7 +749,7 @@ TEST_F(PrerenderTest, LinkManagerCancelTwice) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_TRUE(prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

prerender_link_manager()->OnCancelPrerender(kDefaultChildId,

last_prerender_id());

}

@@ -806,7 +784,7 @@ TEST_F(PrerenderTest, LinkManagerAddTwiceCancelTwice) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_TRUE(prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

}

TEST_F(PrerenderTest, LinkManagerAddTwiceCancelTwiceThenAbandonTwice) {

@@ -849,7 +827,7 @@ TEST_F(PrerenderTest, LinkManagerAddTwiceCancelTwiceThenAbandonTwice) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_TRUE(prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

}

// TODO(gavinp): Update this test after abandon has an effect on Prerenders,

@@ -883,7 +861,7 @@ TEST_F(PrerenderTest, LinkManagerAddTwiceAbandonTwice) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_FALSE(prerender_contents->prerendering_has_been_cancelled());

- ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));

}

// TODO(gavinp): After abandon shortens the expire time on a Prerender,

@@ -902,17 +880,17 @@ TEST_F(PrerenderTest, LinkManagerExpireThenCancel) {

EXPECT_TRUE(prerender_contents->prerendering_has_started());

EXPECT_FALSE(prerender_contents->prerendering_has_been_cancelled());

ASSERT_EQ(prerender_contents, prerender_manager()->FindEntry(url));

- prerender_manager()->AdvanceTime(prerender_manager()->GetMaxAge() +

- base::TimeDelta::FromSeconds(1));

+ prerender_manager()->AdvanceTimeTicks(prerender_manager()->GetMaxAge() +

+ base::TimeDelta::FromSeconds(1));

EXPECT_FALSE(IsEmptyPrerenderLinkManager());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

prerender_link_manager()->OnCancelPrerender(kDefaultChildId,

last_prerender_id());

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

}

TEST_F(PrerenderTest, LinkManagerExpireThenAddAgain) {

@@ -924,17 +902,19 @@ TEST_F(PrerenderTest, LinkManagerExpireThenAddAgain) {

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(first_prerender_contents->prerendering_has_started());

EXPECT_FALSE(first_prerender_contents->prerendering_has_been_cancelled());

- ASSERT_EQ(first_prerender_contents, prerender_manager()->FindEntry(url));

- prerender_manager()->AdvanceTime(prerender_manager()->GetMaxAge() +

+ ASSERT_EQ(first_prerender_contents,

+ prerender_manager()->FindAndUseEntry(url));

+ prerender_manager()->AdvanceTimeTicks(prerender_manager()->GetMaxAge() +

base::TimeDelta::FromSeconds(1));

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

DummyPrerenderContents* second_prerender_contents =

prerender_manager()->CreateNextPrerenderContents(

url, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(second_prerender_contents->prerendering_has_started());

- ASSERT_EQ(second_prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(second_prerender_contents,

+ prerender_manager()->FindAndUseEntry(url));

// The PrerenderLinkManager is not empty since we never removed the first

// prerender.

EXPECT_FALSE(IsEmptyPrerenderLinkManager());

@@ -955,13 +935,14 @@ TEST_F(PrerenderTest, LinkManagerCancelThenAddAgain) {

EXPECT_TRUE(IsEmptyPrerenderLinkManager());

EXPECT_TRUE(first_prerender_contents->prerendering_has_been_cancelled());

DummyPrerenderContents* null = NULL;

- ASSERT_EQ(null, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(null, prerender_manager()->FindEntry(url));

DummyPrerenderContents* second_prerender_contents =

prerender_manager()->CreateNextPrerenderContents(

url, FINAL_STATUS_USED);

EXPECT_TRUE(AddSimplePrerender(url));

EXPECT_TRUE(second_prerender_contents->prerendering_has_started());

- ASSERT_EQ(second_prerender_contents, prerender_manager()->GetEntry(url));

+ ASSERT_EQ(second_prerender_contents,

+ prerender_manager()->FindAndUseEntry(url));

EXPECT_FALSE(IsEmptyPrerenderLinkManager());

}