Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1104 url, | 1104 url, |
| 1105 ORIGIN_EXTERNAL_REQUEST, | 1105 ORIGIN_EXTERNAL_REQUEST, |
| 1106 FINAL_STATUS_MANAGER_SHUTDOWN); | 1106 FINAL_STATUS_MANAGER_SHUTDOWN); |
| 1107 scoped_ptr<PrerenderHandle> prerender_handle( | 1107 scoped_ptr<PrerenderHandle> prerender_handle( |
| 1108 prerender_manager()->AddPrerenderFromExternalRequest( | 1108 prerender_manager()->AddPrerenderFromExternalRequest( |
| 1109 url, content::Referrer(), nullptr, kSize)); | 1109 url, content::Referrer(), nullptr, kSize)); |
| 1110 EXPECT_FALSE(prerender_handle); | 1110 EXPECT_FALSE(prerender_handle); |
| 1111 EXPECT_FALSE(prerender_contents->prerendering_has_started()); | 1111 EXPECT_FALSE(prerender_contents->prerendering_has_started()); |
| 1112 } | 1112 } |
| 1113 | 1113 |
| 1114 TEST_F(PrerenderTest,PrerenderAllowedOnCellularWithForcedOrigin) { | 1114 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.
| |
| 1115 const Origin origins[] = { | |
| 1116 ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, | |
| 1117 ORIGIN_OFFLINE, | |
| 1118 }; | |
| 1119 | |
| 1115 EnablePrerender(); | 1120 EnablePrerender(); |
| 1116 scoped_ptr<net::NetworkChangeNotifier> mock( | 1121 scoped_ptr<net::NetworkChangeNotifier> mock( |
| 1117 new MockNetworkChangeNotifier4G); | 1122 new MockNetworkChangeNotifier4G); |
| 1118 EXPECT_TRUE(net::NetworkChangeNotifier::IsConnectionCellular( | 1123 EXPECT_TRUE(net::NetworkChangeNotifier::IsConnectionCellular( |
| 1119 net::NetworkChangeNotifier::GetConnectionType())); | 1124 net::NetworkChangeNotifier::GetConnectionType())); |
| 1120 GURL url("http://www.google.com/"); | 1125 GURL url("http://www.google.com/"); |
| 1121 DummyPrerenderContents* prerender_contents = | 1126 for (Origin origin: origins) { |
| 1122 prerender_manager()->CreateNextPrerenderContents( | 1127 DummyPrerenderContents* prerender_contents = |
| 1123 url, | 1128 prerender_manager()->CreateNextPrerenderContents( |
| 1124 ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, | 1129 url, origin, FINAL_STATUS_USED); |
| 1125 FINAL_STATUS_USED); | 1130 scoped_ptr<PrerenderHandle> prerender_handle; |
| 1126 scoped_ptr<PrerenderHandle> prerender_handle( | 1131 if (origin == ORIGIN_OFFLINE) {( |
| 1127 prerender_manager()->AddPrerenderOnCellularFromExternalRequest( | 1132 prerender_handle.reset(prerender_manager()->AddPrerenderForOffline( |
| 1128 url, content::Referrer(), nullptr, kSize)); | 1133 url, nullptr, kSize))); |
| 1129 EXPECT_TRUE(prerender_handle); | 1134 } else {( |
| 1130 EXPECT_TRUE(prerender_handle->IsPrerendering()); | 1135 prerender_handle.reset( |
| 1131 EXPECT_TRUE(prerender_contents->prerendering_has_started()); | 1136 prerender_manager()->AddPrerenderOnCellularFromExternalRequest( |
| 1132 EXPECT_EQ(prerender_contents, prerender_handle->contents()); | 1137 url, content::Referrer(), nullptr, kSize))); |
| 1133 EXPECT_EQ(ORIGIN_EXTERNAL_REQUEST_FORCED_CELLULAR, | 1138 } |
| 1134 prerender_handle->contents()->origin()); | 1139 EXPECT_TRUE(prerender_handle); |
| 1135 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); | 1140 EXPECT_TRUE(prerender_handle->IsPrerendering()); |
| 1141 EXPECT_TRUE(prerender_contents->prerendering_has_started()); | |
| 1142 EXPECT_EQ(prerender_contents, prerender_handle->contents()); | |
| 1143 EXPECT_EQ(origin, prerender_handle->contents()->origin()); | |
| 1144 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); | |
| 1145 } | |
| 1136 } | 1146 } |
| 1137 | 1147 |
| 1138 TEST_F(PrerenderTest, LinkManagerCancel) { | 1148 TEST_F(PrerenderTest, LinkManagerCancel) { |
| 1139 EXPECT_TRUE(IsEmptyPrerenderLinkManager()); | 1149 EXPECT_TRUE(IsEmptyPrerenderLinkManager()); |
| 1140 GURL url("http://www.myexample.com"); | 1150 GURL url("http://www.myexample.com"); |
| 1141 DummyPrerenderContents* prerender_contents = | 1151 DummyPrerenderContents* prerender_contents = |
| 1142 prerender_manager()->CreateNextPrerenderContents( | 1152 prerender_manager()->CreateNextPrerenderContents( |
| 1143 url, FINAL_STATUS_CANCELLED); | 1153 url, FINAL_STATUS_CANCELLED); |
| 1144 | 1154 |
| 1145 EXPECT_TRUE(AddSimplePrerender(url)); | 1155 EXPECT_TRUE(AddSimplePrerender(url)); |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1656 CHECK(prerender_handle.get()); | 1666 CHECK(prerender_handle.get()); |
| 1657 EXPECT_TRUE(prerender_handle->IsPrerendering()); | 1667 EXPECT_TRUE(prerender_handle->IsPrerendering()); |
| 1658 EXPECT_TRUE(prerender_contents->prerendering_has_started()); | 1668 EXPECT_TRUE(prerender_contents->prerendering_has_started()); |
| 1659 EXPECT_EQ(prerender_contents, prerender_handle->contents()); | 1669 EXPECT_EQ(prerender_contents, prerender_handle->contents()); |
| 1660 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin()); | 1670 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin()); |
| 1661 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); | 1671 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); |
| 1662 EXPECT_FALSE(prerender_handle->IsPrerendering()); | 1672 EXPECT_FALSE(prerender_handle->IsPrerendering()); |
| 1663 } | 1673 } |
| 1664 | 1674 |
| 1665 } // namespace prerender | 1675 } // namespace prerender |
| OLD | NEW |