Chromium Code Reviews| Index: chrome/browser/prerender/prerender_unittest.cc |
| diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc |
| index 499bd535b1d164f636138c9344ac0a45f80c0c68..b2fca358bc76a4aa45d0b95767409ed0661f78f3 100644 |
| --- a/chrome/browser/prerender/prerender_unittest.cc |
| +++ b/chrome/browser/prerender/prerender_unittest.cc |
| @@ -1111,28 +1111,38 @@ TEST_F(PrerenderTest, PrerenderNotAllowedOnCellularWithExternalOrigin) { |
| EXPECT_FALSE(prerender_contents->prerendering_has_started()); |
| } |
| -TEST_F(PrerenderTest,PrerenderAllowedOnCellularWithForcedOrigin) { |
| +TEST_F(PrerenderTest, PrerenderForcedOriginOnCellular) { |
|
pasko
2016/04/05 11:49:56
a more descriptive name woudl be preferred:
Preren
gabadie
2016/04/05 13:35:24
Done.
|
| + const Origin origins[] = { |
| + ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, |
| + ORIGIN_OFFLINE, |
| + }; |
| + |
| EnablePrerender(); |
| scoped_ptr<net::NetworkChangeNotifier> mock( |
| new MockNetworkChangeNotifier4G); |
| EXPECT_TRUE(net::NetworkChangeNotifier::IsConnectionCellular( |
| net::NetworkChangeNotifier::GetConnectionType())); |
| GURL url("http://www.google.com/"); |
| - DummyPrerenderContents* prerender_contents = |
| - prerender_manager()->CreateNextPrerenderContents( |
| - url, |
| - ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, |
| - FINAL_STATUS_USED); |
| - scoped_ptr<PrerenderHandle> prerender_handle( |
| - prerender_manager()->AddPrerenderOnCellularFromExternalRequest( |
| - url, content::Referrer(), nullptr, kSize)); |
| - EXPECT_TRUE(prerender_handle); |
| - EXPECT_TRUE(prerender_handle->IsPrerendering()); |
| - EXPECT_TRUE(prerender_contents->prerendering_has_started()); |
| - EXPECT_EQ(prerender_contents, prerender_handle->contents()); |
| - EXPECT_EQ(ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, |
| - prerender_handle->contents()->origin()); |
| - ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); |
| + for (Origin origin: origins) { |
| + DummyPrerenderContents* prerender_contents = |
| + prerender_manager()->CreateNextPrerenderContents( |
| + url, origin, FINAL_STATUS_USED); |
| + scoped_ptr<PrerenderHandle> prerender_handle; |
| + if (origin == ORIGIN_OFFLINE) {( |
| + prerender_handle.reset(prerender_manager()->AddPrerenderForOffline( |
| + url, nullptr, kSize))); |
| + } else {( |
| + prerender_handle.reset( |
| + prerender_manager()->AddPrerenderOnCellularFromExternalRequest( |
| + url, content::Referrer(), nullptr, kSize))); |
| + } |
| + EXPECT_TRUE(prerender_handle); |
| + EXPECT_TRUE(prerender_handle->IsPrerendering()); |
| + EXPECT_TRUE(prerender_contents->prerendering_has_started()); |
| + EXPECT_EQ(prerender_contents, prerender_handle->contents()); |
| + EXPECT_EQ(origin, prerender_handle->contents()->origin()); |
| + ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); |
| + } |
| } |
| TEST_F(PrerenderTest, LinkManagerCancel) { |