| Index: chrome/browser/prerender/prerender_unittest.cc
|
| diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
|
| index 0ae9684191a4e0d3bae995a42ee393ea82bd9743..358e4dfb35d4780fc165995adcc0c292ef54fea9 100644
|
| --- a/chrome/browser/prerender/prerender_unittest.cc
|
| +++ b/chrome/browser/prerender/prerender_unittest.cc
|
| @@ -47,6 +47,7 @@ class DummyPrerenderContents : public PrerenderContents {
|
|
|
| virtual void StartPrerendering(
|
| int ALLOW_UNUSED creator_child_id,
|
| + int ALLOW_UNUSED prerender_id,
|
| const gfx::Size& ALLOW_UNUSED size,
|
| content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
|
| bool is_control_group) OVERRIDE;
|
| @@ -241,6 +242,7 @@ DummyPrerenderContents::DummyPrerenderContents(
|
|
|
| void DummyPrerenderContents::StartPrerendering(
|
| int ALLOW_UNUSED creator_child_id,
|
| + int ALLOW_UNUSED prerender_id,
|
| const gfx::Size& ALLOW_UNUSED size,
|
| content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
|
| bool is_control_group) {
|
| @@ -256,6 +258,7 @@ void DummyPrerenderContents::StartPrerendering(
|
| class PrerenderTest : public testing::Test {
|
| public:
|
| static const int kDefaultChildId = -1;
|
| + static const int kDefaultPrerenderId = -1;
|
| static const int kDefaultRenderViewRouteId = -1;
|
|
|
| PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_),
|
| @@ -337,7 +340,7 @@ TEST_F(PrerenderTest, DuplicateTest) {
|
|
|
| scoped_ptr<PrerenderHandle> duplicate_prerender_handle(
|
| prerender_manager()->AddPrerenderFromLinkRelPrerender(
|
| - kDefaultChildId, kDefaultRenderViewRouteId, url,
|
| + kDefaultChildId, kDefaultPrerenderId, kDefaultRenderViewRouteId, url,
|
| Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
|
|
|
| EXPECT_TRUE(duplicate_prerender_handle->IsValid());
|
| @@ -624,7 +627,7 @@ TEST_F(PrerenderTest, PendingPrerenderTest) {
|
| FINAL_STATUS_USED);
|
| scoped_ptr<PrerenderHandle> pending_prerender_handle(
|
| prerender_manager()->AddPrerenderFromLinkRelPrerender(
|
| - child_id, route_id, pending_url,
|
| + child_id, kDefaultPrerenderId, route_id, pending_url,
|
| Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
|
| DCHECK(pending_prerender_handle.get());
|
| EXPECT_TRUE(pending_prerender_handle->IsValid());
|
| @@ -661,7 +664,7 @@ TEST_F(PrerenderTest, InvalidPendingPrerenderTest) {
|
| FINAL_STATUS_UNSUPPORTED_SCHEME);
|
| scoped_ptr<PrerenderHandle> pending_prerender_handle(
|
| prerender_manager()->AddPrerenderFromLinkRelPrerender(
|
| - child_id, route_id, pending_url,
|
| + child_id, kDefaultPrerenderId, route_id, pending_url,
|
| Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
|
| DCHECK(pending_prerender_handle.get());
|
| EXPECT_TRUE(pending_prerender_handle->IsValid());
|
| @@ -691,7 +694,7 @@ TEST_F(PrerenderTest, CancelPendingPrerenderTest) {
|
|
|
| scoped_ptr<PrerenderHandle> pending_prerender_handle(
|
| prerender_manager()->AddPrerenderFromLinkRelPrerender(
|
| - child_id, route_id, pending_url,
|
| + child_id, kDefaultPrerenderId, route_id, pending_url,
|
| Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
|
| DCHECK(pending_prerender_handle.get());
|
| EXPECT_TRUE(pending_prerender_handle->IsValid());
|
|
|