Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 6625066: Add pending preloads indexed by routing id. Start preloading once we navigate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Responding to comments Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "chrome/browser/prerender/prerender_contents.h" 7 #include "chrome/browser/prerender/prerender_contents.h"
8 #include "chrome/browser/prerender/prerender_manager.h" 8 #include "chrome/browser/prerender/prerender_manager.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 }; 78 };
79 79
80 // PrerenderManager that uses TestPrerenderContents. 80 // PrerenderManager that uses TestPrerenderContents.
81 class WaitForLoadPrerenderContentsFactory : public PrerenderContents::Factory { 81 class WaitForLoadPrerenderContentsFactory : public PrerenderContents::Factory {
82 public: 82 public:
83 explicit WaitForLoadPrerenderContentsFactory( 83 explicit WaitForLoadPrerenderContentsFactory(
84 FinalStatus expected_final_status) 84 FinalStatus expected_final_status)
85 : expected_final_status_(expected_final_status) { 85 : expected_final_status_(expected_final_status) {
86 } 86 }
87 87
88 void set_expected_final_status(FinalStatus expected_final_status) {
89 expected_final_status_ = expected_final_status;
90 }
91
88 virtual PrerenderContents* CreatePrerenderContents( 92 virtual PrerenderContents* CreatePrerenderContents(
89 PrerenderManager* prerender_manager, Profile* profile, const GURL& url, 93 PrerenderManager* prerender_manager, Profile* profile, const GURL& url,
90 const std::vector<GURL>& alias_urls, const GURL& referrer) { 94 const std::vector<GURL>& alias_urls, const GURL& referrer) {
91 return new TestPrerenderContents(prerender_manager, profile, url, 95 return new TestPrerenderContents(prerender_manager, profile, url,
92 alias_urls, referrer, 96 alias_urls, referrer,
93 expected_final_status_); 97 expected_final_status_);
94 } 98 }
95 99
96 private: 100 private:
97 FinalStatus expected_final_status_; 101 FinalStatus expected_final_status_;
(...skipping 18 matching lines...) Expand all
116 command_line->AppendSwitchPath( 120 command_line->AppendSwitchPath(
117 switches::kExtraPluginDir, 121 switches::kExtraPluginDir,
118 app_dir.Append(FILE_PATH_LITERAL("plugins"))); 122 app_dir.Append(FILE_PATH_LITERAL("plugins")));
119 #endif 123 #endif
120 } 124 }
121 125
122 void PrerenderTestURL(const std::string& html_file, 126 void PrerenderTestURL(const std::string& html_file,
123 FinalStatus expected_final_status, 127 FinalStatus expected_final_status,
124 int total_navigations) { 128 int total_navigations) {
125 ASSERT_TRUE(test_server()->Start()); 129 ASSERT_TRUE(test_server()->Start());
126 std::string dest_path = "files/prerender/"; 130 dest_url_ = UrlForHtmlFile(html_file);
127 dest_path.append(html_file);
128 dest_url_ = test_server()->GetURL(dest_path);
129 131
130 std::vector<net::TestServer::StringPair> replacement_text; 132 std::vector<net::TestServer::StringPair> replacement_text;
131 replacement_text.push_back( 133 replacement_text.push_back(
132 make_pair("REPLACE_WITH_PREFETCH_URL", dest_url_.spec())); 134 make_pair("REPLACE_WITH_PREFETCH_URL", dest_url_.spec()));
133 std::string replacement_path; 135 std::string replacement_path;
134 ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( 136 ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements(
135 "files/prerender/prerender_loader.html", 137 "files/prerender/prerender_loader.html",
136 replacement_text, 138 replacement_text,
137 &replacement_path)); 139 &replacement_path));
138 140
139 net::TestServer* src_server = test_server(); 141 net::TestServer* src_server = test_server();
140 scoped_ptr<net::TestServer> https_src_server; 142 scoped_ptr<net::TestServer> https_src_server;
141 if (use_https_src_server_) { 143 if (use_https_src_server_) {
142 https_src_server.reset( 144 https_src_server.reset(
143 new net::TestServer(net::TestServer::TYPE_HTTPS, 145 new net::TestServer(net::TestServer::TYPE_HTTPS,
144 FilePath(FILE_PATH_LITERAL("chrome/test/data")))); 146 FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
145 ASSERT_TRUE(https_src_server->Start()); 147 ASSERT_TRUE(https_src_server->Start());
146 src_server = https_src_server.get(); 148 src_server = https_src_server.get();
147 } 149 }
148 GURL src_url = src_server->GetURL(replacement_path); 150 GURL src_url = src_server->GetURL(replacement_path);
149 151
150 Profile* profile = browser()->GetSelectedTabContents()->profile();
151 PrerenderManager* prerender_manager = profile->GetPrerenderManager();
152 ASSERT_TRUE(prerender_manager);
153
154 // This is needed to exit the event loop once the prerendered page has 152 // This is needed to exit the event loop once the prerendered page has
155 // stopped loading or was cancelled. 153 // stopped loading or was cancelled.
156 prerender_manager->SetPrerenderContentsFactory( 154 ASSERT_TRUE(prerender_manager());
155 prerender_manager()->SetPrerenderContentsFactory(
157 new WaitForLoadPrerenderContentsFactory(expected_final_status)); 156 new WaitForLoadPrerenderContentsFactory(expected_final_status));
158 157
159 // ui_test_utils::NavigateToURL uses its own observer and message loop. 158 // ui_test_utils::NavigateToURL uses its own observer and message loop.
160 // Since the test needs to wait until the prerendered page has stopped 159 // Since the test needs to wait until the prerendered page has stopped
161 // loading, rathather than the page directly navigated to, need to 160 // loading, rathather than the page directly navigated to, need to
162 // handle browser navigation directly. 161 // handle browser navigation directly.
163 browser()->OpenURL(src_url, GURL(), CURRENT_TAB, PageTransition::TYPED); 162 browser()->OpenURL(src_url, GURL(), CURRENT_TAB, PageTransition::TYPED);
164 163
165 TestPrerenderContents* prerender_contents = NULL; 164 TestPrerenderContents* prerender_contents = NULL;
166 int navigations = 0; 165 int navigations = 0;
167 while (true) { 166 while (true) {
168 ui_test_utils::RunMessageLoop(); 167 ui_test_utils::RunMessageLoop();
169 ++navigations; 168 ++navigations;
170 169
171 prerender_contents = 170 prerender_contents =
172 static_cast<TestPrerenderContents*>( 171 static_cast<TestPrerenderContents*>(
173 prerender_manager->FindEntry(dest_url_)); 172 prerender_manager()->FindEntry(dest_url_));
174 if (prerender_contents == NULL || 173 if (prerender_contents == NULL ||
175 !prerender_contents->did_finish_loading() || 174 !prerender_contents->did_finish_loading() ||
176 navigations >= total_navigations) { 175 navigations >= total_navigations) {
177 EXPECT_EQ(navigations, total_navigations); 176 EXPECT_EQ(navigations, total_navigations);
178 break; 177 break;
179 } 178 }
180 prerender_contents->set_did_finish_loading(false); 179 prerender_contents->set_did_finish_loading(false);
181 } 180 }
182 181
183 switch (expected_final_status) { 182 switch (expected_final_status) {
(...skipping 14 matching lines...) Expand all
198 // In the failure case, we should have removed dest_url_ from the 197 // In the failure case, we should have removed dest_url_ from the
199 // prerender_manager. 198 // prerender_manager.
200 EXPECT_TRUE(prerender_contents == NULL); 199 EXPECT_TRUE(prerender_contents == NULL);
201 break; 200 break;
202 } 201 }
203 } 202 }
204 203
205 void NavigateToDestURL() const { 204 void NavigateToDestURL() const {
206 ui_test_utils::NavigateToURL(browser(), dest_url_); 205 ui_test_utils::NavigateToURL(browser(), dest_url_);
207 206
208 Profile* profile = browser()->GetSelectedTabContents()->profile();
209 PrerenderManager* prerender_manager = profile->GetPrerenderManager();
210 ASSERT_TRUE(prerender_manager);
211
212 // Make sure the PrerenderContents found earlier was used or removed 207 // Make sure the PrerenderContents found earlier was used or removed
213 EXPECT_TRUE(prerender_manager->FindEntry(dest_url_) == NULL); 208 EXPECT_TRUE(prerender_manager()->FindEntry(dest_url_) == NULL);
214 209
215 // Check if page behaved as expected when actually displayed. 210 // Check if page behaved as expected when actually displayed.
216 bool display_test_result = false; 211 bool display_test_result = false;
217 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 212 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
218 browser()->GetSelectedTabContents()->render_view_host(), L"", 213 browser()->GetSelectedTabContents()->render_view_host(), L"",
219 L"window.domAutomationController.send(DidDisplayPass())", 214 L"window.domAutomationController.send(DidDisplayPass())",
220 &display_test_result)); 215 &display_test_result));
221 EXPECT_TRUE(display_test_result); 216 EXPECT_TRUE(display_test_result);
222 } 217 }
223 218
219 bool UrlIsInPrerenderManager(const std::string& url) {
220 GURL dest_url = UrlForHtmlFile(url);
221
222 return (prerender_manager()->FindEntry(dest_url) != NULL);
223 }
224
225 bool UrlIsPendingInPrerenderManager(const std::string& url) {
226 GURL dest_url = UrlForHtmlFile(url);
227
228 const PrerenderManager::PendingPrerenderList& pending_list =
229 prerender_manager()->pending_prerender_list_;
230 for (PrerenderManager::PendingPrerenderList::const_iterator it =
231 pending_list.begin(); it != pending_list.end(); ++it) {
232 if (it->url_ == dest_url)
233 return true;
234 }
235 return false;
236 }
237
238 GURL UrlForHtmlFile(const std::string& html_file) {
239 std::string dest_path = "files/prerender/";
240 dest_path.append(html_file);
241 return test_server()->GetURL(dest_path);
242 }
243
244 PrerenderManager* prerender_manager() const {
245 Profile* profile = browser()->GetSelectedTabContents()->profile();
246 PrerenderManager* prerender_manager = profile->GetPrerenderManager();
247 return prerender_manager;
248 }
249
224 void set_use_https_src(bool use_https_src_server) { 250 void set_use_https_src(bool use_https_src_server) {
225 use_https_src_server_ = use_https_src_server; 251 use_https_src_server_ = use_https_src_server;
226 } 252 }
227 253
254 void SetExpectedFinalStatus(FinalStatus expected_final_status) {
255 WaitForLoadPrerenderContentsFactory* prc_factory =
256 static_cast<WaitForLoadPrerenderContentsFactory*>(
257 prerender_manager()->prerender_contents_factory_.get());
258 prc_factory->set_expected_final_status(expected_final_status);
259 }
260
228 private: 261 private:
229 GURL dest_url_; 262 GURL dest_url_;
230 bool use_https_src_server_; 263 bool use_https_src_server_;
231 }; 264 };
232 265
233 // Checks that a page is correctly prerendered in the case of a 266 // Checks that a page is correctly prerendered in the case of a
234 // <link rel=prefetch> tag and then loaded into a tab in response to a 267 // <link rel=prefetch> tag and then loaded into a tab in response to a
235 // navigation. 268 // navigation.
236 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) { 269 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPage) {
237 PrerenderTestURL("prerender_page.html", 270 PrerenderTestURL("prerender_page.html",
238 FINAL_STATUS_USED, 1); 271 FINAL_STATUS_USED, 1);
239 NavigateToDestURL(); 272 NavigateToDestURL();
240 } 273 }
241 274
242 // Checks that the prerendering of a page is canceled correctly when a 275 // Checks that the prerendering of a page is canceled correctly when a
243 // Javascript alert is called. 276 // Javascript alert is called.
244 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertBeforeOnload) { 277 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertBeforeOnload) {
245 PrerenderTestURL( 278 PrerenderTestURL("prerender_alert_before_onload.html",
246 "prerender_alert_before_onload.html", 279 FINAL_STATUS_JAVASCRIPT_ALERT, 1);
247 FINAL_STATUS_JAVASCRIPT_ALERT, 1);
248 } 280 }
249 281
250 // Checks that the prerendering of a page is canceled correctly when a 282 // Checks that the prerendering of a page is canceled correctly when a
251 // Javascript alert is called. 283 // Javascript alert is called.
252 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { 284 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) {
253 PrerenderTestURL( 285 PrerenderTestURL("prerender_alert_after_onload.html",
254 "prerender_alert_after_onload.html", 286 FINAL_STATUS_JAVASCRIPT_ALERT, 1);
255 FINAL_STATUS_JAVASCRIPT_ALERT, 1);
256 } 287 }
257 288
258 // Checks that plugins are not loaded while a page is being preloaded, but 289 // Checks that plugins are not loaded while a page is being preloaded, but
259 // are loaded when the page is displayed. 290 // are loaded when the page is displayed.
260 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) { 291 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) {
261 PrerenderTestURL("plugin_delay_load.html", 292 PrerenderTestURL("plugin_delay_load.html",
262 FINAL_STATUS_USED, 1); 293 FINAL_STATUS_USED, 1);
263 NavigateToDestURL(); 294 NavigateToDestURL();
264 } 295 }
265 296
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 FINAL_STATUS_HTTPS, 377 FINAL_STATUS_HTTPS,
347 2); 378 2);
348 } 379 }
349 380
350 // Checks that renderers using excessive memory will be terminated. 381 // Checks that renderers using excessive memory will be terminated.
351 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExcessiveMemory) { 382 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderExcessiveMemory) {
352 PrerenderTestURL("prerender_excessive_memory.html", 383 PrerenderTestURL("prerender_excessive_memory.html",
353 FINAL_STATUS_MEMORY_LIMIT_EXCEEDED, 1); 384 FINAL_STATUS_MEMORY_LIMIT_EXCEEDED, 1);
354 } 385 }
355 386
387 // Checks that we don't prerender in an infinite loop.
388 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoop) {
389 const char* url_a = "prerender_infinite_a.html";
390 const char* url_b = "prerender_infinite_b.html";
391
392 PrerenderTestURL(url_a, FINAL_STATUS_USED, 1);
393
394 // Next url should be in pending list but not an active entry.
395 EXPECT_FALSE(UrlIsInPrerenderManager(url_b));
396 EXPECT_TRUE(UrlIsPendingInPrerenderManager(url_b));
397
398 // We are not going to navigate back to url_a but we will start the preload so
399 // we need to set the final status to expect here before navigating to url_b.
400 SetExpectedFinalStatus(FINAL_STATUS_APP_TERMINATING);
401
402 NavigateToDestURL();
403
404 // Make sure the PrerenderContents for the next url is now in the manager
405 // and not pending.
406 EXPECT_TRUE(UrlIsInPrerenderManager(url_b));
407 EXPECT_FALSE(UrlIsPendingInPrerenderManager(url_b));
408 }
409
356 } // namespace prerender 410 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_contents.cc » ('j') | chrome/browser/prerender/prerender_contents.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698