Chromium Code Reviews| Index: chrome/browser/prerender/prerender_browsertest.cc |
| diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
| index 33dd892fa33d651301f878ffbc7dc4ef6f84316c..702b1531c1cbef914181f9932dc92bc05c43a882 100644 |
| --- a/chrome/browser/prerender/prerender_browsertest.cc |
| +++ b/chrome/browser/prerender/prerender_browsertest.cc |
| @@ -214,7 +214,8 @@ class TestPrerenderContents : public PrerenderContents { |
| FinalStatus expected_final_status, |
| bool prerender_should_wait_for_ready_title) |
| : PrerenderContents(prerender_manager, prerender_tracker, |
| - profile, url, referrer, ORIGIN_LINK_REL_PRERENDER, |
| + profile, url, referrer, |
| + ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN, |
| PrerenderManager::kNoExperiment), |
| number_of_loads_(0), |
| expected_number_of_loads_(expected_number_of_loads), |
| @@ -306,11 +307,12 @@ class TestPrerenderContents : public PrerenderContents { |
| virtual void AddPendingPrerender( |
| base::WeakPtr<PrerenderHandle> weak_prerender_handle, |
| + const Origin origin, |
|
dominich
2012/09/14 14:40:45
nit: no need for const here.
gavinp
2012/09/14 21:10:47
It's not needed. But, http://google-styleguide.goo
dominich
2012/09/14 21:13:44
If it was up to me, I'd const ALL the things. Howe
mmenke
2012/09/17 20:39:27
I actually think the style guide is ambiguous. It
|
| const GURL& url, |
| const content::Referrer& referrer, |
| const gfx::Size& size) OVERRIDE { |
| PrerenderContents::AddPendingPrerender( |
| - weak_prerender_handle, url, referrer, size); |
| + weak_prerender_handle, origin, url, referrer, size); |
| if (expected_pending_prerenders_ > 0 && |
| pending_prerenders().size() == expected_pending_prerenders_) { |
| MessageLoop::current()->Quit(); |