| 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..2813f497e6e75795e36c36c6777a61b0f215329b 100644
|
| --- a/chrome/browser/prerender/prerender_unittest.cc
|
| +++ b/chrome/browser/prerender/prerender_unittest.cc
|
| @@ -52,7 +52,9 @@ class DummyPrerenderContents : public PrerenderContents {
|
| bool is_control_group) OVERRIDE;
|
|
|
| virtual bool GetChildId(int* child_id) const OVERRIDE {
|
| - *child_id = 0;
|
| + // Having a default child_id of -1 forces pending prerenders not to fail
|
| + // on session storage and cross domain checking.
|
| + *child_id = -1;
|
| return true;
|
| }
|
|
|
| @@ -133,7 +135,7 @@ class UnitTestPrerenderManager : public PrerenderManager {
|
| FinalStatus expected_final_status) {
|
| DummyPrerenderContents* prerender_contents =
|
| new DummyPrerenderContents(this, prerender_tracker_, url,
|
| - ORIGIN_LINK_REL_PRERENDER,
|
| + ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
|
| expected_final_status);
|
| SetNextPrerenderContents(prerender_contents);
|
| return prerender_contents;
|
| @@ -156,7 +158,7 @@ class UnitTestPrerenderManager : public PrerenderManager {
|
| FinalStatus expected_final_status) {
|
| DummyPrerenderContents* prerender_contents =
|
| new DummyPrerenderContents(this, prerender_tracker_, url,
|
| - ORIGIN_LINK_REL_PRERENDER,
|
| + ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
|
| expected_final_status);
|
| for (std::vector<GURL>::const_iterator it = alias_urls.begin();
|
| it != alias_urls.end();
|
|
|